diff --git a/README.md b/README.md
index f0ec1c36..e87f6aef 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,10 @@
 
 ## 📚【支持文档】
 
-技术支持资源：https://open.tntlinking.com/resource/technicalSupport?site=gitee
+技术支持资源：https://open.tntlinking.com/resource/openProductDoc?site=gitee
 （含演示环境、操作手册、部署手册、开发手册、常见问题等）
 
-产品介绍：https://open.tntlinking.com/resource/industryKnowledge?site=gitee
+产品介绍：https://open.tntlinking.com/resource/productPresentation?site=gitee
 
 操作教程：https://open.tntlinking.com/resource/operationTutorial?site=gitee
 
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
index 46db6d80..5c7b277b 100644
--- 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
@@ -3,6 +3,7 @@ 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;
+import com.core.common.utils.StringUtils;
 
 /**
  * 租户配置工具类
@@ -30,7 +31,12 @@ public class TenantOptionUtil {
         if (loginUser.getOptionMap() == null || loginUser.getOptionMap().isEmpty()) {
             return null;
         }
-        return loginUser.getOptionMap().get(optionDict.getCode());
+        // return loginUser.getOptionMap().get(optionDict.getCode());
+
+        // TODO:2025/10/17 李永兴提出的sys_option切换TenantOption临时防止报错方案，最晚2025年11月底删除
+        String newValue = loginUser.getOptionMap().get(optionDict.getCode());
+        String oldValue = loginUser.getOptionJson().getString(optionDict.getCode());
+        return StringUtils.isEmpty(newValue) ? oldValue : newValue;
     }
 
 }
diff --git a/openhis-server-new/core-common/pom.xml b/openhis-server-new/core-common/pom.xml
index c6b5ea4c..b73c4296 100644
--- a/openhis-server-new/core-common/pom.xml
+++ b/openhis-server-new/core-common/pom.xml
@@ -142,6 +142,11 @@
             <artifactId>pinyin4j</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/enums/AdjustPriceEnum.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/AdjustPriceEnum.java
new file mode 100644
index 00000000..2bcde809
--- /dev/null
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/AdjustPriceEnum.java
@@ -0,0 +1,32 @@
+package com.core.common.enums;
+
+/**
+ * Desc: 调价类型枚举
+ * @Author raymond
+ * @Date 09:14 2025/10/16
+ * @return
+ **/
+public enum AdjustPriceEnum {
+
+    MEDICINE(0, "药品"),
+    CONSUMABLES(1, "耗材"),
+    DIAGNOSIS(2, "诊疗"),
+    REGISTER(3, "挂号");
+
+
+    private final Integer code;
+    private final String info;
+
+    AdjustPriceEnum(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+}
diff --git a/openhis-server-new/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
index b6916595..a03a2d0f 100644
--- a/openhis-server-new/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
@@ -6,166 +6,93 @@ package com.core.common.enums;
  * @author system
  */
 public enum TenantOptionDict {
+
     /**
      * 医院名称
      */
-    HOSPITAL_NAME("hospitalName", "医院名称", 0),
+    YB_HOSPITAL_NAME("hospitalName", "医保-医院名称", 0),
+
     /**
-     * 医疗机构等级
+     * 医保-医疗机构等级(3101接口)
      */
-    MEDINS_LV("medinsLv", "医疗机构等级", 1),
+    YB_MEDINS_LV("medinsLv", "医保_医疗机构等级", 1),
     /**
      * 定点医药机构编号
      */
-    FIXMEDINS_CODE("fixmedinsCode", "定点医药机构编号", 2),
+    YB_FIXMEDINS_CODE("fixmedinsCode", "医保_定点医药机构编号", 2),
     /**
      * 电子发票appid
      */
-    APP_ID("app_id", "电子发票appid", 3),
+    EINVOICE_APP_ID("app_id", "电子发票-appid", 3),
+
     /**
      * 电子发票key
      */
-    KEY("key", "电子发票key", 4),
+    EINVOICE_KEY("key", "电子发票-key", 4),
+
     /**
      * 电子发票url
      */
-    URL("url", "电子发票url", 5),
+    EINVOICE_URL("url", "电子发票-url", 5),
+
     /**
      * 医保开关
      */
     YB_SWITCH("yb_switch", "医保开关", 6),
-    /**
-     * 客户端私钥
-     */
-    CLI_PRV_KEY("cliPrvKey", "客户端私钥", 7),
-    /**
-     * 客户端公钥
-     */
-    CLI_PUB_KEY("cliPubKey", "客户端公钥", 8),
-    /**
-     * 服务端公钥
-     */
-    SERVER_PUB_KEY("serverPubKey", "服务端公钥", 9),
-    /**
-     * 定点医药机构名称
-     */
-    FIXMEDINS_NAME("fixmedinsName", "定点医药机构名称", 10),
-    /**
-     * 行政区划
-     */
-    ADMVS("admvs", "行政区划", 11),
-    /**
-     * 授权范围
-     */
-    SCOPE("scope", "授权范围", 12),
-    /**
-     * 授权类型
-     */
-    GRANT_TYPE("grantType", "授权类型", 13),
-    /**
-     * 密码
-     */
-    PASSWORD("password", "密码", 14),
-    /**
-     * 用户名
-     */
-    USERNAME("username", "用户名", 15),
-    /**
-     * 客户端安全码
-     */
-    CLIENT_SECRET("clientSecret", "客户端安全码", 16),
-    /**
-     * 客户端ID
-     */
-    CLIENT_ID("clientId", "客户端ID", 17),
-    /**
-     * 生产环境客户端公钥
-     */
-    PROD_CLI_PUB_KEY("prod_cliPubKey", "生产环境客户端公钥", 18),
-    /**
-     * 生产环境客户端私钥
-     */
-    PROD_CLI_PRV_KEY("prod_cliPrvKey", "生产环境客户端私钥", 19),
-    /**
-     * 生产环境客户端ID
-     */
-    PROD_CLIENT_ID("prod_clientId", "生产环境客户端ID", 20),
-    /**
-     * 文件路径
-     */
-    FILE_PATH("filePath", "文件路径", 21),
+
     /**
      * 电子地址
      */
-    ELE_ADDRESS("eleAddress", "电子地址", 22),
+    ELE_ADDRESS("eleAddress", "电子处方-请求地址", 22),
+
     /**
      * 服务地址
      */
     ADDRESS("address", "服务地址", 23),
+
     /**
      * 超时时间
      */
     TIME("time", "超时时间", 24),
+
     /**
      * 是否加密
      */
-    IS_ENCRYPT("isEncrypt", "是否加密", 25),
+    YB_IS_ENCRYPT("isEncrypt", "医保-是否加密", 25),
     /**
      * 医保区划
      */
-    INSUPLC_ADMDVS("insuplc_admdvs", "医保区划", 26),
+    YB_INSUPLC_ADMDVS("insuplc_admdvs", "医保-区划", 26),
+
     /**
      * 电子处方appId
      */
-    PRE_APP_ID("pre_app_id", "电子处方appId", 27),
+    ELE_PRE_APP_ID("pre_app_id", "电子处方-appId", 27),
+
     /**
      * 电子处方appSecret
      */
-    PRE_APP_SECRET("pre_app_secret", "电子处方appSecret", 28),
+    ELE_PRE_APP_SECRET("pre_app_secret", "电子处方-appSecret", 28),
+
     /**
      * 电子处方私钥
      */
-    APP_PRVKEY("APP_PRVKEY", "电子处方私钥", 29),
+    ELE_APP_PRVKEY("APP_PRVKEY", "电子处方-私钥", 29),
+
     /**
      * 电子处方公钥
      */
-    PLAF_PUBKEY("PLAF_PUBKEY", "电子处方公钥", 30),
-    /**
-     * 医保客户端ID
-     */
-    YB_CLIENT_ID("ybClientId", "医保客户端ID", 31),
-    /**
-     * 医保客户端安全码
-     */
-    YB_CLIENT_SECRET("ybClientSecret", "医保客户端安全码", 32),
-    /**
-     * 医保用户名
-     */
-    YB_USERNAME("ybUsername", "医保用户名", 33),
-    /**
-     * 医保密码
-     */
-    YB_PASSWORD("ybPassword", "医保密码", 34),
-    /**
-     * 医保授权类型
-     */
-    YB_GRANT_TYPE("ybGrantType", "医保授权类型", 35),
-    /**
-     * 医保授权范围
-     */
-    YB_SCOPE("ybScope", "医保授权范围", 36),
-    /**
-     * 医保密钥
-     */
-    YB_CLI_PRV_KEY("ybCliPrvKey", "医保密钥", 37),
-    /**
-     * 医保服务URL
-     */
-    YB_URL("ybUrl", "医保服务URL", 38),
+    ELE_PLAF_PUBKEY("PLAF_PUBKEY", "电子处方-公钥", 30),
+
     /**
      * 医院等级
      */
-    HOSPITAL_LV("hospital_lv", "医院等级", 39),
+    EINVOICE_HOSPITAL_LV("hospital_lv", "电子发票-医院等级", 39),
+
+    /**
+     * 无视LIS&PACS报错
+     */
+    LIS_PACS_ERROR_IGNORE("lisPacsErrorIgnore", "无视LIS&PACS报错", 40),
     /**
      * LIS接口地址
      */
@@ -193,11 +120,11 @@ public enum TenantOptionDict {
     /**
      * PACSAppSecret
      */
-    INVOICE_URL("invoiceUrl", "电子发票中转服务的路径", 46),
+    INVOICE_FORWARD_URL("invoiceUrl", "电子发票-中转服务的路径", 46),
     /**
      * PACSAppSecret
      */
-    FORWARD_SWITCH("forwardSwitch", "电子发票中转服务开关", 47),
+    FORWARD_SWITCH("forwardSwitch", "电子发票-中转服务开关", 47),
     /**
      * 食源性开关
      */
@@ -229,7 +156,55 @@ public enum TenantOptionDict {
     /**
      * BPC请求URL
      */
-    BPC_REQUEST_URL("bpcRequestUrl", "BPC请求URL", 55);
+    BPC_REQUEST_URL("bpcRequestUrl", "BPC请求URL", 55),
+    /**
+     * 电子发票开关
+     */
+    INVOICE_SWITCH("invoiceSwitch", "电子发票开关 (0:关闭 1:开启)", 56),
+
+    /**
+     * 医嘱定价来源
+     */
+    ORDER_PRICING_SOURCE("orderPricingSource", "定价来源 batchSellingPrice/retailPrice", 57),
+
+    /**
+     * 三方支付（签到）
+     */
+    THREE_PART_SIGN_URL("threePartSignUrl", "三方支付GET请求", 58),
+    /**
+     * 三方支付（消费）
+     */
+    THREE_PART_PAY_URL("threePartPayUrl", "三方支付GET请求", 59),
+
+    /**
+     * 三方支付（退费）
+     */
+    THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付GET请求", 60),
+
+    /**
+     * 三方支付（隔天退费）
+     */
+    THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付GET请求", 61),
+
+    /**
+     * 三方支付路径（支付结果查询）
+     */
+    THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付GET请求", 62),
+
+    /**
+     * 三方支付路径（退费结果查询）
+     */
+    THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付GET请求", 63),
+
+    /**
+     * 三方支付路径（隔天退费结果查询）
+     */
+    THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付GET请求", 64),
+
+    /**
+     * 三方支付参数
+     */
+    THREE_PART_PARAM("threePartParam", "三方支付GET请求", 65);
 
     private final String code;
     private final String name;
@@ -241,18 +216,6 @@ public enum TenantOptionDict {
         this.sort = sort;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
     public static TenantOptionDict getByCode(String code) {
         if (code == null) {
             return null;
@@ -264,4 +227,16 @@ public enum TenantOptionDict {
         }
         return null;
     }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
 }
diff --git a/openhis-server-new/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
index 5fd0447a..67b7fd42 100644
--- a/openhis-server-new/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
@@ -55,6 +55,17 @@ public class SecurityUtils {
         }
     }
 
+    /**
+     * 获取用户昵称
+     **/
+    public static String getNickName() {
+        try {
+            return getLoginUser().getUser().getNickName();
+        } catch (Exception e) {
+            throw new ServiceException("获取用户昵称异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
+
     /**
      * 获取用户
      **/
diff --git a/openhis-server-new/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
index 779d8f2b..99dec13b 100644
--- a/openhis-server-new/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
@@ -6,6 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
@@ -45,6 +46,11 @@ public class RedisConfig extends CachingConfigurerSupport {
         return redisScript;
     }
 
+    @Bean
+    public ValueOperations<Object, Object> valueOperations(RedisTemplate<Object, Object> redisTemplate) {
+        return redisTemplate.opsForValue();
+    }
+
     /**
      * 限流脚本
      */
diff --git a/openhis-server-new/openhis-application/pom.xml b/openhis-server-new/openhis-application/pom.xml
index 18f038e6..4849ac96 100644
--- a/openhis-server-new/openhis-application/pom.xml
+++ b/openhis-server-new/openhis-application/pom.xml
@@ -55,6 +55,11 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <!-- rabbitMQ -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java
new file mode 100644
index 00000000..7e9f733b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/IAdjustPriceService.java
@@ -0,0 +1,204 @@
+package com.openhis.web.adjustprice.appservice;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
+import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+
+/**
+ * Desc: 调价业务接口
+ * 
+ * @Author raymond
+ * @Date 08:42 2025/10/16
+ * @return
+ **/
+public interface IAdjustPriceService {
+    /**
+     * Desc: 保存调价数据
+     * 
+     * @param dataVoList 前端数据集合
+     * @Author raymond
+     * @Date 08:57 2025/10/16
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> submitChangePriceData(List<AdjustPriceDataVo> dataVoList);
+
+    /**
+     * Desc: 保存并提交审核调价数据
+     * 
+     * @param dataVoList
+     * @Author raymond
+     * @Date 16:22 2025/10/23
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> submitExamineChangePriceData(List<AdjustPriceDataVo> dataVoList);
+
+    /**
+     * Desc: 根据关键词查询 药品|耗材|诊疗 集合的最后价格
+     * 
+     * @param searchKey
+     * @Author raymond
+     * @Date 09:32 2025/10/20
+     * @return java.util.List<?>
+     **/
+    R<?> searchKeyWordDataListByMed(String searchKey);
+
+    /**
+     * Desc: 根据关键词查询 药品|耗材|诊疗 集合的最后价格
+     * 
+     * @param searchKey
+     * @Author raymond
+     * @Date 09:32 2025/10/20
+     * @return java.util.List<?>
+     **/
+    R<?> searchKeyWordDataListByDevice(String searchKey);
+
+    /**
+     * Desc: 根据关键词查询 药品|耗材|诊疗 集合的最后价格
+     * 
+     * @param searchKey
+     * @Author raymond
+     * @Date 09:32 2025/10/20
+     * @return java.util.List<?>
+     **/
+    R<?> searchKeyWordDataListByActivity(String searchKey);
+
+    /**
+     * Desc: 查询提交的改价数据
+     * 
+     * @param adjustPriceManagerSearchParam
+     * @param pageNo
+     * @param pageSize
+     * @param searchKey
+     * @param request
+     * @Author raymond
+     * @Date 23:39 2025/11/1
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchChangePriceSubmitDataToPage(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * Desc: 根据busNo 查询调价单详情 med
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 13:15 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchChangePriceDataByMed(String busNo);
+
+    /**
+     * Desc: 根据busNo 查询调价单详情 med
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 13:15 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchChangePriceDataByDevice(String busNo);
+
+    /**
+     * Desc: 根据busNo 查询调价单详情 Activity
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 13:15 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchChangePriceDataByActivity(String busNo);
+
+    /**
+     * Desc: 根据busNo 查询调价单详情 Health
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 13:15 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchChangePriceDataByHealth(String busNo);
+
+    /**
+     * Desc: 修改调价原因 和 价格
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 15:21 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> cancelChangePriceData(String busNo);
+
+    /**
+     * Desc: 查询有挂号信息的科室
+     * 
+     * @param
+     * @Author raymond
+     * @Date 16:38 2025/10/22
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchAllOrgData();
+
+    /**
+     * Desc: 根据科室id 加载挂号数据
+     * 
+     * @param orgId
+     * @Author raymond
+     * @Date 16:45 2025/10/22
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> searchHealthData(Long orgId);
+
+    /**
+     * Desc: 根据业务单据号 进行单据提交操作
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 09:25 2025/10/23
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> updateExamineByApproval(String busNo);
+
+    /**
+     * Desc: 根据药品ID 是否在审核中
+     * 
+     * @param itemId
+     * @Author raymond
+     * @Date 17:48 2025/11/3
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> checkMedApprovalExist(Long itemId);
+
+    /**
+     * Desc: 根据耗材ID 是否在审核中
+     * 
+     * @param itemId
+     * @Author raymond
+     * @Date 17:48 2025/11/3
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> checkDeviceApprovalExist(Long itemId);
+
+    /**
+     * Desc: 根据诊疗ID 是否在审核中
+     * 
+     * @param itemId
+     * @Author raymond
+     * @Date 17:48 2025/11/3
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> checkActivityApprovalExist(Long itemId);
+
+    /**
+     * Desc: 根据挂号ID 是否在审核中
+     * 
+     * @param itemId
+     * @Author raymond
+     * @Date 17:48 2025/11/3
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> checkHealthApprovalExist(Long itemId);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/ISupplyService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/ISupplyService.java
deleted file mode 100644
index ce7cda3d..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/ISupplyService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.openhis.web.adjustprice.appservice;
-
-import com.openhis.web.adjustprice.dto.SupplyListDto;
-
-import java.util.List;
-
-/**
- * Desc:
- * @Author raymond
- * @Date 16:09 2025/10/15
- * @return
- **/
-public interface ISupplyService {
-    /**
-     * Desc:
-     * @param
-     * @Author raymond
-     * @Date 17:10 2025/10/15
-     * @return java.util.List<com.openhis.web.paymentmanage.dto.SupplyListDto>
-     **/
-    List<SupplyListDto> searchAllSupplyList();
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
new file mode 100644
index 00000000..36c8daae
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/AdjustPriceServiceImpl.java
@@ -0,0 +1,594 @@
+package com.openhis.web.adjustprice.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+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.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.enums.AdjustPriceEnum;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.core.system.service.ISysDictDataService;
+import com.openhis.administration.domain.ChangePriceRecord;
+import com.openhis.administration.dto.ChangePriceDataDto;
+import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
+import com.openhis.administration.dto.HealthcareDto;
+import com.openhis.administration.dto.OrgDataDto;
+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.common.utils.RedisKeys;
+import com.openhis.common.utils.RedisUtil;
+import com.openhis.medication.service.IMedicationService;
+import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
+import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
+import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import com.openhis.web.adjustprice.dto.ChangePricePageDto;
+import com.openhis.web.adjustprice.mapper.AdjustPriceMapper;
+import com.openhis.web.inventorymanage.dto.InventorySearchParam;
+import com.openhis.workflow.dto.ActivityDto;
+import com.openhis.workflow.dto.AdjustPriceDto;
+import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.workflow.service.IInventoryItemService;
+
+/**
+ * @ClassName AdjustPriceServiceImpl
+ * @Description 调价业务实现
+ * @Author raymond
+ * @Date 2025/10/15 16:10
+ * @Version 1.0
+ **/
+@Service
+public class AdjustPriceServiceImpl implements IAdjustPriceService {
+    @Resource
+    private IInventoryItemService inventoryItemService;
+    @Resource
+    private IActivityDefinitionService activityDefinitionService;
+    @Resource
+    private IHealthcareServiceService healthcareServiceService;
+    @Resource
+    private IMedicationService medicationService;
+    @Resource
+    private AdjustPriceMapper adjustPriceMapper;
+    @Resource
+    private IDeviceDefinitionService deviceDefinitionService;
+    @Resource
+    private IOrganizationService organizationService;
+    @Resource
+    private IChargeItemDefinitionService chargeItemDefinitionService;
+    @Resource
+    private IChangePriceRecordService changePriceRecordService;
+    @Resource
+    private ISysDictDataService sysDictDataService;
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> submitChangePriceData(List<AdjustPriceDataVo> dataVoList) {
+        if (dataVoList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00001, null));
+        }
+        if (dataVoList.stream()
+            .anyMatch(data -> this.redisUtil.hasKey(RedisKeys.getProductsKey(data.getItemId().toString())))) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+        }
+        //获取数据中的类型
+        Integer categoryType = dataVoList.get(0).getCategoryType();
+        // 单据号
+        String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.CHANGE_PRICE_BUZ.getPrefix());
+        // 当前人
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 根据表单提交的tab 进入不同的 execute
+        if (AdjustPriceEnum.MEDICINE.getCode().equals(categoryType)
+            || AdjustPriceEnum.CONSUMABLES.getCode().equals(categoryType)) {
+            //如果是 药品或者是耗材 因为药品和耗材的价格取的是 charge_detail表
+            this.executeChangePriceForMedication(dataVoList, busNo, practitionerId, categoryType);
+        } else if (AdjustPriceEnum.DIAGNOSIS.getCode().equals(categoryType)) {
+            //如果是 如果是 诊疗， 取价格主表
+            this.executeChangePriceForActivity(dataVoList, busNo, practitionerId);
+        } else {
+            //如果是 如果是 挂号， 取价格主表
+            this.executeChangePriceForHealth(dataVoList, busNo, practitionerId);
+        }
+        return R.ok();
+    }
+
+    @Override
+    public R<?> submitExamineChangePriceData(List<AdjustPriceDataVo> dataVoList) {
+        if (dataVoList.isEmpty()) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00001, null));
+        }
+        if (dataVoList.stream()
+            .anyMatch(data -> this.redisUtil.hasKey(RedisKeys.getProductsKey(data.getItemId().toString())))) {
+            return R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+        }
+        //获取数据中的类型
+        Integer categoryType = dataVoList.get(0).getCategoryType();
+        // 单据号
+        String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.CHANGE_PRICE_BUZ.getPrefix());
+        // 当前人
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 根据表单提交的tab 进入不同的 execute
+        if (AdjustPriceEnum.MEDICINE.getCode().equals(categoryType)
+            || AdjustPriceEnum.CONSUMABLES.getCode().equals(categoryType)) {
+            this.executeChangePriceForMedicationExamine(dataVoList, busNo, practitionerId, categoryType);
+        } else if (AdjustPriceEnum.DIAGNOSIS.getCode().equals(categoryType)) {
+            this.executeChangePriceForActivityExamine(dataVoList, busNo, practitionerId);
+        } else {
+            this.executeChangePriceForHealthExamine(dataVoList, busNo, practitionerId);
+        }
+        return R.ok();
+    }
+
+    @Override
+    public R<?> searchKeyWordDataListByMed(String searchKey) {
+        //如果 searchKey == null 默认返回10条，反则 查询所有
+        return R.ok(this.medicationService.searchMedListByKeyWord(searchKey));
+    }
+
+    @Override
+    public R<?> searchKeyWordDataListByDevice(String searchKey) {
+        //如果 searchKey == null 默认返回10条，反则 查询所有
+        return R.ok(this.deviceDefinitionService.searchDeviceListByKeyWord(searchKey));
+    }
+
+    @Override
+    public R<?> searchKeyWordDataListByActivity(String searchKey) {
+        //如果 searchKey == null 默认返回10条，反则 查询所有
+        return R.ok(this.activityDefinitionService.searchActivityListByKeyWord(searchKey));
+    }
+
+    @Override
+    public R<?> searchChangePriceSubmitDataToPage(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam,
+        Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        HashSet<String> searchFields = new HashSet<>();
+        searchFields.add(CommonConstants.FieldName.BusNo);
+        // 构建查询条件
+        QueryWrapper<InventorySearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(adjustPriceManagerSearchParam, searchKey, searchFields, request);
+        // 查询入库单据分页列表
+        Page<ChangePricePageDto> changePricePageDtoPage = this.adjustPriceMapper.searchChangePriceDataToPage(
+            new Page<>(pageNo, pageSize), queryWrapper, SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue(),
+            SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue(), SupplyType.REQUEST_ACTIVITY_CHANGE_PRICE.getValue(),
+            SupplyType.REQUEST_HEALTH_CHANGE_PRICE.getValue(), practitionerId);
+        changePricePageDtoPage.getRecords().forEach(e -> {
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getItemCategoryEnum()));
+        });
+        return R.ok(changePricePageDtoPage);
+    }
+
+    @Override
+    public R<?> searchChangePriceDataByMed(String busNo) {
+        // 根据 单据号 查询 药品详情
+        List<ChangePriceDataDto> dataList = this.changePriceRecordService.searchMedChangePriceByBusNo(busNo,
+            SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue(), null);
+        // 获取 药品的单位
+        for (ChangePriceDataDto changePriceDataDto : dataList) {
+            SysDictData sysDictData =
+                sysDictDataService.selectDictInfo(CommonConstants.FieldName.UnitCode, changePriceDataDto.getUnitCode());
+            changePriceDataDto.setLabel(sysDictData.getDictLabel());
+        }
+        return R.ok(dataList);
+    }
+
+    @Override
+    public R<?> searchChangePriceDataByDevice(String busNo) {
+        //根据 单据号 耗材调价单详情
+        return R.ok(this.changePriceRecordService.searchDeviceChangePriceByBusNo(busNo,
+            SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue(), null));
+    }
+
+    @Override
+    public R<?> searchChangePriceDataByActivity(String busNo) {
+        //根据 单据号 查询 诊疗调价单详情
+        return R.ok(this.changePriceRecordService.searchActivityChangePriceByBusNo(busNo,
+            SupplyType.REQUEST_ACTIVITY_CHANGE_PRICE.getValue(), null));
+    }
+
+    @Override
+    public R<?> searchChangePriceDataByHealth(String busNo) {
+        //根据 单据号 挂号调价单详情
+        return R.ok(this.changePriceRecordService.searchHealthChangePriceByBusNo(busNo,
+            SupplyType.REQUEST_HEALTH_CHANGE_PRICE.getValue(), null));
+    }
+
+    @Override
+    public R<?> cancelChangePriceData(String busNo) {
+        //根据 单据号查询出 当前所有请求调价的数据集
+        List<ChangePriceRecord> changePriceRecordList =
+            this.changePriceRecordService.searchChangePriceDataForBusNo(busNo);
+        //循环数据集合，将状态修改为 无效状态
+        for (ChangePriceRecord data : changePriceRecordList) {
+            ChangePriceRecord changePriceRecord = this.changePriceRecordService.getById(data.getId());
+            changePriceRecord.setStatusEnum(SupplyStatus.EXPIRED_INVALIDATED.getValue());
+            this.changePriceRecordService.updateById(changePriceRecord);
+        }
+        return R.ok();
+    }
+
+    @Override
+    public R<?> searchAllOrgData() {
+        //查询所有科室
+        List<OrgDataDto> orgDataList = this.organizationService.searchOrgDataByHealth();
+        return R.ok(orgDataList);
+    }
+
+    @Override
+    public R<?> searchHealthData(Long orgId) {
+        //根据科室ID 查询所有号源
+        return R.ok(this.healthcareServiceService.searchAllHeathData(orgId,PublicationStatus.ACTIVE.getValue()));
+    }
+
+    @Override
+    public R<?> updateExamineByApproval(String busNo) {
+        //根据调价单编号 查询 分组后的 数据
+        List<ChangePriceRecord> changePriceRecordList =
+            this.changePriceRecordService.searchChangePriceDataGroupByBusNo(busNo);
+        if (!changePriceRecordList.isEmpty()) {
+            // 循环将数据进行填充
+            for (ChangePriceRecord data : changePriceRecordList) {
+                //提交 审批时，查看是否有正在审核中的 货品数据 。根据 货品ID 从redis中查询
+                if (this.redisUtil.hasKey(RedisKeys.getProductsKey(data.getItemId().toString()))) {
+                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+                }
+                //如果不存在，向redis中插入 药品信息 = 给当前 货品上锁 。审批通过或驳回后 释放
+                this.redisUtil.set(RedisKeys.getProductsKey(data.getItemId().toString()), data.getItemId());
+            }
+            //根据 busNo 修改调价单状态
+            this.changePriceRecordService.submitApproval(busNo);
+        }
+        return R.ok();
+    }
+
+    @Override
+    public R<?> checkMedApprovalExist(Long itemId) {
+        //添加 货品调价时，先查询 当前货品是否在 审核中，如果在，不允许改价。
+        return this.changePriceRecordService.searchMedChangePriceByItemId(itemId,
+            SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue(), SupplyStatus.APPROVAL.getValue()).isEmpty() ? R.ok()
+                : R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+    }
+
+    @Override
+    public R<?> checkDeviceApprovalExist(Long itemId) {
+        //添加 货品调价时，先查询 当前货品是否在 审核中，如果在，不允许改价。
+        return this.changePriceRecordService.searchDeviceChangePriceByItemId(itemId,
+            SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue(), SupplyStatus.APPROVAL.getValue()).isEmpty() ? R.ok()
+                : R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+    }
+
+    @Override
+    public R<?> checkActivityApprovalExist(Long itemId) {
+        //添加 货品调价时，先查询 当前货品是否在 审核中，如果在，不允许改价。
+        return this.changePriceRecordService.searchActivityChangePriceByItemId(itemId,
+            SupplyType.REQUEST_ACTIVITY_CHANGE_PRICE.getValue(), SupplyStatus.APPROVAL.getValue()).isEmpty() ? R.ok()
+                : R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+    }
+
+    @Override
+    public R<?> checkHealthApprovalExist(Long itemId) {
+        //添加 货品调价时，先查询 当前货品是否在 审核中，如果在，不允许改价。
+        return this.changePriceRecordService.searchHealthChangePriceByItemId(itemId,
+            SupplyType.REQUEST_HEALTH_CHANGE_PRICE.getValue(), SupplyStatus.APPROVAL.getValue()).isEmpty() ? R.ok()
+                : R.fail(MessageUtils.createMessage(PromptMsgConstant.AdjustPrice.M00002, null));
+    }
+
+    public boolean executeChangePriceForMedication(List<AdjustPriceDataVo> dataVoList, String busNo,
+        Long practitionerId, Integer categoryType) {
+        // 有库存的药品或耗材集合
+        List<AdjustPriceDataVo> resultList = new LinkedList<>();
+        // 从map中将表单集合取出
+        Map<Long, AdjustPriceDataVo> dataVoMap = this.executeMap(dataVoList);
+        //根据表单中的id数组 加载库存集合
+        List<AdjustPriceDto> inventoryItemList =
+            this.inventoryItemService.searchResultDataList(this.executeItemIds(dataVoList));
+        for (AdjustPriceDto data : inventoryItemList) {
+            AdjustPriceDataVo dataVo = new AdjustPriceDataVo();
+            dataVo.setTotalQuantity(data.getTotalCount());
+            dataVo.setItemTable(data.getItemTable());
+            dataVo.setItemId(data.getItemId());
+            dataVo.setNewBuyingPrice(dataVoMap.get(data.getItemId()).getNewBuyingPrice());
+            dataVo.setNewRetailPrice(dataVoMap.get(data.getItemId()).getNewRetailPrice());
+            dataVo.setReason(dataVoMap.get(data.getItemId()).getReason());
+            dataVo.setUnitCode(dataVoMap.get(data.getItemId()).getUnitCode());
+            dataVo.setLotNumber(data.getLotNumber());
+            dataVo.setLocationId(data.getLocationId());
+            resultList.add(dataVo);
+        }
+        //填充 ChangePriceRecord 对象，返回list进行批量添加
+        List<ChangePriceRecord> changePriceRecords =
+            this.executeChangePriceData(busNo, practitionerId, resultList, SupplyStatus.PENDING_APPROVAL.getValue(),
+                AdjustPriceEnum.MEDICINE.getCode().equals(categoryType)
+                    ? SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue()
+                    : SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue());
+        return this.changePriceRecordService.saveOrUpdateBatch(changePriceRecords);
+    }
+
+    public boolean executeChangePriceForMedicationExamine(List<AdjustPriceDataVo> dataVoList, String busNo,
+        Long practitionerId, Integer categoryType) {
+        // 有库存的药品或耗材集合
+        List<AdjustPriceDataVo> resultList = new LinkedList<>();
+        Map<Long, AdjustPriceDataVo> dataVoMap = this.executeMap(dataVoList);
+        List<AdjustPriceDto> inventoryItemList =
+            this.inventoryItemService.searchResultDataList(this.executeItemIds(dataVoList));
+        for (AdjustPriceDto data : inventoryItemList) {
+            AdjustPriceDataVo dataVo = new AdjustPriceDataVo();
+            dataVo.setTotalQuantity(data.getTotalCount());
+            dataVo.setItemTable(data.getItemTable());
+            dataVo.setItemId(data.getItemId());
+            dataVo.setNewBuyingPrice(dataVoMap.get(data.getItemId()).getNewBuyingPrice());
+            dataVo.setNewRetailPrice(dataVoMap.get(data.getItemId()).getNewRetailPrice());
+            dataVo.setReason(dataVoMap.get(data.getItemId()).getReason());
+            dataVo.setUnitCode(dataVoMap.get(data.getItemId()).getUnitCode());
+            dataVo.setLotNumber(data.getLotNumber());
+            dataVo.setLocationId(data.getLocationId());
+            resultList.add(dataVo);
+            this.redisUtil.set(RedisKeys.getProductsKey(data.getItemId().toString()), data.getItemId());
+        }
+        //填充 ChangePriceRecord 对象，返回list进行批量添加
+        List<ChangePriceRecord> changePriceRecords =
+            this.executeChangePriceData(busNo, practitionerId, resultList, SupplyStatus.APPROVAL.getValue(),
+                AdjustPriceEnum.MEDICINE.getCode().equals(categoryType)
+                    ? SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue()
+                    : SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue());
+        return this.changePriceRecordService.saveOrUpdateBatch(changePriceRecords);
+    }
+
+    public boolean executeChangePriceForActivity(List<AdjustPriceDataVo> dataVoList, String busNo,
+        Long practitionerId) {
+        List<ActivityDto> dataDtoList =
+            this.activityDefinitionService.searchActivityDefinitionByIds(this.executeItemIds(dataVoList));
+        Map<Long, AdjustPriceDataVo> dataVoMap = this.executeMap(dataVoList);
+        List<AdjustPriceDataVo> resultList = new LinkedList<>();
+        for (ActivityDto data : dataDtoList) {
+            AdjustPriceDataVo dataVo = new AdjustPriceDataVo();
+            dataVo.setItemTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
+            dataVo.setName(data.getName());
+            dataVo.setItemId(data.getItemId());
+            dataVo.setNewBuyingPrice(dataVoMap.get(data.getItemId()).getNewBuyingPrice());
+            dataVo.setNewRetailPrice(dataVoMap.get(data.getItemId()).getNewRetailPrice());
+            dataVo.setReason(dataVoMap.get(data.getItemId()).getReason());
+            dataVo.setLotNumber(dataVoMap.get(data.getItemId()).getLotNumber());
+            resultList.add(dataVo);
+        }
+        //填充 ChangePriceRecord 对象，返回list进行批量添加
+        List<ChangePriceRecord> changePriceRecords = this.executeChangePriceData(busNo, practitionerId, resultList,
+            SupplyStatus.PENDING_APPROVAL.getValue(), SupplyType.REQUEST_ACTIVITY_CHANGE_PRICE.getValue());
+        return this.changePriceRecordService.saveOrUpdateBatch(changePriceRecords);
+    }
+
+    /**
+     * Desc: 处理申请 诊疗改价业务申请
+     * 
+     * @param dataVoList
+     * @Author raymond
+     * @Date 11:19 2025/10/18
+     * @return boolean
+     **/
+    public boolean executeChangePriceForActivityExamine(List<AdjustPriceDataVo> dataVoList, String busNo,
+        Long practitionerId) {
+        List<ActivityDto> dataDtoList =
+            this.activityDefinitionService.searchActivityDefinitionByIds(this.executeItemIds(dataVoList));
+        Map<Long, AdjustPriceDataVo> dataVoMap = this.executeMap(dataVoList);
+        List<AdjustPriceDataVo> resultList = new LinkedList<>();
+        for (ActivityDto data : dataDtoList) {
+            AdjustPriceDataVo dataVo = new AdjustPriceDataVo();
+            dataVo.setItemTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
+            dataVo.setName(data.getName());
+            dataVo.setItemId(data.getItemId());
+            dataVo.setNewBuyingPrice(dataVoMap.get(data.getItemId()).getNewBuyingPrice());
+            dataVo.setNewRetailPrice(dataVoMap.get(data.getItemId()).getNewRetailPrice());
+            dataVo.setReason(dataVoMap.get(data.getItemId()).getReason());
+            dataVo.setLotNumber(dataVoMap.get(data.getItemId()).getLotNumber());
+            resultList.add(dataVo);
+            this.redisUtil.set(RedisKeys.getProductsKey(data.getItemId().toString()), data.getItemId());
+        }
+        //填充 ChangePriceRecord 对象，返回list进行批量添加
+        List<ChangePriceRecord> changePriceRecords = this.executeChangePriceData(busNo, practitionerId, resultList,
+            SupplyStatus.APPROVAL.getValue(), SupplyType.REQUEST_ACTIVITY_CHANGE_PRICE.getValue());
+        return this.changePriceRecordService.saveOrUpdateBatch(changePriceRecords);
+    }
+
+    /**
+     * Desc: 处理申请 挂号改价业务
+     *
+     * @param dataVoList
+     * @Author raymond
+     * @Date 11:20 2025/10/18
+     * @return boolean
+     **/
+    public boolean executeChangePriceForHealth(List<AdjustPriceDataVo> dataVoList, String busNo, Long practitionerId) {
+        List<HealthcareDto> dataDtoList =
+            this.healthcareServiceService.searchHealthByIds(this.executeItemIds(dataVoList));
+        List<AdjustPriceDataVo> resultList = new LinkedList<>();
+        Map<Long, AdjustPriceDataVo> dataVoMap = this.executeMap(dataVoList);
+        for (HealthcareDto data : dataDtoList) {
+            AdjustPriceDataVo dataVo = new AdjustPriceDataVo();
+            dataVo.setItemTable(CommonConstants.TableName.ADM_HEALTHCARE_SERVICE);
+            dataVo.setItemId(data.getItemId());
+            dataVo.setName(data.getName());
+            dataVo.setNewBuyingPrice(dataVoMap.get(data.getItemId()).getNewBuyingPrice());
+            dataVo.setNewRetailPrice(dataVoMap.get(data.getItemId()).getNewRetailPrice());
+            dataVo.setReason(dataVoMap.get(data.getItemId()).getReason());
+            dataVo.setLotNumber(dataVoMap.get(data.getItemId()).getLotNumber());
+            resultList.add(dataVo);
+        }
+        //填充 ChangePriceRecord 对象，返回list进行批量添加 supply_request表共享了 审核状态和 category 枚举
+        List<ChangePriceRecord> changePriceRecords = this.executeChangePriceData(busNo, practitionerId, resultList,
+            SupplyStatus.PENDING_APPROVAL.getValue(), SupplyType.REQUEST_HEALTH_CHANGE_PRICE.getValue());
+        return this.changePriceRecordService.saveOrUpdateBatch(changePriceRecords);
+    }
+
+    /**
+     * Desc: 处理申请 挂号改价业务
+     *
+     * @param dataVoList
+     * @Author raymond
+     * @Date 11:20 2025/10/18
+     * @return boolean
+     **/
+    public boolean executeChangePriceForHealthExamine(List<AdjustPriceDataVo> dataVoList, String busNo,
+        Long practitionerId) {
+        List<HealthcareDto> dataDtoList =
+            this.healthcareServiceService.searchHealthByIds(this.executeItemIds(dataVoList));
+        List<AdjustPriceDataVo> resultList = new LinkedList<>();
+        Map<Long, AdjustPriceDataVo> dataVoMap = this.executeMap(dataVoList);
+        for (HealthcareDto data : dataDtoList) {
+            AdjustPriceDataVo dataVo = new AdjustPriceDataVo();
+            dataVo.setItemTable(CommonConstants.TableName.ADM_HEALTHCARE_SERVICE);
+            dataVo.setItemId(data.getItemId());
+            dataVo.setName(data.getName());
+            dataVo.setNewBuyingPrice(dataVoMap.get(data.getItemId()).getNewBuyingPrice());
+            dataVo.setNewRetailPrice(dataVoMap.get(data.getItemId()).getNewRetailPrice());
+            dataVo.setReason(dataVoMap.get(data.getItemId()).getReason());
+            dataVo.setLotNumber(dataVoMap.get(data.getItemId()).getLotNumber());
+            resultList.add(dataVo);
+            this.redisUtil.set(RedisKeys.getProductsKey(data.getItemId().toString()), data.getItemId());
+        }
+        //填充 ChangePriceRecord 对象，返回list进行批量添加 supply_request表共享了 审核状态和 category 枚举
+        List<ChangePriceRecord> changePriceRecords = this.executeChangePriceData(busNo, practitionerId, resultList,
+            SupplyStatus.APPROVAL.getValue(), SupplyType.REQUEST_HEALTH_CHANGE_PRICE.getValue());
+        return this.changePriceRecordService.saveOrUpdateBatch(changePriceRecords);
+    }
+
+    /**
+     * Desc: 封装对象数据
+     *
+     * @param busNo
+     * @param curUserId
+     * @param itemList
+     * @Author raymond
+     * @Date 09:35 2025/10/18
+     * @return java.util.List<com.openhis.workflow.domain.ChangePriceRecord>
+     **/
+    public List<ChangePriceRecord> executeChangePriceData(String busNo, Long curUserId,
+        List<AdjustPriceDataVo> itemList, Integer statusEnum, Integer categoryEnum) {
+        List<ChangePriceRecord> srList = new LinkedList<>();
+        for (AdjustPriceDataVo dataVo : itemList) {
+            ChangePriceRecord cpr = new ChangePriceRecord();
+            //如果是 药品调价
+            if (SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue().equals(categoryEnum)) {
+                // 获取当前进货价
+                ChargeItemDefDetailPriceDto buyingPriceDto = this.chargeItemDefinitionService
+                    .getMedPriceByParam(ConditionCode.LOT_NUMBER_COST.getCode(), dataVo.getItemId());
+                // 获取当前零售价
+                ChargeItemDefDetailPriceDto retailPriceDto = this.chargeItemDefinitionService
+                    .getMedPriceByParam(ConditionCode.LOT_NUMBER_PRICE.getCode(), dataVo.getItemId());
+                if (buyingPriceDto != null || retailPriceDto != null) {
+                    // 库存 以最小单位存储，以货品最小单位进行计算
+                    BigDecimal partPercent =
+                        dataVo.getTotalQuantity().divide(buyingPriceDto.getPartPercent(), 6, RoundingMode.HALF_UP);
+                    //进货价盈负差
+                    BigDecimal buyingDiffPrice =
+                        dataVo.getNewBuyingPrice().subtract(buyingPriceDto.getPrice()).multiply(partPercent);
+                    // 零售价盈负差
+                    BigDecimal retailDiffPrice =
+                        dataVo.getNewRetailPrice().subtract(retailPriceDto.getPrice()).multiply(partPercent);
+                    //填充 change_price_record表数据
+                    cpr.setNewBuyingPrice(dataVo.getNewBuyingPrice()).setNewRetailPrice(dataVo.getNewRetailPrice())
+                        .setItemQuantity(dataVo.getTotalQuantity()).setItemId(dataVo.getItemId())
+                        .setItemTable(dataVo.getItemTable()).setReason(dataVo.getReason()).setBusNo(busNo)
+                        .setApplicantId(curUserId).setStatusEnum(statusEnum).setItemCategoryEnum(categoryEnum)
+                        .setLotNumber(dataVo.getLotNumber()).setUnitCode(dataVo.getUnitCode())
+                        .setOriginBuyingPrice(buyingPriceDto.getPrice()).setOriginRetailPrice(retailPriceDto.getPrice())
+                        .setDifferenceBuyingPrice(buyingDiffPrice).setDifferenceRetailPrice(retailDiffPrice)
+                        .setApplicantTime(SupplyStatus.APPROVAL.getValue().equals(statusEnum) ? new Date() : null);
+                    srList.add(cpr);
+                } //如果是 耗材调价
+            } else if (SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue().equals(categoryEnum)) {
+                // 获取当前进货价
+                ChargeItemDefDetailPriceDto buyingPriceDto = this.chargeItemDefinitionService
+                    .getDevicePriceByParam(ConditionCode.LOT_NUMBER_COST.getCode(), dataVo.getItemId());
+                // 获取当前零售价
+                ChargeItemDefDetailPriceDto retailPriceDto = this.chargeItemDefinitionService
+                    .getDevicePriceByParam(ConditionCode.LOT_NUMBER_PRICE.getCode(), dataVo.getItemId());
+                if (buyingPriceDto != null || retailPriceDto != null) {
+                    // 库存 以最小单位存储，以货品最小单位进行计算
+                    BigDecimal partPercent =
+                        dataVo.getTotalQuantity().divide(buyingPriceDto.getPartPercent(), 6, RoundingMode.HALF_UP);
+                    //进货价盈负差
+                    BigDecimal buyingDiffPrice =
+                        dataVo.getNewBuyingPrice().subtract(buyingPriceDto.getPrice()).multiply(partPercent);
+                    // 零售价盈负差
+                    BigDecimal retailDiffPrice =
+                        dataVo.getNewRetailPrice().subtract(retailPriceDto.getPrice()).multiply(partPercent);
+                    //填充 change_price_record表数据
+                    cpr.setNewBuyingPrice(dataVo.getNewBuyingPrice()).setNewRetailPrice(dataVo.getNewRetailPrice())
+                        .setItemQuantity(dataVo.getTotalQuantity()).setItemId(dataVo.getItemId()).setLocationId(dataVo.getLocationId())
+                        .setItemTable(dataVo.getItemTable()).setReason(dataVo.getReason()).setBusNo(busNo)
+                        .setApplicantId(curUserId).setStatusEnum(statusEnum).setItemCategoryEnum(categoryEnum)
+                        .setLotNumber(dataVo.getLotNumber()).setUnitCode(dataVo.getUnitCode())
+                        .setOriginBuyingPrice(buyingPriceDto.getPrice()).setOriginRetailPrice(retailPriceDto.getPrice())
+                        .setDifferenceBuyingPrice(buyingDiffPrice).setDifferenceRetailPrice(retailDiffPrice)
+                        .setApplicantTime(SupplyStatus.APPROVAL.getValue().equals(statusEnum) ? new Date() : null);
+                    srList.add(cpr);
+                }
+            } else {//如果是 诊疗或者挂号调价，诊疗和耗材 没有库存
+                ChargeItemDefDetailPriceDto retailPriceDto = this.chargeItemDefinitionService
+                    .getProductPrice(PublicationStatus.ACTIVE.getValue(), dataVo.getItemId());
+                if (retailPriceDto != null) {
+                    //新价格 - 原价格
+                    BigDecimal retailDiffPrice = dataVo.getNewRetailPrice().subtract(retailPriceDto.getPrice());
+                    //填充 change_price_record表数据
+                    cpr.setNewBuyingPrice(dataVo.getNewBuyingPrice()).setNewRetailPrice(dataVo.getNewRetailPrice())
+                        .setItemQuantity(dataVo.getTotalQuantity()).setItemId(dataVo.getItemId())
+                        .setItemTable(dataVo.getItemTable()).setReason(dataVo.getReason()).setBusNo(busNo)
+                        .setApplicantId(curUserId).setStatusEnum(statusEnum).setItemCategoryEnum(categoryEnum)
+                        .setLotNumber(dataVo.getLotNumber()).setUnitCode(dataVo.getUnitCode())
+                        .setOriginRetailPrice(retailPriceDto.getPrice()).setDifferenceRetailPrice(retailDiffPrice)
+                        .setApplicantTime(SupplyStatus.APPROVAL.getValue().equals(statusEnum) ? new Date() : null);
+                    srList.add(cpr);
+                }
+            }
+        }
+        return srList;
+    }
+
+    /**
+     * Desc: 封装获取药品和耗材的id数组
+     *
+     * @param dataVoList
+     * @Author raymond
+     * @Date 08:03 2025/10/18
+     * @return java.util.List<java.lang.Long>
+     **/
+    public List<Long> executeItemIds(List<AdjustPriceDataVo> dataVoList) {
+        List<Long> itemIds = new LinkedList<>();
+        for (AdjustPriceDataVo data : dataVoList) {
+            itemIds.add(data.getItemId());
+        }
+        return itemIds;
+    }
+    /**
+     * Desc: 存储表单数据
+     * @param dataVoList
+     * @Author raymond
+     * @Date 10:28 2025/11/5
+     * @return java.util.Map<java.lang.Long,com.openhis.web.adjustprice.dto.AdjustPriceDataVo>
+     **/
+    public Map<Long, AdjustPriceDataVo> executeMap(List<AdjustPriceDataVo> dataVoList) {
+        Map<Long, AdjustPriceDataVo> map = new ConcurrentHashMap<>();
+        for (AdjustPriceDataVo data : dataVoList) {
+            map.put(data.getItemId(), data);
+        }
+        return map;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/SupplyServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/SupplyServiceImpl.java
deleted file mode 100644
index 55283471..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/appservice/impl/SupplyServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.openhis.web.adjustprice.appservice.impl;
-
-import com.openhis.web.adjustprice.appservice.ISupplyService;
-import com.openhis.web.adjustprice.dto.SupplyListDto;
-import com.openhis.web.adjustprice.mapper.SupplyMapper;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @ClassName ChangePriceImpl
- * @Description TODO
- * @Author raymond
- * @Date 2025/10/15 16:10
- * @Version 1.0
- **/
-@Component
-public class SupplyServiceImpl implements ISupplyService {
-
-    @Resource
-    private SupplyMapper supplyMapper;
-
-    @Override
-    public List<SupplyListDto> searchAllSupplyList() {
-        return this.supplyMapper.searchAllSupplyList();
-    }
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java
index 21480ed8..55ef8cb0 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceController.java
@@ -1,13 +1,15 @@
 package com.openhis.web.adjustprice.controller;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
+import com.core.common.core.domain.R;
+import com.core.common.enums.TenantOptionDict;
+import com.core.web.util.TenantOptionUtil;
+import com.openhis.common.enums.OrderPricingSource;
+import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
+import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
 import org.springframework.web.bind.annotation.*;
 
-import com.core.common.core.domain.R;
-import com.openhis.web.adjustprice.appservice.ISupplyService;
-import com.openhis.web.datadictionary.dto.MedicationSearchParam;
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @ClassName ChargePriceController
@@ -19,94 +21,163 @@ import com.openhis.web.datadictionary.dto.MedicationSearchParam;
 @RestController
 @RequestMapping("/change/price")
 public class ChangePriceController {
+
     @Resource
-    private ISupplyService supplyService;
+    private IAdjustPriceService adjustPriceService;
 
     /**
-     * Desc: 查询所有供应商集合
-     * 
+     * Desc: 根据关键词搜索数据
+     *
      * @param
-     * @Author raymond
-     * @Date 16:55 2025/10/15
      * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 09:26 2025/10/20
      **/
-    @GetMapping(value = "searchAllSupply")
-    public R<?> searchAllSupply() {
-        return R.ok(this.supplyService.searchAllSupplyList());
+    @PostMapping(value = "searchKeyWordDataListByMed")
+    public R<?> searchKeyWordDataListByMed(@RequestParam(name = "searchKey", required = false) String searchKey) {
+        return R.ok(this.adjustPriceService.searchKeyWordDataListByMed(searchKey));
+    }
+
+    /**
+     * Desc: 根据关键词搜索数据
+     *
+     * @param
+     * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 09:26 2025/10/20
+     **/
+    @PostMapping(value = "searchKeyWordDataListByDevice")
+    public R<?> searchKeyWordDataListByDevice(@RequestParam(name = "searchKey", required = false) String searchKey) {
+        return R.ok(this.adjustPriceService.searchKeyWordDataListByDevice(searchKey));
+    }
+
+    /**
+     * Desc: 根据关键词搜索数据
+     *
+     * @param
+     * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 09:26 2025/10/20
+     **/
+    @PostMapping(value = "searchKeyWordDataListByActivity")
+    public R<?> searchKeyWordDataListByActivity(@RequestParam(name = "searchKey", required = false) String searchKey) {
+        return R.ok(this.adjustPriceService.searchKeyWordDataListByActivity(searchKey));
+    }
+
+    /**
+     * Desc: 查询所有 有挂号信息的科室
+     *
+     * @param
+     * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 08:38 2025/10/22
+     **/
+    @PostMapping(value = "searchAllOrgData")
+    public R<?> searchAllOrgData() {
+        return this.adjustPriceService.searchAllOrgData();
+    }
+
+    /**
+     * Desc: 根据科室id 加载 挂号信息
+     *
+     * @param orgId
+     * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 16:46 2025/10/22
+     **/
+    @PostMapping(value = "searchHealthData")
+    public R<?> searchHealthData(@RequestParam Long orgId) {
+        return this.adjustPriceService.searchHealthData(orgId);
+    }
+
+    /**
+     * Desc: 保存 改价数据
+     *
+     * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 08:47 2025/10/15
+     **/
+    @PostMapping(value = "commitChangePriceData")
+    public R<?> commitChangePriceData(@RequestBody List<AdjustPriceDataVo> dataVoList) {
+        return adjustPriceService.submitChangePriceData(dataVoList);
     }
 
     /**
      * Desc: 根据供应商和药品名称加载要修改的药品数据
-     * 
+     *
+     * @return com.core.common.core.domain.R<?>
      * @Author raymond
      * @Date 08:47 2025/10/15
-     * @return com.core.common.core.domain.R<?>
      **/
-    @PostMapping(value = "searchMedicineListToPage")
-    public R<?> searchMedicineListToPage() {
-        return R.ok();
+    @PostMapping(value = "submitExamineChangePriceData")
+    public R<?> submitExamineChangePriceData(@RequestBody List<AdjustPriceDataVo> dataVoList) {
+        return adjustPriceService.submitExamineChangePriceData(dataVoList);
     }
 
     /**
-     * Desc:
-     * 
-     * @param medicationSearchParam
-     * @param searchKey
-     * @param pageNo
-     * @param pageSize
-     * @param request
-     * @Author raymond
-     * @Date 13:41 2025/10/15
+     * Desc: 根据货品ID 查询是否有审核中的药品数据
+     *
+     * @param itemId
      * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 17:32 2025/11/3
      **/
-    @PostMapping(value = "searchConsumablesListToPage")
-    public R<?> searchConsumablesListToPage(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 null;
+    @PostMapping(value = "checkMedApprovalExist")
+    public R<?> checkMedApprovalExist(@RequestParam Long itemId) {
+        return this.adjustPriceService.checkMedApprovalExist(itemId);
     }
 
     /**
-     * Desc:
-     * 
-     * @param medicationSearchParam
-     * @param searchKey
-     * @param pageNo
-     * @param pageSize
-     * @param request
-     * @Author raymond
-     * @Date 13:41 2025/10/15
+     * Desc: 根据货品ID 查询是否有审核中的药品数据
+     *
+     * @param itemId
      * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 17:32 2025/11/3
      **/
-    @PostMapping(value = "searchDiagnosisListToPage")
-    public R<?> searchDiagnosisListToPage(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 null;
+    @PostMapping(value = "checkDeviceApprovalExist")
+    public R<?> checkDeviceApprovalExist(@RequestParam Long itemId) {
+        return this.adjustPriceService.checkDeviceApprovalExist(itemId);
     }
 
     /**
-     * Desc:
-     * 
-     * @param medicationSearchParam
-     * @param searchKey
-     * @param pageNo
-     * @param pageSize
-     * @param request
-     * @Author raymond
-     * @Date 13:41 2025/10/15
+     * Desc: 根据货品ID 查询是否有审核中的药品数据
+     *
+     * @param itemId
      * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 17:32 2025/11/3
      **/
-    @PostMapping(value = "searchHealthCareListToPage")
-    public R<?> searchRegisterListToPage(MedicationSearchParam medicationSearchParam,
-        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+    @PostMapping(value = "checkActivityApprovalExist")
+    public R<?> checkActivityApprovalExist(@RequestParam Long itemId) {
+        return this.adjustPriceService.checkActivityApprovalExist(itemId);
+    }
 
-        return null;
+    /**
+     * Desc: 根据货品ID 查询是否有审核中的药品数据
+     *
+     * @param itemId
+     * @return com.core.common.core.domain.R<?>
+     * @Author raymond
+     * @Date 17:32 2025/11/3
+     **/
+    @PostMapping(value = "checkHealthApprovalExist")
+    public R<?> checkHealthApprovalExist(@RequestParam Long itemId) {
+        return this.adjustPriceService.checkHealthApprovalExist(itemId);
+    }
+
+    /**
+     * Desc: 查询调价控制开关状态接口
+     *
+     * @return true:统一零售价 , false:按批次号售卖
+     **/
+    @GetMapping(value = "getAdjustPriceSwitchState")
+    public R<?> getAdjustPriceSwitchState() {
+        // 医嘱定价来源
+        String orderPricingSource = TenantOptionUtil.getOptionContent(TenantOptionDict.ORDER_PRICING_SOURCE);
+        if (OrderPricingSource.RETAIL_PRICE.getCode().equals(orderPricingSource)) {
+            return R.ok(true);
+        }
+        return R.ok(false);
     }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java
new file mode 100644
index 00000000..f1ec5561
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/controller/ChangePriceDataListPageController.java
@@ -0,0 +1,153 @@
+package com.openhis.web.adjustprice.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.core.common.utils.StringUtils;
+import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
+import com.openhis.web.adjustprice.dto.AdjustPriceDataVo;
+import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+
+/**
+ * @ClassName ChangePriceListPageController
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/23 15:16
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("/change/price/list")
+public class ChangePriceDataListPageController {
+
+    @Resource
+    private IAdjustPriceService adjustPriceService;
+
+    /**
+     * Desc: 查询 调价管理列表页面 分页查询当前人 提交的调价单
+     *
+     * @param adjustPriceManagerSearchParam
+     * @param pageNo
+     * @param pageSize
+     * @param searchKey
+     * @param request
+     * @Author raymond
+     * @Date 15:47 2025/10/23
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @GetMapping(value = "getPage")
+    public R<?> getPage(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return this.adjustPriceService.searchChangePriceSubmitDataToPage(adjustPriceManagerSearchParam, pageNo,
+            pageSize, searchKey, request);
+    }
+
+    /**
+     * Desc: 根据单据号 进行提交审核操作
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 09:38 2025/10/23
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "updateStatusByApproval")
+    public R<?> updateStatusByApproval(@RequestParam String busNo) {
+        return this.adjustPriceService.updateExamineByApproval(busNo);
+    }
+
+    /**
+     * Desc: 作废 调价单数据
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 14:47 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "cancelChangePriceData")
+    public R<?> cancelChangePriceData(@RequestParam String busNo) {
+        return this.adjustPriceService.cancelChangePriceData(busNo);
+    }
+
+    /**
+     * Desc: 根据供应商和药品名称加载要修改的药品数据
+     *
+     *
+     * @Author raymond
+     * @Date 08:47 2025/10/15
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "submitChangePriceData")
+    public R<?> submitChangePriceData(@RequestBody List<AdjustPriceDataVo> dataVoList) {
+        return adjustPriceService.submitChangePriceData(dataVoList);
+    }
+
+    /**
+     * Desc: 根据 单据号 药品调价单 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchChangePriceDataByMed")
+    public R<?> searchChangePriceDataByMed(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByMed(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 耗材调价单 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchChangePriceDataByDevice")
+    public R<?> searchChangePriceDataByDevice(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByDevice(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 诊疗调价单 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchChangePriceDataByActivity")
+    public R<?> searchChangePriceDataByActivity(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByActivity(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 挂号调价单 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchChangePriceDataByHealth")
+    public R<?> searchChangePriceDataByHealth(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByHealth(busNo);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java
new file mode 100644
index 00000000..70ad133b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceDataVo.java
@@ -0,0 +1,72 @@
+package com.openhis.web.adjustprice.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+
+/**
+ * @ClassName AdjustPriceDataVo
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/16 08:31
+ * @Version 1.0
+ **/
+@Data
+public class AdjustPriceDataVo {
+    /**
+     * 表ID
+     */
+    private Long itemId;
+    /**
+     * 分类 0、药品；1、耗材；2、诊疗；3、挂号
+     */
+    private Integer categoryType;
+    /**
+     * 改价原因
+     */
+    private String reason;
+    /**
+     * 新进货价
+     */
+    private BigDecimal newBuyingPrice;
+    /**
+     * 新售价
+     */
+    private BigDecimal newRetailPrice;
+    /**
+     * 经手人
+     */
+    private Long practitionerId;
+    /**
+     * 每个批次影响数量
+     */
+    private BigDecimal quantity;
+    /**
+     * 总数量
+     */
+    private BigDecimal totalQuantity;
+    /**
+     * 表名
+     */
+    private String itemTable;
+    /**
+     * 单据号
+     */
+    private String busNo;
+
+    private String name;
+    /**
+     * 批次号
+     */
+    private String lotNumber;
+    /**
+     * 单位
+     */
+    private String unitCode;
+    /**
+     * 位置
+     */
+    private Long locationId;
+
+    private BigDecimal finalTotalQuantity;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
new file mode 100644
index 00000000..b90c1a6e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/AdjustPriceManagerSearchParam.java
@@ -0,0 +1,33 @@
+package com.openhis.web.adjustprice.dto;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @ClassName AdjustPriceManagerSearchParam
+ * @Description 改价管理 查询条件
+ * @Author raymond
+ * @Date 2025/10/24 16:23
+ * @Version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+public class AdjustPriceManagerSearchParam {
+
+    /** 审核状态 */
+    private Integer statusEnum;
+
+    /** 单据类型 */
+    private Integer itemCategoryEnum;
+    /**
+     * 单据时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date applicantTime;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java
new file mode 100644
index 00000000..a2db0277
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePriceDataDto.java
@@ -0,0 +1,96 @@
+package com.openhis.web.adjustprice.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;
+
+/**
+ * @ClassName ChangePricePageDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/31 17:35
+ * @Version 1.0
+ **/
+@Data
+public class ChangePriceDataDto {
+
+    /** 批次号 */
+    private String originLotNumber;
+
+    /** 改价申请人id */
+    private Long applicantId;
+
+    /** 目标枚举 药品、耗材、诊疗、挂号 */
+    private Integer itemCategoryEnum;
+    private String itemCategoryEnum_Text;
+
+    /** 药品ID、耗材ID、诊疗ID、挂号ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+    /**
+     * 获取名称
+     */
+    private String itemName;
+    /** 原进货价 */
+    private BigDecimal originBuyingPrice;
+
+    /** 原零售价价格 */
+    private BigDecimal originRetailPrice;
+
+    /** 当前品库存量 */
+    private BigDecimal itemQuantity;
+
+    /** 当前业务批次号 */
+    private String busNo;
+
+    /** 改价申请时间 */
+    private Date applicantTime;
+
+    /** 新进货价 */
+    private BigDecimal newBuyingPrice;
+
+    /** 新零售价 */
+    private BigDecimal newRetailPrice;
+
+    /** 物品计量单位 */
+    private String unitCode;
+
+    /** 审批状态 */
+    private Integer statusEnum;
+    private Integer statusEnum_Text;
+
+    /** 批次号 */
+    private String lotNumber;
+
+    /** 条件理由 */
+    private String reason;
+
+    /** 零售价盈负差*/
+    private BigDecimal differenceRetailPrice;
+    /**进货价盈负差*/
+    private BigDecimal differenceBuyingPrice;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 价格主表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeId;
+    /**
+     * 调价表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long changePriceRecordId;
+
+    private String label;
+    /**
+     * 规格
+     */
+    private String totalVolume;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java
new file mode 100644
index 00000000..a6c24741
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/ChangePricePageDto.java
@@ -0,0 +1,67 @@
+package com.openhis.web.adjustprice.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+
+/**
+ * @ClassName ChangePricePageDto
+ * @Description 改价业务分页dto
+ * @Author raymond
+ * @Date 2025/11/1 22:53
+ * @Version 1.0
+ **/
+@Data
+public class ChangePricePageDto {
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 审批人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批时间 */
+    private Date approvalTime;
+
+    /** 申请人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    private Long applicantId;
+    private String applicantId_dictText;
+
+    /** 申请时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applicantTime;
+
+    /** 制单日期 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 备注 */
+    private String reason;
+
+    /**
+     * 24、药品
+     */
+    private Integer itemCategoryEnum;
+    private String categoryEnum_enumText;
+
+    private BigDecimal originRetailPrice;
+    private BigDecimal originBuyingPrice;
+    private BigDecimal newBuyingPrice;
+    private BigDecimal newRetailPrice;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/SupplyListDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/SupplyListDto.java
deleted file mode 100644
index 9a27fc88..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/dto/SupplyListDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.openhis.web.adjustprice.dto;
-
-import lombok.Data;
-
-/**
- * @ClassName SupplyListDto
- * @Description TODO
- * @Author raymond
- * @Date 2025/10/15 16:56
- * @Version 1.0
- **/
-@Data
-public class SupplyListDto {
-    /**
-     * 供应商ID
-     */
-    private Long supplyId;
-    /**
-     * 供应商名称
-     */
-    private String supplyName;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java
new file mode 100644
index 00000000..c295cdb7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/AdjustPriceMapper.java
@@ -0,0 +1,155 @@
+package com.openhis.web.adjustprice.mapper;
+
+import com.openhis.web.adjustprice.dto.ChangePriceDataDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+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.adjustprice.dto.ChangePricePageDto;
+import com.openhis.web.inventorymanage.dto.InventorySearchParam;
+import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
+
+import java.util.List;
+
+/**
+ * Desc:
+ * 
+ * @Author raymond
+ * @Date 14:37 2025/10/15
+ * @return
+ **/
+@Component
+public interface AdjustPriceMapper {
+    /**
+     * Desc: 查询单据审批分页列表
+     * 
+     * @param page
+     * @param queryWrapper
+     * @param medTypeEnum
+     * @param deviceTypeEnum
+     * @param activityTypeEnum
+     * @param healthTypeEnum
+     * @Author raymond
+     * @Date 16:01 2025/10/24
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.web.inventorymanage.dto.ReceiptPageDto>
+     **/
+    Page<ReceiptPageDto> selectInventoryReceiptPage(@Param("page") Page<ReceiptPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InventorySearchParam> queryWrapper,
+        @Param("medTypeEnum") Integer medTypeEnum, @Param("deviceTypeEnum") Integer deviceTypeEnum,
+        @Param("activityTypeEnum") Integer activityTypeEnum, @Param("healthTypeEnum") Integer healthTypeEnum);
+
+    /**
+     * Desc: 根据当前人 ID 查询提交的调价申请记录
+     * 
+     * @param page
+     * @param queryWrapper
+     * @param medCategory
+     * @param deviceCategory
+     * @param activityCategory
+     * @param healthCategory
+     * @param applicantId
+     * @Author raymond
+     * @Date 00:59 2025/11/2
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.openhis.web.adjustprice.dto.ChangePricePageDto>
+     **/
+    Page<ChangePricePageDto> searchChangePriceDataToPage(@Param("page") Page<ReceiptPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<InventorySearchParam> queryWrapper,
+        @Param("medCategory") Integer medCategory, @Param("deviceCategory") Integer deviceCategory,
+        @Param("activityCategory") Integer activityCategory, @Param("healthCategory") Integer healthCategory,
+        @Param("applicantId") Long applicantId);
+
+    /**
+     * Desc: 根据条件 查询 药品调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchMedChangePriceByBusNo(@Param("busNo") String busNo, @Param("categoryEnum") Integer categoryEnum, @Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 药品调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:34 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchMedChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 耗材调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchDeviceChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 耗材调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:33 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchDeviceChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 诊疗调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchActivityChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 诊疗调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:32 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchActivityChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 挂号调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchHealthChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 挂号调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:31 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchHealthChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 审批单 审核中的数据
+     * @param busNo
+     * @param statusEnum
+     * @Author raymond
+     * @Date 10:36 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchChangePriceRecordDataByBusNo(@Param("busNo") String busNo,@Param("statusEnum") Integer statusEnum);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/SupplyMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/SupplyMapper.java
deleted file mode 100644
index 80119327..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/mapper/SupplyMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.openhis.web.adjustprice.mapper;
-
-import com.openhis.web.adjustprice.dto.SupplyListDto;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * Desc:
- * @Author raymond
- * @Date 14:37 2025/10/15
- * @return
- **/
-@Component
-public interface SupplyMapper {
-    /**
-     * Desc:
-     * @param
-     * @Author raymond
-     * @Date 17:10 2025/10/15
-     * @return java.util.List<com.openhis.web.paymentmanage.dto.SupplyListDto>
-     **/
-    List<SupplyListDto> searchAllSupplyList();
-
-}
diff --git a/openhis-ui-vue3/src/views/drug/123 b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/sseservice/SseService.java
similarity index 100%
rename from openhis-ui-vue3/src/views/drug/123
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/adjustprice/sseservice/SseService.java
diff --git a/openhis-server-new/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
index 5e179cba..b7ccd7b0 100644
--- a/openhis-server-new/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
@@ -6,6 +6,9 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.utils.DateTimeUtils;
+import com.openhis.workflow.mapper.ActivityDefinitionMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +49,9 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
     @Autowired
     private IOrganizationLocationService organizationLocationService;
 
+    @Autowired
+    private ActivityDefinitionMapper activityDefinitionMapper;
+
     /**
      * 机构位置关系初始化
      *
@@ -126,6 +132,25 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
         OrganizationLocation orgLoc = new OrganizationLocation();
         BeanUtils.copyProperties(orgLocQueryDto, orgLoc);
 
+        Long activityDefinitionId = orgLoc.getActivityDefinitionId();
+        String activityName = activityDefinitionId != null ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
+
+        List<OrganizationLocation> organizationLocationList =
+            organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());
+        organizationLocationList = (orgLoc.getId() != null)
+            ? organizationLocationList.stream().filter(item -> !orgLoc.getId().equals(item.getId())).toList()
+            : organizationLocationList;
+
+        if (!organizationLocationList.isEmpty())
+            for (OrganizationLocation organizationLocation : organizationLocationList)
+                if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
+                    orgLoc.getStartTime(), orgLoc.getEndTime())) {
+                    String organizationName =
+                        organizationService.getById(organizationLocation.getOrganizationId()).getName();
+                    return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
+                        + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
+                }
+
         if (orgLocQueryDto.getId() != null) {
             // 更新机构位置信息
             organizationLocationService.updateById(orgLoc);
diff --git a/openhis-server-new/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
index 13141cd5..ab501ec5 100644
--- a/openhis-server-new/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
@@ -7,7 +7,6 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
-import com.openhis.common.enums.AdministrativeGender;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,6 +14,7 @@ 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.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
@@ -29,6 +29,8 @@ import com.openhis.administration.service.IPractitionerRoleService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.AdministrativeGender;
+import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.PractitionerRoles;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
@@ -59,6 +61,9 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
     @Resource
     ISysTenantService sysTenantService;
 
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
     /**
      * 新增用户及参与者
      *
@@ -108,8 +113,9 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
         // 新增 adm_practitioner
         Practitioner practitioner = new Practitioner();
         practitioner.setActiveFlag(AccountStatus.ACTIVE.getValue()); // 活动标记
+        practitioner.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.PRACTITIONER_NO.getPrefix(), 8)); // 编号
         practitioner.setName(nickName); // 姓名
-        practitioner.setGenderEnum(sex==null? AdministrativeGender.UNKNOWN.getValue() : Integer.parseInt(sex)); // 性别
+        practitioner.setGenderEnum(sex == null ? AdministrativeGender.UNKNOWN.getValue() : Integer.parseInt(sex)); // 性别
         practitioner.setBirthDate(userAndPractitionerDto.getBirthDate()); // 出生日期
         practitioner.setPhone(phonenumber); // 电话
         practitioner.setAddress(userAndPractitionerDto.getAddress()); // 地址
@@ -306,7 +312,7 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
         Practitioner practitioner = new Practitioner();
         practitioner.setId(practitionerId);
         practitioner.setName(nickName); // 姓名
-        practitioner.setGenderEnum(sex==null? AdministrativeGender.UNKNOWN.getValue() : Integer.parseInt(sex)); // 性别
+        practitioner.setGenderEnum(sex == null ? AdministrativeGender.UNKNOWN.getValue() : Integer.parseInt(sex)); // 性别
         practitioner.setBirthDate(userAndPractitionerDto.getBirthDate()); // 出生日期
         practitioner.setPhone(phonenumber); // 电话
         practitioner.setAddress(userAndPractitionerDto.getAddress()); // 地址
diff --git a/openhis-server-new/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
index 63580435..c2383746 100644
--- a/openhis-server-new/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
@@ -12,7 +12,6 @@ import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.yb.service.YbManager;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,6 +20,7 @@ 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.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
@@ -32,12 +32,14 @@ import com.openhis.administration.service.IHealthcareServiceService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.AccountStatus;
+import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.common.enums.Whether;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.basicservice.dto.*;
 import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper;
+import com.openhis.yb.service.YbManager;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -58,6 +60,8 @@ public class HealthcareServiceController {
 
     private final YbManager ybService;
 
+    private final AssignSeqUtil assignSeqUtil;
+
     /**
      * 服务管理基础数据初始化
      */
@@ -92,6 +96,7 @@ public class HealthcareServiceController {
         // 服务管理-新增
         HealthcareService healthcareService = new HealthcareService();
         BeanUtils.copyProperties(healthcareServiceFormData, healthcareService);
+        // healthcareService.setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.HEALTHCARE_SERVICE_NO.getPrefix(), 8));
         HealthcareService healthcareServiceAfterAdd = iHealthcareServiceService.addHealthcareService(healthcareService);
         // 同时保存费用定价
         ChargeItemDefinition chargeItemDefinition = new ChargeItemDefinition();
diff --git a/openhis-server-new/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
index bc6e1be6..49298f91 100644
--- a/openhis-server-new/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
@@ -3,14 +3,14 @@
  */
 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;
 
-import java.util.List;
-
 /**
  * 门诊收费 service
  *
@@ -62,4 +62,20 @@ public interface IOutpatientChargeAppService {
      * @return 初始化信息
      */
     R<?> outpatientChargeInit();
+
+    /**
+     * 学生医保转自费
+     * 
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    R<?> changeToStudentSelfPay(Long encounterId);
+
+    /**
+     * 学生自费转学生医保
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    R<?> changeToStudentYbPay(Long encounterId);
 }
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
index b4243141..e525f64b 100644
--- 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
@@ -87,7 +87,7 @@ public class InpatientChargeAppServiceImpl implements IInpatientChargeAppService
             encounterPatientPageParam, searchKey,
             new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
                 CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo,
-                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)),
+                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.IdCard)),
             request);
         // 就诊患者分页列表
         Page<EncounterPatientPageDto> encounterPatientPage = inpatientChargeAppMapper
diff --git a/openhis-server-new/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
index d73b278c..fce535dc 100644
--- a/openhis-server-new/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
@@ -88,7 +88,7 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
             encounterPatientPageParam, searchKey,
             new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
                 CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo,
-                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)),
+                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.IdCard)),
             request);
         // 就诊患者分页列表
         Page<EncounterPatientPageDto> encounterPatientPage = outpatientChargeAppMapper
@@ -126,6 +126,7 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
         });
         return prescriptionDtoList;
     }
+
     /**
      * 医保转自费
      *
@@ -167,4 +168,46 @@ public class OutpatientChargeAppServiceImpl implements IOutpatientChargeAppServi
         }
         return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
     }
+
+    /**
+     * 学生医保转学生自费
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    @Override
+    public R<?> changeToStudentSelfPay(Long encounterId) {
+        // 获取就诊患者的学生自费账户id
+        Long accountId = accountService.getStudentSelfAccount(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<?> changeToStudentYbPay(Long encounterId) {
+        // 获取就诊患者的学生医保账户id
+        Long accountId = accountService.getStudentYbAccount(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-new/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
index 0c73f7f7..a051830c 100644
--- a/openhis-server-new/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
@@ -4,15 +4,12 @@
 package com.openhis.web.chargemanage.appservice.impl;
 
 import java.math.BigDecimal;
-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 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.LambdaQueryWrapper;
@@ -55,23 +52,23 @@ import com.openhis.workflow.service.IServiceRequestService;
 @Service
 public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppService {
 
-    @Autowired
+    @Resource
     private OutpatientRefundAppMapper outpatientRefundAppMapper;
-    @Autowired
+    @Resource
     private IPaymentReconciliationService paymentReconciliationService;
-    @Autowired
+    @Resource
     private IChargeItemService chargeItemService;
-    @Autowired
+    @Resource
     private IMedicationDispenseService medicationDispenseService;
-    @Autowired
+    @Resource
     private IDeviceDispenseService deviceDispenseService;
-    @Autowired
+    @Resource
     private IServiceRequestService serviceRequestService;
-    @Autowired
+    @Resource
     private IMedicationRequestService medicationRequestService;
-    @Autowired
+    @Resource
     private IDeviceRequestService deviceRequestService;
-    @Autowired
+    @Resource
     private AssignSeqUtil assignSeqUtil;
 
     /**
@@ -110,8 +107,8 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                 PaymentStatus.REFUND_PART.getValue(), PaymentStatus.REFUND_ALL.getValue());
 
         // 获取付款id集合
-        List<Long> paymentIdList =
-            encounterPatientPaymentList.stream().map(EncounterPatientPaymentDto::getId).collect(Collectors.toList());
+        List<Long> paymentIdList = encounterPatientPaymentList.stream().map(EncounterPatientPaymentDto::getPaymentId)
+            .collect(Collectors.toList());
         if (paymentIdList.isEmpty()) {
             return R.ok(null);
         }
@@ -131,7 +128,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
             e.setServiceStatus_enumText(EnumUtils.getInfoByValue(RequestStatus.class, e.getServiceStatus()));
 
         });
-
+        refundItemList.sort(Comparator.comparing(RefundItemDto::getPaymentId));
         return R.ok(refundItemList);
     }
 
@@ -162,22 +159,22 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                 CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_SERVICE_REQUEST,
                 CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.Common.THREE);
 
-            for (RefundItemDto creatdDto : creatChargeItemList) {
+            for (RefundItemDto createDto : creatChargeItemList) {
 
                 // 未退费用项,生成新的请求,发放,费用项
-                if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(creatdDto.getServiceTable())) {
+                if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(createDto.getServiceTable())) {
                     // 药品请求查询
-                    MedicationRequest medicationRequest = medicationRequestService.getById(creatdDto.getRequestId());
+                    MedicationRequest medicationRequest = medicationRequestService.getById(createDto.getRequestId());
                     // 生成新的药品请求
                     medicationRequest.setId(null); // 药品请求id
                     medicationRequest
                         .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4)); // 药品请求编码
-                    medicationRequest.setPrescriptionNo(String.valueOf("C" + creatdDto.getPrescriptionNo())); // 处方号
+                    medicationRequest.setPrescriptionNo(String.valueOf("C" + createDto.getPrescriptionNo())); // 处方号
                     medicationRequestService.save(medicationRequest);
 
                     // 药品发放查询
                     MedicationDispense medicationDispense =
-                        medicationDispenseService.getById(creatdDto.getDispenseId());
+                        medicationDispenseService.getById(createDto.getDispenseId());
                     // 生成新的药品发放
                     medicationDispense.setId(null); // 药品发放id
                     medicationDispense
@@ -186,26 +183,26 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     medicationDispenseService.save(medicationDispense);
 
                     // 费用项查询
-                    ChargeItem chargeItem = chargeItemService.getById(creatdDto.getChargeItemId());
+                    ChargeItem chargeItem = chargeItemService.getById(createDto.getChargeItemId());
                     // 生成新的费用项
                     chargeItem.setRefundId(chargeItem.getId());// 退费id
                     chargeItem.setId(null); // 费用项id
                     chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo())); // 编码
-                    chargeItem.setPrescriptionNo(String.valueOf("C" + creatdDto.getPrescriptionNo())); // 处方号
+                    chargeItem.setPrescriptionNo(String.valueOf("C" + createDto.getPrescriptionNo())); // 处方号
                     chargeItem.setServiceId(medicationRequest.getId()); // 医疗服务ID
                     chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());// 收费单状态：待收费
                     chargeItemService.save(chargeItem);
 
-                } else if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(creatdDto.getServiceTable())) {
+                } else if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(createDto.getServiceTable())) {
                     // 服务请求查询
-                    ServiceRequest serviceRequest = serviceRequestService.getById(creatdDto.getRequestId());
+                    ServiceRequest serviceRequest = serviceRequestService.getById(createDto.getRequestId());
                     // 生成新的服务请求
                     serviceRequest.setId(null); // 服务请求id
                     serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4)); // 服务请求编码
                     serviceRequestService.save(serviceRequest);
 
                     // 费用项查询
-                    ChargeItem chargeItem = chargeItemService.getById(creatdDto.getChargeItemId());
+                    ChargeItem chargeItem = chargeItemService.getById(createDto.getChargeItemId());
                     // 生成新的费用项
                     chargeItem.setRefundId(chargeItem.getId());// 退费id
                     chargeItem.setId(null); // 费用项id
@@ -214,16 +211,16 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());// 收费单状态：待收费
                     chargeItemService.save(chargeItem);
 
-                } else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(creatdDto.getServiceTable())) {
+                } else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(createDto.getServiceTable())) {
                     // 耗材请求查询
-                    DeviceRequest deviceRequest = deviceRequestService.getById(creatdDto.getRequestId());
+                    DeviceRequest deviceRequest = deviceRequestService.getById(createDto.getRequestId());
                     // 生成新的耗材请求
                     deviceRequest.setId(null); // 耗材请求id
                     deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4)); // 耗材请求编码
                     deviceRequestService.save(deviceRequest);
 
                     // 耗材发放查询
-                    DeviceDispense deviceDispense = deviceDispenseService.getById(creatdDto.getDispenseId());
+                    DeviceDispense deviceDispense = deviceDispenseService.getById(createDto.getDispenseId());
                     // 生成新的耗材发放
                     deviceDispense.setId(null); // 耗材id
                     deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4)); // 器材发放id
@@ -231,7 +228,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
                     deviceDispenseService.save(deviceDispense);
 
                     // 费用项查询
-                    ChargeItem chargeItem = chargeItemService.getById(creatdDto.getChargeItemId());
+                    ChargeItem chargeItem = chargeItemService.getById(createDto.getChargeItemId());
                     // 生成新的费用项
                     chargeItem.setRefundId(chargeItem.getId());// 退费id
                     chargeItem.setId(null); // 费用项id
@@ -372,7 +369,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
             encounterPatientPageParam, searchKey,
             new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientWbStr, CommonConstants.FieldName.PatientPyStr,
                 CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo,
-                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.idCard)),
+                CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.IdCard)),
             request);
         // 就诊患者分页列表
         Page<EncounterPatientPageDto> encounterPatientPage = outpatientRefundAppMapper.selectBilledEncounterPatientPage(
diff --git a/openhis-server-new/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
index b3cfec5f..b1255b33 100644
--- a/openhis-server-new/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
@@ -296,8 +296,9 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         }
 
         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(), EncounterStatus.IN_PROGRESS.getValue(),
+            ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.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/OutpatientChargeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientChargeController.java
index 11efbed4..ebb72bdf 100644
--- a/openhis-server-new/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
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.chargemanage.controller;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class OutpatientChargeController {
 
-    @Autowired
+    @Resource
     private IOutpatientChargeAppService outpatientChargeAppService;
 
     /**
@@ -91,4 +92,26 @@ public class OutpatientChargeController {
     public R<?> changeToMedicalInsurance(@RequestParam Long encounterId) {
         return outpatientChargeAppService.changeToMedicalInsurance(encounterId);
     }
+
+    /**
+     * 医保转自费
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    @PutMapping("/student-self-pay")
+    public R<?> changeToStudentSelfPay(@RequestParam Long encounterId) {
+        return outpatientChargeAppService.changeToStudentSelfPay(encounterId);
+    }
+
+    /**
+     * 自费转医保
+     *
+     * @param encounterId 就诊id
+     * @return 操作结果
+     */
+    @PutMapping("/student-yb-pay")
+    public R<?> changeToStudentYbPay(@RequestParam Long encounterId) {
+        return outpatientChargeAppService.changeToStudentYbPay(encounterId);
+    }
 }
diff --git a/openhis-server-new/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
index 426c424d..eb751a9c 100644
--- a/openhis-server-new/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
@@ -5,6 +5,7 @@ package com.openhis.web.chargemanage.controller;
 
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class OutpatientRefundController {
 
-    @Autowired
+    @Resource
     private IOutpatientRefundAppService outpatientRefundAppService;
 
     /**
diff --git a/openhis-server-new/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
index 24c93272..6af90c4b 100644
--- a/openhis-server-new/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
@@ -130,6 +130,10 @@ public class CurrentDayEncounterDto {
      * 生日
      */
     private Date birthDate;
+    /**
+     * 电话
+     */
+    private String phone;
 
     /**
      * 退号日期/时间
diff --git a/openhis-server-new/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
index de95efea..6a1e7680 100644
--- a/openhis-server-new/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
@@ -5,7 +5,6 @@ package com.openhis.web.chargemanage.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -29,7 +28,7 @@ public class EncounterPatientPaymentDto {
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
+    private Long paymentId;
 
     /** 就诊ID */
     private Long encounterId;
diff --git a/openhis-server-new/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
index d8370bfc..80e46d26 100644
--- a/openhis-server-new/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
@@ -92,7 +92,17 @@ public class EncounterPatientPrescriptionDto {
     @Dict(dictCode = "med_type")
     private String medTypeCode;
     private String medTypeCode_dictText;
-
+    /** 用法 */
+    @Dict(dictCode = "method_code")
+    private String methodCode;
+    private String methodCode_dictText;
+    private String dose;
+    @Dict(dictCode = "unit_code")
+    private String doseUnitCode;
+    /** 单次剂量单位 */
+    private String doseUnitCode_dictText;
+    /** 频次 */
+    private String rateCode;
     /** 合同编码 */
     private String contractNo;
 
@@ -109,4 +119,8 @@ public class EncounterPatientPrescriptionDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serviceId;
 
+    /** 付款id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long paymentId;
+
 }
diff --git a/openhis-server-new/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
index 85b929c3..684ea5a3 100644
--- a/openhis-server-new/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
@@ -36,14 +36,17 @@ public interface OutpatientRegistrationAppMapper {
      * 
      * @param page 分页参数
      * @param classEnum 就诊类型
-     * @param participantType 参与者类型
+     * @param statusEnum 门诊就诊状态 | 在诊
+     * @param participantType1 参与者类型 | 接诊医生
+     * @param participantType2 参与者类型 | 挂号医生
      * @param queryWrapper 查询条件
      * @param register 收费项目类型:挂号
      * @param paymentStatus 支付状态:成功
      * @return 当日就诊数据
      */
     IPage<CurrentDayEncounterDto> getCurrentDayEncounter(@Param("page") Page<CurrentDayEncounterDto> page,
-        @Param("classEnum") Integer classEnum, @Param("participantType") String participantType,
+        @Param("classEnum") Integer classEnum, @Param("statusEnum") Integer statusEnum,
+        @Param("participantType1") String participantType1, @Param("participantType2") String participantType2,
         @Param(Constants.WRAPPER) QueryWrapper<CurrentDayEncounterDto> queryWrapper,
         @Param("register") Integer register, @Param("paymentStatus") Integer paymentStatus);
 
diff --git a/openhis-server-new/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
index d46b7f8e..aa70db09 100644
--- a/openhis-server-new/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
@@ -166,4 +166,26 @@ public interface ICommonService {
      * @return 医嘱打印单
      */
     R<?> getAdvicePrintInfo(List<Long> requestIds, String isPrescription);
+
+    /**
+     * 查询参与者签名
+     *
+     * @param practitionerId 参与者id
+     * @return 参与者签名
+     */
+    R<?> getPractitionerSignature(Long practitionerId);
+
+    /**
+     * 查询所有供应商
+     *
+     * @return 供应商
+     */
+    R<?> getSupplierList();
+
+    /**
+     * 查询所有诊疗项目
+     *
+     * @return 诊疗项目
+     */
+    R<?> getActivityDefinition();
 }
diff --git a/openhis-server-new/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
index ddaae5d0..5d06e746 100644
--- a/openhis-server-new/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
@@ -22,11 +22,13 @@ import com.core.common.utils.StringUtils;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.domain.Organization;
+import com.openhis.administration.domain.Supplier;
 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.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
@@ -65,11 +67,14 @@ public class CommonServiceImpl implements ICommonService {
     private IOrganizationService organizationService;
 
     @Resource
-    private IInventoryItemService iInventoryItemService;
+    private IInventoryItemService inventoryItemService;
 
     @Resource
     private ContractMapper contractMapper;
 
+    @Resource
+    private ISupplierService supplierService;
+
     /**
      * 获取药房列表
      *
@@ -282,11 +287,10 @@ public class CommonServiceImpl implements ICommonService {
 
         // 医保编码和生产厂家校验
         for (LocationInventoryDto dto : locationInventoryDtoList) {
-            if (StringUtils.isNotEmpty(dto.getYbNo()) && StringUtils.isEmpty(dto.getManufacturer())) {
+            if (StringUtils.isNotEmpty(dto.getYbNo()) && StringUtils.isEmpty(dto.getManufacturerText())) {
                 return R.fail("生产厂家不能为空，请到药品目录维护");
             }
         }
-
         return R.ok(locationInventoryDtoList);
     }
 
@@ -322,7 +326,7 @@ public class CommonServiceImpl implements ICommonService {
         for (String traceNo : traceNoList) {
             if (traceNo != null && !StringUtils.isEmpty(traceNo)) {
                 // 数据源更改
-                InventoryItem inventoryItem = iInventoryItemService.getOne(
+                InventoryItem inventoryItem = inventoryItemService.getOne(
                     new LambdaQueryWrapper<InventoryItem>().like(InventoryItem::getTraceNo, traceNo).last("LIMIT 1"));
                 if (inventoryItem != null) {
                     String itemId = inventoryItem.getItemId().toString();
@@ -495,4 +499,37 @@ public class CommonServiceImpl implements ICommonService {
         return R.ok(advicePrintInfoDto);
     }
 
+    /**
+     * 查询参与者签名
+     *
+     * @param practitionerId 参与者id
+     * @return 参与者签名
+     */
+    @Override
+    public R<?> getPractitionerSignature(Long practitionerId) {
+        return R.ok(commonAppMapper.getPractitionerSignature(practitionerId));
+    }
+
+    /**
+     * 查询所有供应商
+     *
+     * @return 供应商
+     */
+    @Override
+    public R<?> getSupplierList() {
+        return R.ok(supplierService.list(new LambdaQueryWrapper<Supplier>().select(Supplier::getId, Supplier::getName)
+            .eq(Supplier::getTypeEnum, SupplierType.SUPPLIER.getValue())
+            .eq(Supplier::getDeleteFlag, DelFlag.NO.getCode()).eq(Supplier::getActiveFlag, Whether.YES.getValue())));
+    }
+
+    /**
+     * 查询所有诊疗项目
+     *
+     * @return 诊疗项目
+     */
+    @Override
+    public R<?> getActivityDefinition() {
+        return R.ok(commonAppMapper.getActivityDefinition(PublicationStatus.ACTIVE.getValue()));
+    }
+
 }
diff --git a/openhis-server-new/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
index 51acde75..3bce8dcd 100644
--- a/openhis-server-new/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
@@ -7,8 +7,6 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
-import com.openhis.common.enums.Whether;
-import com.openhis.web.common.dto.AdvicePrintInfoDto;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -221,7 +219,38 @@ public class CommonAppController {
      */
     @GetMapping("/advice-print")
     public R<?> getAdvicePrintInfo(@RequestParam(value = "requestIds") List<Long> requestIds, String isPrescription) {
-        return commonService.getAdvicePrintInfo(requestIds,isPrescription);
+        return commonService.getAdvicePrintInfo(requestIds, isPrescription);
+    }
+
+    /**
+     * 查询参与者签名
+     * 
+     * @param practitionerId 参与者id
+     * @return 参与者签名
+     */
+    @GetMapping(value = "/practitioner-signature")
+    public R<?> getPractitionerSignature(@RequestParam(value = "practitionerId") Long practitionerId) {
+        return commonService.getPractitionerSignature(practitionerId);
+    }
+
+    /**
+     * 查询所有供应商
+     *
+     * @return 供应商
+     */
+    @GetMapping(value = "/supplier")
+    public R<?> getSupplierList() {
+        return commonService.getSupplierList();
+    }
+
+    /**
+     * 查询所有诊疗项目
+     *
+     * @return 诊疗项目
+     */
+    @GetMapping(value = "/activity-definition")
+    public R<?> getActivityDefinition() {
+        return commonService.getActivityDefinition();
     }
 
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java
new file mode 100644
index 00000000..fef6c9db
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/common/dto/ActivityDefinitionDto.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.common.dto;
+
+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-04-01
+ */
+@Data
+@Accessors(chain = true)
+public class ActivityDefinitionDto {
+
+    /** 项目定义ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long activityDefinitionId;
+
+    /** 项目名称 */
+    private String activityDefinitionName;
+
+}
diff --git a/openhis-server-new/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
index 93754555..ad54bb48 100644
--- a/openhis-server-new/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
@@ -87,7 +87,7 @@ public class InventoryItemDto {
     /**
      * 生产厂家
      */
-    private String manufacturer;
+    private String manufacturerText;
 
     /**
      * 项目对应表名
diff --git a/openhis-server-new/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
index e1dd7c7e..65d1526d 100644
--- a/openhis-server-new/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
@@ -75,6 +75,6 @@ public class LocationInventoryDto {
     private String ybNo;
 
     /** 生产厂家 */
-    private String manufacturer;
+    private String manufacturerText;
 
 }
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
index dae8c0bb..372ce291 100644
--- 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
@@ -26,24 +26,13 @@ public class PerformInfoDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long requestId;
 
-    /** 住院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;
 
-    /** 执行时间列表 */
-    private List<String> executeTimes;
-
     /** 执行位置 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;
@@ -51,10 +40,4 @@ public class PerformInfoDto {
     /** 分组id */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long groupId;
-
-    /** 执行开始时间 */
-    private Date exeStartTime;
-
-    /** 执行结束时间 */
-    private Date exeEndTime;
 }
diff --git a/openhis-server-new/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
index 3f764a1c..195963fc 100644
--- a/openhis-server-new/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
@@ -88,4 +88,20 @@ public interface CommonAppMapper {
      * @return 处置打印信息
      */
     AdvicePrintInfoDto selectTreatmentPrintInfo(@Param("requestIds") List<Long> requestIds);
+
+    /**
+     * 查询参与者签名
+     *
+     * @param practitionerId 参与者id
+     * @return 参与者签名
+     */
+    String getPractitionerSignature(@Param("practitionerId") Long practitionerId);
+
+    /**
+     * 查询所有诊疗项目
+     * 
+     * @param statusEnum 启用状态
+     * @return 诊疗项目
+     */
+    List<ActivityDefinitionDto> getActivityDefinition(@Param("statusEnum") Integer statusEnum);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java
new file mode 100644
index 00000000..141f5e6b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java
@@ -0,0 +1,37 @@
+package com.openhis.web.datadictionary.appservice;
+import com.core.common.core.domain.R;
+import com.openhis.web.datadictionary.dto.ICDCodeAddDto;
+import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto;
+
+public interface ICDCodeService {
+    /**
+     * 分页查询icd10编码
+     *
+     * @param searchKey
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    R<?> getICDCodePage(String searchKey, Integer pageNo, Integer pageSize);
+
+    /**
+     * 新增icd10编码
+     * @param icdCodeAddDto
+     * @return
+     */
+    R<?> addICDInformation(ICDCodeAddDto icdCodeAddDto);
+
+    /**
+     * 删除icd10编码
+     * @param glNo
+     * @return
+     */
+    R<?> deleteICDInformation(String glNo);
+
+    /**
+     * 修改icd10编码
+     * @param icdCodeUpdateDto
+     * @return
+     */
+    R<?> saveOrUpdateICDInformation(ICDCodeUpdateDto icdCodeUpdateDto);
+}
diff --git a/openhis-server-new/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
index cdb48619..adc03874 100644
--- a/openhis-server-new/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
@@ -95,4 +95,12 @@ public interface IDeviceManageAppService {
      * @param response 响应
      */
     void importTemplate(HttpServletResponse response);
+
+    /**
+     * 校验耗材是否可以编辑
+     *
+     * @param deviceId 耗材ID
+     * @return 校验结果
+     */
+    R<?> validateDeviceEdit(Long deviceId);
 }
diff --git a/openhis-server-new/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
index 43a0300a..2b0d07b9 100644
--- a/openhis-server-new/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
@@ -92,4 +92,12 @@ public interface IDiagTreatMAppService {
      * @param response 响应
      */
     void importTemplate(HttpServletResponse response);
+
+    /**
+     * 校验诊疗项目是否可以编辑
+     *
+     * @param activityId 诊疗ID
+     * @return 校验结果
+     */
+    R<?> validateActivityEdit(Long activityId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 26dc7570..57617d2d 100644
--- a/openhis-server-new/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
@@ -97,4 +97,12 @@ public interface IMedicationManageAppService {
      * @param response 响应
      */
     void importTemplate(HttpServletResponse response);
+
+    /**
+     * 校验药品是否可以编辑
+     *
+     * @param medicationId 药品ID
+     * @return 校验结果
+     */
+    R<?> validateMedicationEdit(Long medicationId);
 }
diff --git a/openhis-server-new/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
index baed3592..f4d07e10 100644
--- a/openhis-server-new/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
@@ -13,7 +13,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -50,6 +49,8 @@ import com.openhis.web.datadictionary.appservice.IDeviceManageAppService;
 import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
 import com.openhis.web.datadictionary.dto.*;
 import com.openhis.web.datadictionary.mapper.DeviceManageMapper;
+import com.openhis.workflow.domain.DeviceRequest;
+import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.ISupplyRequestService;
 import com.openhis.yb.service.YbManager;
 
@@ -62,38 +63,41 @@ import com.openhis.yb.service.YbManager;
 @Service
 public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
 
-    @Autowired
+    @Resource
     private ISupplyRequestService supplyRequestService;
 
-    @Autowired
+    @Resource
     private IDeviceDefinitionService deviceDefinitionService;
 
-    @Autowired
+    @Resource
     private IChargeItemDefinitionService chargeItemDefinitionService;
 
-    @Autowired
+    @Resource
     private ILocationService locationService;
 
     @Resource
     private DeviceManageMapper deviceManageMapper;
 
-    @Autowired
+    @Resource
     private ISysDictTypeService sysDictTypeService;
 
-    @Autowired
+    @Resource
     private IItemDefinitionService itemDefinitionServic;
 
-    @Autowired
+    @Resource
     private ISupplierService supplierService;
 
-    @Autowired(required = false)
+    @Resource
     private AssignSeqUtil assignSeqUtil;
 
-    @Autowired
+    @Resource
     private YbManager ybService;
 
-    @Autowired
-    private IOperationRecordService iOperationRecordService;
+    @Resource
+    private IOperationRecordService operationRecordService;
+
+    @Resource
+    private IDeviceRequestService deviceRequestService;
 
     /**
      * 器材目录初始化
@@ -199,11 +203,6 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      */
     @Override
     public R<?> editDevice(DeviceManageUpDto deviceManageDto) {
-        // 校验是否可以编辑
-        boolean result = supplyRequestService.verifyAbleEdit(deviceManageDto.getId());
-        if (result) {
-            return R.fail("该耗材已经发生过业务，不可编辑");
-        }
         DeviceDefinition deviceDefinition = new DeviceDefinition();
         BeanUtils.copyProperties(deviceManageDto, deviceDefinition);
         // 拼音码
@@ -230,7 +229,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
                 .setInstanceId(deviceDefinition.getId()).setPrice(deviceManageDto.getRetailPrice())
                 .setChargeName(deviceManageDto.getName());;
             // 插入操作记录
-            iOperationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
+            operationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
                 CommonConstants.TableName.ADM_DEVICE_DEFINITION, deviceDefinition);
             // 更新价格表
             boolean upItemDef = itemDefinitionServic.updateItem(chargeItemDefinition);
@@ -261,12 +260,10 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      */
     @Override
     public R<?> getDeviceOne(@RequestParam Long id) {
-
         // 获取租户ID
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
         // 根据ID查询【器材目录】
         DeviceManageDto deviceManageDto = deviceManageMapper.getOne(id, tenantId);
-
         return R.ok(deviceManageDto);
     }
 
@@ -278,9 +275,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      */
     @Override
     public R<?> editDeviceStop(List<Long> ids) {
-
         List<DeviceDefinition> DeviceDefinitionList = new CopyOnWriteArrayList<>();
-
         // 取得更新值
         for (Long detail : ids) {
             DeviceDefinition deviceDefinition = new DeviceDefinition();
@@ -289,7 +284,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
             DeviceDefinitionList.add(deviceDefinition);
         }
         // 插入操作记录
-        iOperationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
+        operationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
             CommonConstants.TableName.ADM_DEVICE_DEFINITION, ids);
 
         // 更新器材信息
@@ -306,9 +301,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      */
     @Override
     public R<?> editDeviceStart(List<Long> ids) {
-
         List<DeviceDefinition> DeviceDefinitionList = new CopyOnWriteArrayList<>();
-
         // 取得更新值
         for (Long detail : ids) {
             DeviceDefinition DeviceDefinition = new DeviceDefinition();
@@ -317,7 +310,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
             DeviceDefinitionList.add(DeviceDefinition);
         }
         // 插入操作记录
-        iOperationRecordService.addIdsOperationRecord(DbOpType.START.getCode(),
+        operationRecordService.addIdsOperationRecord(DbOpType.START.getCode(),
             CommonConstants.TableName.ADM_DEVICE_DEFINITION, ids);
 
         // 更新器材信息
@@ -333,10 +326,8 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
      */
     @Override
     public R<?> addDevice(@Validated @RequestBody DeviceManageUpDto deviceManageUpDto) {
-
         DeviceDefinition deviceDefinition = new DeviceDefinition();
         BeanUtils.copyProperties(deviceManageUpDto, deviceDefinition);
-
         // 使用10位数基础采番
         String code = assignSeqUtil.getSeq(AssignSeqEnum.DEVICE_NUM.getPrefix(), 10);
         deviceDefinition.setBusNo(code);
@@ -344,10 +335,8 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         deviceDefinition.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(deviceDefinition.getName()));
         // 五笔码
         deviceDefinition.setWbStr(ChineseConvertUtils.toWBFirstLetter(deviceDefinition.getName()));
-
         // 新增外来器材目录
         deviceDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
-
         if (deviceDefinitionService.addDevice(deviceDefinition)) {
             // 调用医保目录对照接口
             String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
@@ -359,7 +348,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
                 }
             }
             // 插入操作记录
-            iOperationRecordService.addEntityOperationRecord(DbOpType.INSERT.getCode(),
+            operationRecordService.addEntityOperationRecord(DbOpType.INSERT.getCode(),
                 CommonConstants.TableName.ADM_DEVICE_DEFINITION, deviceDefinition);
 
             ItemUpFromDirectoryDto itemUpFromDirectoryDto = new ItemUpFromDirectoryDto();
@@ -374,7 +363,6 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
                 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"器材目录"}))
                 : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
         }
-
         return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
     }
 
@@ -430,6 +418,30 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         util.importTemplateExcel(response, "器材目录数据");
     }
 
+    /**
+     * 校验耗材是否可以编辑
+     *
+     * @param deviceId 耗材ID
+     * @return 校验结果
+     */
+    @Override
+    public R<?> validateDeviceEdit(Long deviceId) {
+        List<DeviceRequest> deviceRequestList = deviceRequestService.getDevRequestByDeviceId(deviceId);
+        if (!deviceRequestList.isEmpty()) {
+            if (deviceRequestList.stream()
+                .allMatch(x -> x.getStatusEnum().equals(RequestStatus.COMPLETED.getValue()))) {
+                return R.ok(1, "医生开过该耗材，不可编辑");
+            } else {
+                // 校验是否可以编辑
+                boolean result = supplyRequestService.verifyAbleEdit(deviceId);
+                if (result) {
+                    return R.ok(2, "该耗材已经入库过，不可编辑");
+                }
+            }
+        }
+        return R.ok();
+    }
+
     /**
      * 导入信息校验
      *
diff --git a/openhis-server-new/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
index 3debdfb1..f74c4cc6 100644
--- a/openhis-server-new/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
@@ -13,7 +13,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -38,14 +37,14 @@ import com.openhis.common.utils.CommonUtil;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.sys.service.IOperationRecordService;
-import com.openhis.web.common.appservice.ICommonService;
 import com.openhis.web.datadictionary.appservice.IDiagTreatMAppService;
 import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
 import com.openhis.web.datadictionary.dto.*;
 import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
 import com.openhis.workflow.domain.ActivityDefinition;
-import com.openhis.workflow.mapper.ActivityDefinitionMapper;
+import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.service.IActivityDefinitionService;
+import com.openhis.workflow.service.IServiceRequestService;
 import com.openhis.yb.service.YbManager;
 
 /**
@@ -57,34 +56,26 @@ import com.openhis.yb.service.YbManager;
 @Service
 public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
 
-    @Autowired
+    @Resource
     private IActivityDefinitionService activityDefinitionService;
-    @Autowired
+    @Resource
     private IChargeItemDefinitionService chargeItemDefinitionService;
-    @Autowired
-    private ActivityDefinitionMapper activityDefinitionMapper;
-    @Autowired
-    private IOrganizationService iOrganizationService;
-    @Autowired
-    private ISysDictTypeService iSysDictTypeService;
+    @Resource
+    private IOrganizationService organizationService;
     @Resource
     private ActivityDefinitionManageMapper activityDefinitionManageMapper;
-    @Autowired
-    private IItemDefinitionService itemDefinitionServic;
-    @Autowired
+    @Resource
+    private IItemDefinitionService itemDefinitionService;
+    @Resource
     private ISysDictTypeService sysDictTypeService;
-
-    @Autowired
-    private ICommonService commonService;
-
-    @Autowired(required = false)
-    AssignSeqUtil assignSeqUtil;
-
-    @Autowired
-    YbManager ybService;
-
-    @Autowired
-    IOperationRecordService iOperationRecordService;
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private YbManager ybService;
+    @Resource
+    private IOperationRecordService operationRecordService;
+    @Resource
+    private IServiceRequestService serviceRequestService;
 
     /**
      * 诊疗目录初期查询
@@ -102,7 +93,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
         // 获取执行科室
         LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Organization::getTypeEnum, OrganizationType.DEPARTMENT);
-        List<Organization> organizations = iOrganizationService.list(queryWrapper);
+        List<Organization> organizations = organizationService.list(queryWrapper);
         List<DiagnosisTreatmentInitDto.exeOrganization> exeOrganizations = organizations.stream()
             .map(exeOrg -> new DiagnosisTreatmentInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName()))
             .collect(Collectors.toList());
@@ -259,16 +250,16 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
                 .setInstanceId(diagnosisTreatmentUpDto.getId()).setPrice(diagnosisTreatmentUpDto.getRetailPrice())
                 .setChargeName(diagnosisTreatmentUpDto.getName());
             // 插入操作记录
-            iOperationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
+            operationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
                 CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, activityDefinition);
 
             // 更新价格表
-            boolean upItemDef = itemDefinitionServic.updateItem(chargeItemDefinition);
+            boolean upItemDef = itemDefinitionService.updateItem(chargeItemDefinition);
             // 更新子表,修改零售价,条件:单位
-            boolean upItemDetail1 = itemDefinitionServic.updateItemDetail(chargeItemDefinition,
+            boolean upItemDetail1 = itemDefinitionService.updateItemDetail(chargeItemDefinition,
                 diagnosisTreatmentUpDto.getRetailPrice(), ConditionCode.UNIT.getCode());
             // 更新子表,修改最高零售价,条件:限制
-            boolean upItemDetail2 = itemDefinitionServic.updateItemDetail(chargeItemDefinition,
+            boolean upItemDetail2 = itemDefinitionService.updateItemDetail(chargeItemDefinition,
                 diagnosisTreatmentUpDto.getMaximumRetailPrice(), ConditionCode.LIMIT.getCode());
 
             // 更新价格表
@@ -299,7 +290,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
             ActivityDefinitionList.add(ActivityDefinition);
         }
         // 插入操作记录
-        iOperationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
+        operationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
             CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, ids);
         // 更新诊疗信息
         return activityDefinitionService.updateBatchById(ActivityDefinitionList)
@@ -327,7 +318,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
             ActivityDefinitionList.add(ActivityDefinition);
         }
         // 插入操作记录
-        iOperationRecordService.addIdsOperationRecord(DbOpType.START.getCode(),
+        operationRecordService.addIdsOperationRecord(DbOpType.START.getCode(),
             CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, ids);
         // 更新诊疗信息
         return activityDefinitionService.updateBatchById(ActivityDefinitionList)
@@ -374,7 +365,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
                 }
             }
             // 插入操作记录
-            iOperationRecordService.addEntityOperationRecord(DbOpType.INSERT.getCode(),
+            operationRecordService.addEntityOperationRecord(DbOpType.INSERT.getCode(),
                 CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, activityDefinition);
 
             ItemUpFromDirectoryDto itemUpFromDirectoryDto = new ItemUpFromDirectoryDto();
@@ -386,7 +377,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
                 .setConditionFlag(Whether.YES.getValue()).setChargeName(diagnosisTreatmentUpDto.getName())
                 .setInstanceId(activityDefinition.getId()).setPrice(diagnosisTreatmentUpDto.getRetailPrice());
 
-            return itemDefinitionServic.addItem(itemUpFromDirectoryDto)
+            return itemDefinitionService.addItem(itemUpFromDirectoryDto)
                 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊疗目录"}))
                 : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
 
@@ -442,6 +433,25 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
         util.importTemplateExcel(response, "诊疗目录数据");
     }
 
+    /**
+     * 校验诊疗项目是否可以编辑
+     *
+     * @param activityId 诊疗ID
+     * @return 校验结果
+     */
+    @Override
+    public R<?> validateActivityEdit(Long activityId) {
+        // 查询诊疗申请
+        List<ServiceRequest> serviceRequestList = serviceRequestService.getServiceRequestByActivityId(activityId);
+        if (!serviceRequestList.isEmpty()) {
+            if (serviceRequestList.stream().anyMatch(
+                serviceRequest -> RequestStatus.COMPLETED.getValue().equals(serviceRequest.getStatusEnum()))) {
+                return R.ok(1,"医生开过该诊疗项目，不可编辑");
+            }
+        }
+        return R.ok();
+    }
+
     /**
      * 导入信息校验
      *
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
new file mode 100644
index 00000000..f83a19a6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
@@ -0,0 +1,118 @@
+package com.openhis.web.datadictionary.appservice.impl;
+
+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.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.ChineseConvertUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.Account;
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.mapper.LocationMapper;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+import com.openhis.clinical.mapper.ConditionNoDefinitionMapper;
+import com.openhis.clinical.service.IConditionNoDefinitionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
+import com.openhis.web.basedatamanage.dto.LocationInfoDto;
+import com.openhis.web.datadictionary.dto.DeviceManageDto;
+import com.openhis.web.datadictionary.dto.ICDCodeAddDto;
+import com.openhis.web.datadictionary.dto.ICDCodeDto;
+import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto;
+import com.openhis.workflow.domain.SupplyRequest;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.datadictionary.appservice.ICDCodeService;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+@Service
+public class ICDCodeServiceImpl implements ICDCodeService {
+
+    @Resource
+    private ConditionNoDefinitionMapper conditionNoDefinitionMapper;
+
+    @Resource
+    private ICDCodeService icdCodeService;
+
+    @Resource
+    private IConditionNoDefinitionService conditionNoDefinitionService;
+
+    /**
+     *
+     * @param searchKey
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public R<?> getICDCodePage(String searchKey, Integer pageNo, Integer pageSize) {
+        // 构建查询条件
+        QueryWrapper<ConditionNoDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(null,searchKey,
+                new HashSet<>(Arrays.asList("gl_no", "gl_name", "icd10_no", "icd10_name")), null);
+        Page<ICDCodeDto> icdCodeDtoPage =
+                HisPageUtils.selectPage(conditionNoDefinitionMapper, queryWrapper, pageNo, pageSize, ICDCodeDto.class);
+        return R.ok(icdCodeDtoPage);
+    }
+
+    /**
+     * 添加
+     * @param icdCodeAddDto
+     * @return
+     */
+    @Override
+    public R<?> addICDInformation(ICDCodeAddDto icdCodeAddDto) {
+        ConditionNoDefinition conditionNoDefinition = new ConditionNoDefinition();
+        conditionNoDefinition.setIcd10No(icdCodeAddDto.getIcd10No());
+        conditionNoDefinition.setIcd10Name(icdCodeAddDto.getIcd10Name());
+        conditionNoDefinition.setGlNo(icdCodeAddDto.getGlNo());
+        conditionNoDefinition.setGlName(icdCodeAddDto.getGlName());
+        boolean result = conditionNoDefinitionService.save(conditionNoDefinition);
+        if(result){
+            return R.ok("ok");
+        }
+        return R.fail("no");
+    }
+
+    /**
+     * 删除
+     * @param glNo
+     * @return
+     */
+    @Override
+    public R<?> deleteICDInformation(String glNo) {
+        boolean result =
+                conditionNoDefinitionService.remove(new LambdaQueryWrapper<ConditionNoDefinition>().likeRight(ConditionNoDefinition::getGlNo, glNo));
+        return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"国临编码信息删除"}))
+                : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] {"国临编码信息删除"}));
+    }
+
+    @Override
+    public R<?> saveOrUpdateICDInformation(ICDCodeUpdateDto icdCodeUpdateDto) {
+        ConditionNoDefinition conditionNoDefinition = new ConditionNoDefinition();
+        conditionNoDefinition.setId(icdCodeUpdateDto.getId());
+        conditionNoDefinition.setIcd10No(icdCodeUpdateDto.getIcd10No());
+        conditionNoDefinition.setIcd10Name(icdCodeUpdateDto.getIcd10Name());
+        conditionNoDefinition.setGlNo(icdCodeUpdateDto.getGlNo());
+        conditionNoDefinition.setGlName(icdCodeUpdateDto.getGlName());
+        boolean result=conditionNoDefinitionService.saveOrUpdate(conditionNoDefinition);
+        if(result){
+            return R.ok("ok");
+        }
+        return R.fail("no");
+    }
+
+
+}
diff --git a/openhis-server-new/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
index c4cd78b8..1d72ecde 100644
--- a/openhis-server-new/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
@@ -4,7 +4,8 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.ChargeItemDefDetail;
 import com.openhis.administration.domain.ChargeItemDefinition;
-import com.openhis.administration.mapper.ChargeItemDefAppMapper;
 import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
 import com.openhis.administration.service.IChargeItemDefDetailService;
 import com.openhis.administration.service.IChargeItemDefinitionService;
@@ -30,15 +30,14 @@ import com.openhis.web.datadictionary.dto.ItemUpFromDirectoryDto;
 @Service
 public class ItemDefinitionServiceImpl implements IItemDefinitionService {
 
-    @Autowired
-    IChargeItemDefinitionService chargeItemDefinitionService;
+    @Resource
+    private IChargeItemDefinitionService chargeItemDefinitionService;
 
-    @Autowired
-    IChargeItemDefDetailService chargeItemDefDetailService;
-    @Autowired
-    ChargeItemDefinitionMapper chargeItemDefinitionMapper;
-    @Autowired
-    ChargeItemDefAppMapper chargeItemDefAppMapper;
+    @Resource
+    private IChargeItemDefDetailService chargeItemDefDetailService;
+
+    @Resource
+    private ChargeItemDefinitionMapper chargeItemDefinitionMapper;
 
     /**
      * 添加药品/器材/诊疗的项目定价
diff --git a/openhis-server-new/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
index 8920f0c2..b539bbd9 100644
--- a/openhis-server-new/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
@@ -8,10 +8,10 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -44,8 +44,9 @@ import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.medication.domain.Medication;
 import com.openhis.medication.domain.MedicationDefinition;
 import com.openhis.medication.domain.MedicationDetail;
+import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.medication.service.IMedicationDefinitionService;
-import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.IMedicationRequestService;
 import com.openhis.medication.service.IMedicationService;
 import com.openhis.sys.service.IOperationRecordService;
 import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
@@ -64,43 +65,44 @@ import com.openhis.yb.service.YbManager;
 @Service
 public class MedicationManageAppServiceImpl implements IMedicationManageAppService {
 
-    @Autowired
+    @Resource
     private IMedicationService medicationService;
 
-    @Autowired
+    @Resource
     private IMedicationDefinitionService medicationDefinitionService;
 
-    @Autowired
+    @Resource
     private IChargeItemDefinitionService chargeItemDefinitionService;
 
-    @Autowired
+    @Resource
     private ILocationService locationService;
 
-    @Autowired
+    @Resource
     private MedicationManageSearchMapper medicationManageSearchMapper;
-    @Autowired
+
+    @Resource
     private ISupplierService supplierService;
 
-    @Autowired
+    @Resource
     private ISysDictTypeService sysDictTypeService;
 
-    @Autowired
+    @Resource
     private IItemDefinitionService itemDefinitionServic;
 
-    @Autowired(required = false)
+    @Resource
     private AssignSeqUtil assignSeqUtil;
 
-    @Autowired
+    @Resource
     private YbManager ybService;
 
-    @Autowired
-    private IOperationRecordService iOperationRecordService;
+    @Resource
+    private IOperationRecordService operationRecordService;
 
-    @Autowired
+    @Resource
     private ISupplyRequestService supplyRequestService;
 
-    @Autowired
-    private IMedicationDispenseService medicationDispenseService;
+    @Resource
+    private IMedicationRequestService medicationRequestService;
 
     /**
      * 药品目录初始化
@@ -247,11 +249,6 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
      */
     @Override
     public R<?> editMedication(@Validated @RequestBody MedicationManageUpDto medicationManageUpDto) {
-        // 校验是否可以编辑
-        boolean result = supplyRequestService.verifyAbleEdit(medicationManageUpDto.getMedicationDefId());
-        if (result) {
-            return R.fail("该药品已经发生过业务，不可编辑");
-        }
         // Todo:用Medication和medicationDefinition的domainservice来创造新的实例，根据业务需求，使用构造函数；
         // 如果小于5哥变量，就用基本类型传递，如果大于5哥，在domain层定义构造方法的入参
 
@@ -294,7 +291,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             }
 
             // 插入操作记录
-            iOperationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
+            operationRecordService.addEntityOperationRecord(DbOpType.UPDATE.getCode(),
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, medication);
             // Todo:封装一个价格初始话的方法给app层调用
             // 更新价格表
@@ -355,7 +352,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
 
         // TODO:别用三元，日志在业务代码以后记录
         // 插入操作记录
-        iOperationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
+        operationRecordService.addIdsOperationRecord(DbOpType.STOP.getCode(),
             CommonConstants.TableName.MED_MEDICATION_DEFINITION, ids);
         // 更新药品信息
         return medicationService.updateBatchById(medicationList)
@@ -381,7 +378,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             medicationList.add(medication);
         }
         // 插入操作记录
-        iOperationRecordService.addIdsOperationRecord(DbOpType.START.getCode(),
+        operationRecordService.addIdsOperationRecord(DbOpType.START.getCode(),
             CommonConstants.TableName.MED_MEDICATION_DEFINITION, ids);
         // 更新药品信息
         return medicationService.updateBatchById(medicationList)
@@ -424,7 +421,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
                 }
             }
             // 插入操作记录
-            iOperationRecordService.addEntityOperationRecord(DbOpType.INSERT.getCode(),
+            operationRecordService.addEntityOperationRecord(DbOpType.INSERT.getCode(),
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, medicationDetail);
             // 新增子表外来药品目录
             boolean insertMedicationSuccess = medicationService.addMedication(medicationDetail);
@@ -515,6 +512,31 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         util.importTemplateExcel(response, "药品目录数据");
     }
 
+    /**
+     * 校验药品是否可以编辑
+     *
+     * @param medicationId 药品ID
+     * @return 校验结果
+     */
+    @Override
+    public R<?> validateMedicationEdit(Long medicationId) {
+        List<MedicationRequest> medicationRequestList =
+            medicationRequestService.getMedRequestByMedicationId(medicationId);
+        if (!medicationRequestList.isEmpty()) {
+            if (medicationRequestList.stream()
+                .allMatch(x -> x.getStatusEnum().equals(RequestStatus.COMPLETED.getValue()))) {
+                return R.ok(1, "医生开过该药品，不可编辑");
+            } else {
+                // 校验是否可以编辑
+                boolean result = supplyRequestService.verifyAbleEdit(medicationId);
+                if (result) {
+                    return R.ok(2, "该药品已经入库过，不可编辑");
+                }
+            }
+        }
+        return R.ok();
+    }
+
     /**
      * 导入信息校验
      * 
@@ -542,6 +564,9 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             if (StringUtils.isEmpty(importDto.getMerchandiseName())) {
                 lineValidateMsgList.add("商品名称必填");
             }
+            if (StringUtils.isEmpty(importDto.getPharmacologyCategoryCode())) {
+                lineValidateMsgList.add("药品性质必填");
+            }
             if (StringUtils.isEmpty(importDto.getUnitCode())) {
                 lineValidateMsgList.add("药品单位必填");
             }
@@ -707,7 +732,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             }
         }
         if (!fieldValidateMsgList.isEmpty()) {
-            return R.fail("导入失败！药品信息填写有误：" + String.join(" ", fieldValidateMsgList));
+            return R.fail("导入失败！药品信息填写有误：" + String.join(" ", fieldValidateMsgList) + " ■ ※如遇到模板中不存在的字段，请重新下载模板");
         }
         // 重复校验（文件行重复）
         List<String> lineRepeatedValidateMsgList = new ArrayList<>();
@@ -771,7 +796,8 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             .setPartPercent(importDto.getPartPercent()).setDoseFrom(CommonUtil.tryParseInt(importDto.getDoseFrom()))
             .setApprovalNumber(importDto.getApprovalNumber())
             .setYbMatchFlag(CommonUtil.tryParseInt(importDto.getYbMatchFlag())).setYbNo(importDto.getYbNo())
-            .setPharmacologyCategoryCode("1").setSkinTestFlag(CommonUtil.tryParseInt(importDto.getSkinTestFlag()))
+            .setPharmacologyCategoryCode(importDto.getPharmacologyCategoryCode())
+            .setSkinTestFlag(CommonUtil.tryParseInt(importDto.getSkinTestFlag()))
             .setInjectFlag(CommonUtil.tryParseInt(importDto.getInjectFlag()))
             .setManufacturerText(importDto.getManufacturerText())
             .setRestrictedFlag(CommonUtil.tryParseInt(importDto.getRestrictedFlag()))
diff --git a/openhis-server-new/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
index 6ca5e4de..942e19ab 100644
--- a/openhis-server-new/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
@@ -2,17 +2,16 @@ package com.openhis.web.datadictionary.controller;
 
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-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.IDeviceManageAppService;
-import com.openhis.web.datadictionary.dto.DeviceManageDto;
 import com.openhis.web.datadictionary.dto.DeviceManageSelParam;
 import com.openhis.web.datadictionary.dto.DeviceManageUpDto;
 
@@ -31,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class DeviceManageController {
 
-    @Autowired
+    @Resource
     private IDeviceManageAppService deviceManageAppService;
 
     /**
@@ -69,7 +68,6 @@ public class DeviceManageController {
      */
     @GetMapping("/information-one")
     public R<?> getDeviceOne(@RequestParam Long id) {
-
         return deviceManageAppService.getDeviceOne(id);
     }
 
@@ -81,7 +79,6 @@ public class DeviceManageController {
      */
     @PutMapping("/information")
     public R<?> editDevice(@RequestBody DeviceManageUpDto deviceManageDto) {
-
         return deviceManageAppService.editDevice(deviceManageDto);
 
     }
@@ -119,28 +116,6 @@ public class DeviceManageController {
         return deviceManageAppService.addDevice(deviceManageUpDto);
     }
 
-    /**
-     * 新增医保器材目录
-     *
-     * @param DeviceManageUpDto 器材目录
-     * @return
-     */
-    @PostMapping("/information-yb")
-    public R<?> addYbDevice(@RequestBody DeviceManageUpDto DeviceManageUpDto) {
-        return null;
-    }
-
-    /**
-     * 器材目录导出
-     *
-     * @param DeviceManageDto 器材目录
-     * @return
-     */
-    @GetMapping("/information-export")
-    public R<?> exportDevice(@RequestBody DeviceManageDto DeviceManageDto) {
-        return null;
-    }
-
     /**
      * 导入器材目录
      *
@@ -161,4 +136,15 @@ public class DeviceManageController {
     public void importTemplate(HttpServletResponse response) {
         deviceManageAppService.importTemplate(response);
     }
+
+    /**
+     * 校验耗材是否可以编辑
+     *
+     * @param deviceId 耗材ID
+     * @return 校验结果
+     */
+    @GetMapping("/validate-edit")
+    public R<?> validateDeviceEdit(Long deviceId) {
+        return deviceManageAppService.validateDeviceEdit(deviceId);
+    }
 }
diff --git a/openhis-server-new/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
index 35fa8d71..d456171c 100644
--- a/openhis-server-new/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
@@ -2,17 +2,16 @@ package com.openhis.web.datadictionary.controller;
 
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-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.IDiagTreatMAppService;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
 
@@ -31,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class DiagnosisTreatmentController {
 
-    @Autowired
+    @Resource
     private IDiagTreatMAppService diagTreatMAppService;
 
     /**
@@ -107,7 +106,7 @@ public class DiagnosisTreatmentController {
     }
 
     /**
-     * 新增外来诊疗目录
+     * 新增诊疗目录
      *
      * @param diagnosisTreatmentUpDto 诊疗目录
      * @return
@@ -117,28 +116,6 @@ public class DiagnosisTreatmentController {
         return diagTreatMAppService.addDiseaseTreatment(diagnosisTreatmentUpDto);
     }
 
-    /**
-     * 新增医保诊疗目录
-     *
-     * @param diagnosisTreatmentUpDto 诊疗目录
-     * @return
-     */
-    @PostMapping("/information-yb")
-    public R<?> addYbDiseaseTreatment(@RequestBody DiagnosisTreatmentUpDto diagnosisTreatmentUpDto) {
-        return null;
-    }
-
-    /**
-     * 诊疗目录导出
-     *
-     * @param diagnosisTreatmentDto 诊疗目录
-     * @return
-     */
-    @GetMapping("/information-export")
-    public R<?> exportDiseaseTreatment(@RequestBody DiagnosisTreatmentDto diagnosisTreatmentDto) {
-        return null;
-    }
-
     /**
      * 导入诊疗目录
      *
@@ -159,4 +136,15 @@ public class DiagnosisTreatmentController {
     public void importTemplate(HttpServletResponse response) {
         diagTreatMAppService.importTemplate(response);
     }
+
+    /**
+     * 校验诊疗项目是否可以编辑
+     *
+     * @param activityId 诊疗ID
+     * @return 校验结果
+     */
+    @GetMapping("/validate-edit")
+    public R<?> validateActivityEdit(Long activityId) {
+        return diagTreatMAppService.validateActivityEdit(activityId);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java
new file mode 100644
index 00000000..c2cb0df1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java
@@ -0,0 +1,72 @@
+package com.openhis.web.datadictionary.controller;
+
+import javax.annotation.Resource;
+
+import com.openhis.web.basedatamanage.dto.LocationAddOrEditDto;
+import com.openhis.web.datadictionary.dto.ICDCodeAddDto;
+import com.openhis.web.datadictionary.dto.ICDCodeDto;
+import com.openhis.web.datadictionary.dto.ICDCodeUpdateDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.datadictionary.appservice.ICDCodeService;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@RestController
+@RequestMapping("/base-data-manage/ICD10")
+@Slf4j
+@AllArgsConstructor
+public class ICDCodeController {
+
+    @Resource
+    private ICDCodeService iCDCodeService;
+
+    /**
+     * 查询icd10
+     * @param searchKey
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/information-page") // 前端传回来的查询条件
+    public R<?> getICDCodePage(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return iCDCodeService.getICDCodePage(searchKey, pageNo, pageSize);
+    }
+
+    /**
+     * 新增icd10
+     * @param icdCodeAddDto
+     * @return
+     */
+    @PostMapping("/add-icd-Information")
+    public R<?> ICDInformation(@Validated @RequestBody ICDCodeAddDto icdCodeAddDto) {
+        return iCDCodeService.addICDInformation(icdCodeAddDto);
+    }
+
+    /**
+     * 删除icd10
+     * @param glNo
+     * @return
+     */
+    @DeleteMapping("/delete-icd-Information")
+    public R<?> deleteICDInformation(@RequestParam String glNo) {
+        return iCDCodeService.deleteICDInformation(glNo);
+    }
+
+    /**
+     * 更新
+     * @param icdCodeUpdateDto
+     * @return
+     */
+    @PutMapping("/update-icd-Information")
+    public R<?> saveOrUpdateICDInformation(@RequestBody ICDCodeUpdateDto icdCodeUpdateDto){
+        return iCDCodeService.saveOrUpdateICDInformation(icdCodeUpdateDto);
+    }
+
+
+}
diff --git a/openhis-server-new/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
index 3a2413ba..89779345 100644
--- a/openhis-server-new/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
@@ -2,10 +2,10 @@ package com.openhis.web.datadictionary.controller;
 
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-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;
@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class MedicationManageController {
 
-    @Autowired
+    @Resource
     private IMedicationManageAppService medicationManageAppService;
 
     /**
@@ -117,17 +117,6 @@ public class MedicationManageController {
         return medicationManageAppService.addMedication(medicationManageUpDto);
     }
 
-    /**
-     * 新增医保药品目录
-     *
-     * @param medicationManageUpDto 药品目录信息
-     * @return
-     */
-    @PostMapping("/information-yb")
-    public R<?> addYbMedication(@RequestBody MedicationManageUpDto medicationManageUpDto) {
-        return null;
-    }
-
     /**
      * 药品目录导出
      * 
@@ -166,4 +155,15 @@ public class MedicationManageController {
     public void importTemplate(HttpServletResponse response) {
         medicationManageAppService.importTemplate(response);
     }
+
+    /**
+     * 校验药品是否可以编辑
+     *
+     * @param medicationId 药品ID
+     * @return 校验结果
+     */
+    @GetMapping("/validate-edit")
+    public R<?> validateMedicationEdit(Long medicationId) {
+        return medicationManageAppService.validateMedicationEdit(medicationId);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
index 8920ca12..66da1990 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 /**
  * 器材目录导入Dto
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-09-24
  */
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
index 46cf5eeb..686f25c0 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 /**
  * 诊疗目录导入Dto
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-09-29
  */
 @Data
diff --git a/openhis-server-new/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
index e91d7365..e940988c 100644
--- a/openhis-server-new/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
@@ -19,4 +19,6 @@ public class DiseaseManageSelParam {
     private Integer sourceEnum;
     /** 状态 */
     private Integer statusEnum;
+    /** 类型 */
+    private String typeCode;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java
new file mode 100644
index 00000000..7b80d298
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java
@@ -0,0 +1,31 @@
+package com.openhis.web.datadictionary.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@Accessors(chain = true)
+public class ICDCodeAddDto {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 国临编码 */
+    @NotNull
+    private String glNo;
+
+    /** 国临name */
+    private String glName;
+
+    /** 医保编码 */
+    private String icd10No;
+
+    /** 医保name */
+    private String icd10Name;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java
new file mode 100644
index 00000000..6574fdfb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java
@@ -0,0 +1,31 @@
+package com.openhis.web.datadictionary.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.math.BigDecimal;
+
+@Data
+@Accessors(chain = true)
+public class ICDCodeDto {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 国临编码 */
+    private String glNo;
+
+    /** 国临name */
+    private String glName;
+
+    /** 医保编码 */
+    private String icd10No;
+
+    /** 医保name */
+    private String icd10Name;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java
new file mode 100644
index 00000000..7b0ee790
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java
@@ -0,0 +1,32 @@
+package com.openhis.web.datadictionary.dto;
+
+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 javax.validation.constraints.NotNull;
+
+@Data
+@Accessors(chain = true)
+public class ICDCodeUpdateDto {
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 国临编码 */
+    @NotNull
+    private String glNo;
+
+    /** 国临name */
+    private String glName;
+
+    /** 医保编码 */
+    private String icd10No;
+
+    /** 医保name */
+    private String icd10Name;
+
+}
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
index 2fe424c7..957c7a78 100644
--- 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
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 /**
  * 药品目录导入Dto
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-08-18
  */
 @Data
@@ -42,6 +42,10 @@ public class MedicationImportDto {
     @Excel(name = "商品名称", prompt = "必填")
     private String merchandiseName;
 
+    /** 药品性质 */
+    @Excel(name = "药品性质", prompt = "必填", dictType = "medicine_properties", comboReadDict = true)
+    private String pharmacologyCategoryCode;
+
     /** 药品单位 */
     @Excel(name = "药品单位", prompt = "必填", dictType = "unit_code", comboReadDict = true)
     private String unitCode;
diff --git a/openhis-server-new/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
index 9a591f17..c27a0c1e 100644
--- a/openhis-server-new/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
@@ -289,4 +289,9 @@ public class MedicationManageDto {
     /** 处方标志 */
     private Integer rxFlag;
 
+    /**
+     * 用药说明
+     */
+    private String dosageInstruction;
+
 }
diff --git a/openhis-server-new/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
index d60fe5fc..fad607eb 100644
--- a/openhis-server-new/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
@@ -258,4 +258,9 @@ public class MedicationManageUpDto {
     /** 处方标志 */
     private Integer rxFlag;
 
+    /**
+     * 用药说明
+     */
+    private String dosageInstruction;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java
new file mode 100644
index 00000000..f215aeef
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java
@@ -0,0 +1,7 @@
+package com.openhis.web.datadictionary.mapper;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ICDCodeMapper {
+}
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
index 08553fa2..4dcfd347 100644
--- 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
@@ -2,25 +2,16 @@ 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;
@@ -28,8 +19,10 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentIssuanceOrderServi
 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.web.departmentmanage.mapper.DepartmentIssuanceOrderMapper;
+import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyDeliveryService;
 import com.openhis.workflow.service.ISupplyRequestService;
 
 /**
@@ -55,6 +48,7 @@ public class DepartmentIssuanceOrderServiceImpl implements IDepartmentIssuanceOr
     private DepartmentCommonMapper departmentCommonMapper;
     @Autowired
     private DepartmentIssuanceOrderMapper departmentIssuanceOrderMapper;
+
     /**
      * 初始化
      *
@@ -67,15 +61,15 @@ public class DepartmentIssuanceOrderServiceImpl implements IDepartmentIssuanceOr
 
         // 单据分类
         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()));
+        // 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);
 
@@ -143,9 +137,8 @@ public class DepartmentIssuanceOrderServiceImpl implements IDepartmentIssuanceOr
                 .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())
+                .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());
@@ -156,9 +149,9 @@ public class DepartmentIssuanceOrderServiceImpl implements IDepartmentIssuanceOr
                 .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());
+                .setLotNumber(supplyRequest.getLotNumber()).setPractitionerId(supplyRequest.getApplicantId())
+                .setOccurrenceTime(supplyRequest.getApprovalTime()).setReceiverId(supplyRequest.getPurposeLocationId())
+                .setReceiveTime(supplyRequest.getApprovalTime());
 
             supplyDeliveryList.add(supplyDelivery);
         }
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
index b22470c8..535521ec 100644
--- 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
@@ -59,16 +59,16 @@ public class DepartmentProfitLossOrderServiceImpl implements IDepartmentProfitLo
 
         // 单据分类
         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()));
+//        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);
 
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
index 424e5eaf..75389a63 100644
--- 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
@@ -58,10 +58,10 @@ public class DepartmentRequisitionOrderServiceImpl implements IDepartmentRequisi
 
         // 单据分类
         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()));
+//        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);
 
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
index 6dd1368d..939dc00f 100644
--- 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
@@ -24,7 +24,6 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentReturnToWarehouseO
 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;
@@ -47,6 +46,7 @@ public class DepartmentReturnToWarehouseOrderServiceImpl implements IDepartmentR
     private IDepartmentCommonService departmentCommonService;
     @Autowired
     private DepartmentCommonMapper departmentCommonMapper;
+
     /**
      * 初始化
      *
@@ -59,8 +59,8 @@ public class DepartmentReturnToWarehouseOrderServiceImpl implements IDepartmentR
 
         // 单据分类
         List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -93,16 +93,14 @@ public class DepartmentReturnToWarehouseOrderServiceImpl implements IDepartmentR
         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()
-            ));
+            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);
     }
 
-
     /**
      * 获取单据号
      *
@@ -128,7 +126,8 @@ public class DepartmentReturnToWarehouseOrderServiceImpl implements IDepartmentR
     @Override
     public R<?> addOrEditReturnToWarehouseOrder(List<DepartmentDetailDto> returnToDispensaryOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToDispensaryOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(returnToDispensaryOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
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
index fb29b8c3..4e5dc7f8 100644
--- 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
@@ -24,7 +24,6 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentStockInOrderServic
 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;
@@ -60,8 +59,8 @@ public class DepartmentStockInOrderServiceImpl implements IDepartmentStockInOrde
 
         // 单据分类
         List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -134,10 +133,11 @@ public class DepartmentStockInOrderServiceImpl implements IDepartmentStockInOrde
             // 单据信息删除
             supplyRequestService.removeByIds(requestIdList);
         }
-        //添加原始单据号
-        if(stockInOrderDtoList.get(0).getOriginalBusNo()!=null){
+        // 添加原始单据号
+        if (stockInOrderDtoList.get(0).getOriginalBusNo() != null) {
             // 审批单据并返回单据详情
-            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockInOrderDtoList.get(0).getOriginalBusNo(), stockInOrderDtoList.get(0).getBusNo());
+            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));
             }
@@ -156,8 +156,9 @@ public class DepartmentStockInOrderServiceImpl implements IDepartmentStockInOrde
                 .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());
+                .setPurposeTypeEnum(LocationForm.DEPARTMENT.getValue())
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index fa706958..f2078be5 100644
--- 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
@@ -60,10 +60,10 @@ public class DepartmentStocktakingOrderServiceImpl implements IDepartmentStockta
 
         // 单据分类
         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()));
+//        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);
 
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
index eda10695..532367f5 100644
--- 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
@@ -24,7 +24,6 @@ import com.openhis.web.departmentmanage.appservice.IDepartmentTransferInOrderSer
 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;
@@ -59,8 +58,8 @@ public class DepartmentTransferInOrderServiceImpl implements IDepartmentTransfer
 
         // 单据分类
         List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -127,7 +126,8 @@ public class DepartmentTransferInOrderServiceImpl implements IDepartmentTransfer
     @Override
     public R<?> addOrEditTransferInOrder(List<DepartmentDetailDto> transferInOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
@@ -149,8 +149,8 @@ public class DepartmentTransferInOrderServiceImpl implements IDepartmentTransfer
                 .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());
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index 4a0c6943..46f0d740 100644
--- 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
@@ -59,8 +59,8 @@ public class DepartmentTransferOutOrderServiceImpl implements IDepartmentTransfe
 
         // 单据分类
         List<DepartmentInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+//        supplyCategoryOption.add(new DepartmentInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+//            SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
diff --git a/openhis-server-new/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
index 884ba328..e3e2e07c 100644
--- a/openhis-server-new/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
@@ -4,10 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
-import com.openhis.web.doctorstation.dto.ActivityBindDeviceDto;
-import com.openhis.web.doctorstation.dto.AdviceBaseDto;
-import com.openhis.web.doctorstation.dto.AdviceSaveParam;
-import com.openhis.web.doctorstation.dto.UpdateGroupIdParam;
+import com.openhis.web.doctorstation.dto.*;
 
 /**
  * 医生站-医嘱/处方 应用Service
@@ -33,12 +30,13 @@ public interface IDoctorStationAdviceAppService {
         Integer pricingFlag, List<Integer> adviceTypes);
 
     /**
-     * 查询诊疗绑定耗材信息
+     * 查询医嘱绑定信息
      *
-     * @param activityId 诊疗id
-     * @return 诊疗绑定耗材信息
+     * @param typeCode 1:用法绑东西 2:诊疗绑东西
+     * @param itemNo 用法的code 或者 诊疗定义id
+     * @return 医嘱绑定信息
      */
-    ActivityBindDeviceDto getActivityBindDevice(Long activityId);
+    List<OrderBindInfoDto> getOrderBindInfo(String typeCode, String itemNo);
 
     /**
      * 门诊保存医嘱
diff --git a/openhis-server-new/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
index 27b7d0fe..092b0a71 100644
--- a/openhis-server-new/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,13 +1,5 @@
 package com.openhis.web.doctorstation.appservice.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-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.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -15,10 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.enums.TenantOptionDict;
 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.core.common.utils.StringUtils;
+import com.core.web.util.TenantOptionUtil;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.common.constant.CommonConstants;
@@ -42,8 +37,13 @@ import com.openhis.workflow.service.IActivityDefinitionService;
 import com.openhis.workflow.service.IDeviceDispenseService;
 import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.IServiceRequestService;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 医生站-医嘱/处方 应用实现类
@@ -97,47 +97,52 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     /**
      * 查询医嘱信息
      *
-     * @param adviceBaseDto 查询条件
-     * @param searchKey 模糊查询关键字
-     * @param locationId 药房id
+     * @param adviceBaseDto               查询条件
+     * @param searchKey                   模糊查询关键字
+     * @param locationId                  药房id
      * @param adviceDefinitionIdParamList 医嘱定义id参数集合
-     * @param organizationId 患者挂号对应的科室id
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
-     * @param pricingFlag 划价标记
-     * @param adviceTypes 医嘱类型参数集合
+     * @param organizationId              患者挂号对应的科室id
+     * @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, List<Integer> adviceTypes) {
+                                                  List<Long> adviceDefinitionIdParamList, Long organizationId, Integer pageNo, Integer pageSize,
+                                                  Integer pricingFlag, List<Integer> adviceTypes) {
+        // 医嘱定价来源
+        String orderPricingSource = TenantOptionUtil.getOptionContent(TenantOptionDict.ORDER_PRICING_SOURCE);
+        if (StringUtils.isEmpty(orderPricingSource)) {
+            throw new ServiceException("租户配置项【医嘱定价来源】未配置");
+        }
         // 构建查询条件
         QueryWrapper<AdviceBaseDto> queryWrapper = HisQueryUtils.buildQueryWrapper(adviceBaseDto, searchKey,
-            new HashSet<>(Arrays.asList("advice_name", "py_str", "wb_str")), null);
+                new HashSet<>(Arrays.asList("advice_name", "py_str", "wb_str")), null);
         IPage<AdviceBaseDto> adviceBaseInfo = doctorStationAdviceAppMapper.getAdviceBaseInfo(
-            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, adviceTypes, queryWrapper);
+                new Page<>(pageNo, pageSize), PublicationStatus.ACTIVE.getValue(), organizationId,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                CommonConstants.TableName.WOR_ACTIVITY_DEFINITION, pricingFlag, adviceDefinitionIdParamList, adviceTypes,
+                queryWrapper);
         List<AdviceBaseDto> adviceBaseDtoList = adviceBaseInfo.getRecords();
         // 医嘱定义ID集合
         List<Long> adviceDefinitionIdList =
-            adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId).collect(Collectors.toList());
+                adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId).collect(Collectors.toList());
         // 费用定价主表ID集合
         List<Long> chargeItemDefinitionIdList =
-            adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId).collect(Collectors.toList());
+                adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId).collect(Collectors.toList());
         // 医嘱库存集合
         List<AdviceInventoryDto> adviceInventoryList =
-            doctorStationAdviceAppMapper.getAdviceInventory(locationId, adviceDefinitionIdList,
-                CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
+                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(), DispenseStatus.PREPARATION.getValue());
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+                DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue());
         // 预减库存
         List<AdviceInventoryDto> adviceInventory =
-            adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
+                adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
         // 查询取药科室配置
         List<AdviceInventoryDto> medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId);
         // 将配置转为 {categoryCode -> 允许的locationId集合}
@@ -153,9 +158,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         }
         // 费用定价子表信息
         List<AdvicePriceDto> childCharge = doctorStationAdviceAppMapper
-            .getChildCharge(ConditionCode.LOT_NUMBER_COST.getCode(), chargeItemDefinitionIdList);
+                .getChildCharge(ConditionCode.LOT_NUMBER_PRICE.getCode(), chargeItemDefinitionIdList);
         // 费用定价主表信息
-        List<AdvicePriceDto> mainCharge = doctorStationAdviceAppMapper.getMainCharge(chargeItemDefinitionIdList);
+        List<AdvicePriceDto> mainCharge =
+                doctorStationAdviceAppMapper.getMainCharge(chargeItemDefinitionIdList, PublicationStatus.ACTIVE.getValue());
         String unitCode = ""; // 包装单位
         Long chargeItemDefinitionId; // 费用定价主表ID
         for (AdviceBaseDto baseDto : adviceBaseDtoList) {
@@ -163,14 +169,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 case CommonConstants.TableName.MED_MEDICATION_DEFINITION: // 药品
                     // 是否皮试
                     baseDto
-                        .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, baseDto.getSkinTestFlag()));
+                            .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, baseDto.getSkinTestFlag()));
                     // 是否为注射药物
                     baseDto.setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, baseDto.getInjectFlag()));
                 case CommonConstants.TableName.ADM_DEVICE_DEFINITION: // 耗材
                     // 每一条医嘱的库存集合信息 , 包装单位库存前端计算
                     List<
-                        AdviceInventoryDto> inventoryList =
+                            AdviceInventoryDto> inventoryList =
                             adviceInventory.stream()
+<<<<<<< HEAD
                                 .filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
                                     && baseDto.getAdviceTableName().equals(e.getItemTable()))
                                 .collect(Collectors.toList());
@@ -187,17 +194,23 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                                 .collect(Collectors.toList());
                         }
                     }
+=======
+                                    .filter(e -> baseDto.getAdviceDefinitionId().equals(e.getItemId())
+                                            && baseDto.getAdviceTableName().equals(e.getItemTable()))
+                                    .collect(Collectors.toList());
+>>>>>>> upstream/develop
                     // 库存信息
                     baseDto.setInventoryList(inventoryList);
                     // 设置默认产品批号
                     if (!inventoryList.isEmpty()) {
                         // 库存大于0
                         List<AdviceInventoryDto> hasInventoryList = inventoryList.stream()
-                            .filter(e -> e.getQuantity().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
+                                .filter(e -> e.getQuantity().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
                         if (!hasInventoryList.isEmpty()) {
                             baseDto.setDefaultLotNumber(hasInventoryList.get(0).getLotNumber());
                         }
                     }
+<<<<<<< HEAD
                     if (!inventoryList.isEmpty() && !allowedLocByCategory.isEmpty()) {
                         Set<Long> allowedLoc =
                             allowedLocByCategory.get(String.valueOf(baseDto.getCategoryCode()));
@@ -207,6 +220,20 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                                 .findFirst().orElse(null);
                             if (hit != null && hit.getLotNumber() != null) {
                                 baseDto.setDefaultLotNumber(hit.getLotNumber());
+=======
+                    if (!inventoryList.isEmpty() && !medLocationConfig.isEmpty()) {
+                        // 第一步：在medLocationConfig中匹配categoryCode
+                        AdviceInventoryDto result1 = medLocationConfig.stream()
+                                .filter(dto -> baseDto.getCategoryCode().equals(dto.getCategoryCode())).findFirst()
+                                .orElse(null);
+                        if (result1 != null) {
+                            // 第二步：在inventoryList中匹配locationId
+                            AdviceInventoryDto result2 = inventoryList.stream()
+                                    .filter(dto -> result1.getLocationId().equals(dto.getLocationId())).findFirst()
+                                    .orElse(null);
+                            if (result2 != null && result2.getLotNumber() != null) {
+                                baseDto.setDefaultLotNumber(result2.getLotNumber());
+>>>>>>> upstream/develop
                             }
                         }
                     }
@@ -217,26 +244,35 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                     for (AdviceInventoryDto adviceInventoryDto : inventoryList) {
                         Long finalChargeItemDefinitionId = chargeItemDefinitionId;
                         String finalUnitCode = unitCode;
-                        // 匹配包装单位
-                        List<AdvicePriceDto> advicePrice = childCharge.stream()
-                            .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId)
-                                && e.getConditionValue().equals(adviceInventoryDto.getLotNumber()))
-                            .peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode
-                            .collect(Collectors.toList());
-                        priceDtoList.addAll(advicePrice);
+                        // 从定价子表取价格(适用于批次售卖场景)
+                        List<AdvicePriceDto> childPrice = childCharge.stream()
+                                .filter(e -> e.getDefinitionId().equals(finalChargeItemDefinitionId)
+                                        && e.getConditionValue().equals(adviceInventoryDto.getLotNumber()))
+                                .peek(e -> e.setUnitCode(finalUnitCode)) // 设置 unitCode
+                                .collect(Collectors.toList());
+                        // 从定价主表取价格(适用于统一零售价场景)
+                        List<AdvicePriceDto> mainPrice = mainCharge.stream()
+                                .filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
+                                .collect(Collectors.toList());
+                        // 按批次售价
+                        if (OrderPricingSource.BATCH_SELLING_PRICE.getCode().equals(orderPricingSource)) {
+                            priceDtoList.addAll(childPrice);
+                        } else {
+                            priceDtoList.addAll(mainPrice);
+                        }
                     }
                     // 价格信息
                     baseDto.setPriceList(priceDtoList);
                     break;
                 case CommonConstants.TableName.WOR_ACTIVITY_DEFINITION: // 诊疗
                     List<AdvicePriceDto> priceList =
-                        mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
-                            .collect(Collectors.toList());
+                            mainCharge.stream().filter(e -> baseDto.getChargeItemDefinitionId().equals(e.getDefinitionId()))
+                                    .collect(Collectors.toList());
                     // 价格信息
                     baseDto.setPriceList(priceList);
                     // 活动类型
                     baseDto.setActivityType_enumText(
-                        EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType()));
+                            EnumUtils.getInfoByValue(ActivityType.class, baseDto.getActivityType()));
                     break;
                 default:
                     break;
@@ -246,47 +282,22 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     }
 
     /**
-     * 查询诊疗绑定耗材信息
+     * 查询医嘱绑定信息
      *
-     * @param activityId 诊疗id
-     * @return 诊疗绑定耗材信息
+     * @param typeCode 1:用法绑东西 2:诊疗绑东西
+     * @param itemNo   用法的code 或者 诊疗定义id
+     * @return 医嘱绑定信息
      */
-    public ActivityBindDeviceDto getActivityBindDevice(Long activityId) {
-        ActivityBindDeviceDto activityBindDeviceDto = new ActivityBindDeviceDto();
-        List<ActivityBindDeviceDetailDto> activityBindDevice = doctorStationAdviceAppMapper.getActivityBindDevice(
-            activityId + "", PublicationStatus.ACTIVE.getValue(), CommonConstants.TableName.ADM_DEVICE_DEFINITION);
-        // 详细信息赋值
-        if (!activityBindDevice.isEmpty()) {
-            // 耗材id集合
-            List<Long> deviceIds =
-                activityBindDevice.stream().map(ActivityBindDeviceDetailDto::getDeviceId).collect(Collectors.toList());
-            // 耗材医嘱信息
-            List<AdviceBaseDto> deviceRecords =
-                this.getAdviceBaseInfo(null, null, null, deviceIds, 0L, 1, 100, Whether.NO.getValue(), List.of(1, 2, 3))
-                    .getRecords();
-            Map<Long, AdviceBaseDto> adviceMap = deviceRecords.stream().collect(Collectors
-                .toMap(AdviceBaseDto::getAdviceDefinitionId, advice -> advice, (existing, replacement) -> existing // 如果有重复key，保留第一个
-                ));
-            activityBindDeviceDto.setActivityBindDeviceInfos(activityBindDevice);
-            for (ActivityBindDeviceDetailDto activityBindDeviceInfo : activityBindDeviceDto
-                .getActivityBindDeviceInfos()) {
-                Long deviceId = activityBindDeviceInfo.getDeviceId();
-                if (deviceId != null) {
-                    AdviceBaseDto matchedAdvice = adviceMap.get(deviceId);
-                    if (matchedAdvice != null) {
-                        activityBindDeviceInfo.setOrderDetailInfos(matchedAdvice);
-                    }
-                }
-            }
-        }
-        return activityBindDeviceDto;
+    @Override
+    public List<OrderBindInfoDto> getOrderBindInfo(String typeCode, String itemNo) {
+        return doctorStationAdviceAppMapper.getOrderBindInfo(typeCode, PublicationStatus.ACTIVE.getValue(), itemNo);
     }
 
     /**
      * 门诊保存/签发医嘱
      *
      * @param adviceSaveParam 医嘱表单信息
-     * @param adviceOpType 医嘱操作类型
+     * @param adviceOpType    医嘱操作类型
      * @return 结果
      */
     @Override
@@ -297,21 +308,21 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         List<AdviceSaveDto> adviceSaveList = adviceSaveParam.getAdviceSaveList();
         // 药品
         List<AdviceSaveDto> medicineList = adviceSaveList.stream()
-            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
         // 耗材
         List<AdviceSaveDto> deviceList = adviceSaveList.stream()
-            .filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
         // 诊疗活动
         List<AdviceSaveDto> activityList = adviceSaveList.stream()
-            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
 
         /**
          * 保存时,校验库存
          */
         if (AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType)) {
             List<AdviceSaveDto> needCheckList =
-                adviceSaveList.stream().filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())
-                    && !ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                    adviceSaveList.stream().filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())
+                            && !ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
             // 校验库存
             String tipRes = adviceUtils.checkInventory(needCheckList);
             if (tipRes != null) {
@@ -342,25 +353,25 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         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());
+                    .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));
+                    .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[] {"门诊医嘱"}));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"门诊医嘱"}));
     }
 
     /**
      * 处理药品
      */
     private void handMedication(List<AdviceSaveDto> medicineList, Date curDate, String adviceOpType,
-        Long organizationId, String signCode) {
+                                Long organizationId, String signCode) {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 保存操作
@@ -373,11 +384,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         ChargeItem chargeItem;
         // 新增 + 修改
         List<AdviceSaveDto> insertOrUpdateList =
-            medicineList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
-                || DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList());
+                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());
+                .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
         // 校验删除的医嘱是否已经收费
         List<Long> delRequestIdList = deleteList.stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
         if (!delRequestIdList.isEmpty()) {
@@ -396,30 +407,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
             // 删除费用项
             iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.MED_MEDICATION_REQUEST,
-                adviceSaveDto.getRequestId());
+                    adviceSaveDto.getRequestId());
             // 删除基于这个药品生成的需要执行的诊疗请求
             iServiceRequestService.remove(
-                new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getBasedOnId, adviceSaveDto.getRequestId())
-                    .isNotNull(ServiceRequest::getBasedOnTable)
-                    .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue()));
+                    new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getBasedOnId, adviceSaveDto.getRequestId())
+                            .isNotNull(ServiceRequest::getBasedOnTable)
+                            .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue()));
         }
-        // 当前时间毫秒值
-        Long currentTimeMillis = System.currentTimeMillis();
         // 签发时
         if (is_sign) {
-            // 对组号进行二次处理
-            Long i = 1L;
-            for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
-                // 输液标记
-                if (Whether.YES.getValue().equals(adviceSaveDto.getInjectFlag())) {
-                    if (adviceSaveDto.getGroupId() == null) {
-                        adviceSaveDto.setGroupId(currentTimeMillis + i);
-                    } else {
-                        adviceSaveDto.setGroupId(currentTimeMillis + adviceSaveDto.getGroupId());
-                    }
-                }
-                i = ++i;
-            }
             // 生成处方号
             prescriptionUtils.generatePrescriptionNumbers(insertOrUpdateList);
         }
@@ -433,9 +429,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_sign) {
                 medicationRequest.setSignCode(signCode);
             }
-            // 只有保存时才处理的字段属性
+            // 保存时,处理数据(请求,发放,账单)
             if (is_save) {
                 medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                medicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
                 medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
                 medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -465,24 +462,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 medicationRequest.setSortNumber(adviceSaveDto.getSortNumber()); // 排序号
             }
             iMedicationRequestService.saveOrUpdate(medicationRequest);
-            // 第一次保存时,如果药品请求为皮试或输液,自动开立对应绑定的诊疗请求
-            if (adviceSaveDto.getRequestId() == null) {
-                if (is_save && (Whether.YES.getValue().equals(adviceSaveDto.getSkinTestFlag())
-                    || Whether.YES.getValue().equals(adviceSaveDto.getInjectFlag()))) {
-                    // 查询已经存在的当前数据
-                    medicationRequest = iMedicationRequestService.getById(medicationRequest.getId());
-                    adviceUtils.generateActRequestByMedicationFlag(medicationRequest, organizationId, adviceSaveDto);
-                }
-            }
-            // 保存时 处理药品发放 和 保存药品费用项
+
             if (is_save) {
                 // 处理药品发放
-                iMedicationDispenseService.handleMedicationDispense(medicationRequest, adviceSaveDto.getDbOpType());
+                Long dispenseId =
+                        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.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -499,6 +490,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
                 chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
                 chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                chargeItem.setDispenseId(dispenseId); // 发放ID
 
                 chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
                 chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
@@ -506,82 +498,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
 
                 iChargeItemService.saveOrUpdate(chargeItem);
+
             }
         }
-        // 签发时
-        /*    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()); // 取每组中的第一个元素
-            // 静脉输液的诊疗定义id
-            Long intravenousInfusionDefinitionId = iActivityDefinitionService
-                .getAppointActivityDefinitionId(CommonConstants.BusinessName.INTRAVENOUS_INFUSION);
-            // 对应的诊疗医嘱信息
-            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();// 执行次数
-                // 生成诊疗请求
-                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);
-            }
-            // --------------------如果是皮试药品,生成仅用于执行的 "皮试检查" 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);
-            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);
-            }
-        }*/
     }
 
     /**
@@ -599,11 +518,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         ChargeItem chargeItem;
         // 新增 + 修改
         List<AdviceSaveDto> insertOrUpdateList =
-            deviceList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
-                || DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList());
+                deviceList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
+                        || DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList());
         // 删除
         List<AdviceSaveDto> deleteList = deviceList.stream()
-            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+                .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
         // 校验删除的医嘱是否已经收费
         List<Long> delRequestIdList = deleteList.stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
         if (!delRequestIdList.isEmpty()) {
@@ -622,16 +541,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             iDeviceDispenseService.deleteDeviceDispense(adviceSaveDto.getRequestId());
             // 删除费用项
             iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_DEVICE_REQUEST,
-                adviceSaveDto.getRequestId());
+                    adviceSaveDto.getRequestId());
         }
 
         for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
             deviceRequest = new DeviceRequest();
             deviceRequest.setId(adviceSaveDto.getRequestId()); // 主键id
             deviceRequest.setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
-            // 只有保存时才处理的字段属性
+
+            // 保存时,处理数据(请求,发放,账单)
             if (is_save) {
                 deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
+                deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
                 deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
                 deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());// 产品批号
@@ -651,19 +572,20 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 deviceRequest.setYbClassEnum(adviceSaveDto.getYbClassEnum());// 类别医保编码
                 deviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
                 deviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+
             }
-
             iDeviceRequestService.saveOrUpdate(deviceRequest);
-
-            // 保存时 处理耗材发放 和 保存耗材费用项
             if (is_save) {
                 // 处理耗材发放
-                iDeviceDispenseService.handleDeviceDispense(deviceRequest, adviceSaveDto.getDbOpType());
+                Long dispenseId =
+                        iDeviceDispenseService.handleDeviceDispense(deviceRequest, adviceSaveDto.getDbOpType());
+
                 // 保存耗材费用项
                 chargeItem = new ChargeItem();
                 chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
                 chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
+                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -679,6 +601,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
                 chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
                 chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                chargeItem.setDispenseId(dispenseId); // 发放ID
 
                 chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
                 chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
@@ -694,7 +617,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
      * 处理诊疗
      */
     private void handService(List<AdviceSaveDto> activityList, Date curDate, String adviceOpType, Long organizationId,
-        String signCode) {
+                             String signCode) {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 保存操作
@@ -706,11 +629,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         ChargeItem chargeItem;
         // 新增 + 修改
         List<AdviceSaveDto> insertOrUpdateList =
-            activityList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
-                || DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList());
+                activityList.stream().filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
+                        || DbOpType.UPDATE.getCode().equals(e.getDbOpType()))).collect(Collectors.toList());
         // 删除
         List<AdviceSaveDto> deleteList = activityList.stream()
-            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+                .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
         // 校验删除的医嘱是否已经收费
         List<Long> delRequestIdList = deleteList.stream().map(AdviceSaveDto::getRequestId).collect(Collectors.toList());
         if (!delRequestIdList.isEmpty()) {
@@ -726,10 +649,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         for (AdviceSaveDto adviceSaveDto : deleteList) {
             iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗
             iServiceRequestService.remove(
-                new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId, adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
+                    new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId, adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
             // 删除费用项
             iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST,
-                adviceSaveDto.getRequestId());
+                    adviceSaveDto.getRequestId());
         }
 
         for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
@@ -742,6 +665,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             // 只有保存时才处理的字段属性
             if (is_save) {
                 serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
                 serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
 
@@ -767,6 +691,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
                 chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -792,7 +717,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 // 第一次保存时,处理诊疗套餐的子项信息
                 if (adviceSaveDto.getRequestId() == null) {
                     ActivityDefinition activityDefinition =
-                        iActivityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
+                            iActivityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
                     String childrenJson = activityDefinition.getChildrenJson();
                     if (childrenJson != null) {
                         // 诊疗子项参数类
@@ -813,8 +738,21 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 // 发送跨系统申请
                 adviceSaveDto.setRequestId(serviceRequest.getId());
                 try {
-                    doctorStationSendApplyUtil.sendCrossSystemApply(adviceSaveDto, organizationId, curDate);
+                    // 查询诊疗定义
+                    ActivityDefinition activityDefinition =
+                            iActivityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
+                    if (activityDefinition != null) {
+                        // 检验 或 检查
+                        if (ActivityType.PROOF.getValue().equals(activityDefinition.getTypeEnum())
+                                || ActivityType.TEST.getValue().equals(activityDefinition.getTypeEnum())) {
+                            doctorStationSendApplyUtil.sendCrossSystemApply(adviceSaveDto, organizationId, curDate);
+                        }
+                    }
                 } catch (Exception e) {
+                    if (!Whether.YES.getCode()
+                            .equals(TenantOptionUtil.getOptionContent(TenantOptionDict.LIS_PACS_ERROR_IGNORE))) {
+                        throw e;
+                    }
                     log.error(e.getMessage(), e);
                 }
             }
@@ -833,21 +771,22 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
         // 医嘱请求数据
         List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, null,
-            CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
-            CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode());
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto
-                .setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, requestBaseDto.getStatusEnum()));
+                    .setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, requestBaseDto.getStatusEnum()));
             // 是否皮试
             requestBaseDto
-                .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getSkinTestFlag()));
+                    .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getSkinTestFlag()));
             // 是否为注射药物
             requestBaseDto
-                .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getInjectFlag()));
+                    .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getInjectFlag()));
             // 收费状态
             requestBaseDto.setChargeStatus_enumText(
-                EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
+                    EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
         }
         return R.ok(requestBaseInfo);
     }
@@ -905,7 +844,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     /**
      * 查询历史医嘱请求数据
      *
-     * @param patientId 病人id
+     * @param patientId   病人id
      * @param encounterId 就诊id
      * @return 历史医嘱请求数据
      */
@@ -915,21 +854,22 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
         // 医嘱请求数据
         List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, patientId,
-            CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
-            CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode());
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode(),
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto
-                .setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, requestBaseDto.getStatusEnum()));
+                    .setStatusEnum_enumText(EnumUtils.getInfoByValue(RequestStatus.class, requestBaseDto.getStatusEnum()));
             // 是否皮试
             requestBaseDto
-                .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getSkinTestFlag()));
+                    .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getSkinTestFlag()));
             // 是否为注射药物
             requestBaseDto
-                .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getInjectFlag()));
+                    .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, requestBaseDto.getInjectFlag()));
             // 收费状态
             requestBaseDto.setChargeStatus_enumText(
-                EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
+                    EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
         }
         return R.ok(requestBaseInfo);
     }
@@ -944,7 +884,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     public void updateGroupId(UpdateGroupIdParam updateGroupIdParam) {
         List<UpdateGroupDto> groupList = updateGroupIdParam.getGroupList();
         List<Long> idsToSetNull = groupList.stream().filter(dto -> dto.getGroupId() == null)
-            .map(UpdateGroupDto::getRequestId).collect(Collectors.toList());
+                .map(UpdateGroupDto::getRequestId).collect(Collectors.toList());
 
         if (!idsToSetNull.isEmpty()) {
             // 创建更新条件
@@ -957,8 +897,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
 
         // 处理非null的情况
         List<MedicationRequest> medicationRequestList = groupList.stream().filter(dto -> dto.getGroupId() != null)
-            .map(dto -> new MedicationRequest().setId(dto.getRequestId()).setGroupId(dto.getGroupId()))
-            .collect(Collectors.toList());
+                .map(dto -> new MedicationRequest().setId(dto.getRequestId()).setGroupId(dto.getGroupId()))
+                .collect(Collectors.toList());
 
         if (!medicationRequestList.isEmpty()) {
             iMedicationRequestService.saveOrUpdateBatch(medicationRequestList);
diff --git a/openhis-server-new/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
index ae54198b..ff0aa6a8 100644
--- a/openhis-server-new/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
@@ -18,6 +18,7 @@ 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.core.common.utils.StringUtils;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.domain.EncounterDiagnosis;
 import com.openhis.administration.service.IChargeItemService;
@@ -272,6 +273,11 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 患者挂号对应的科室id
         Long organizationId = adviceSaveParam.getOrganizationId();
+        // 是否代煎
+        Integer sufferingFlag = adviceSaveParam.getSufferingFlag();
+        // 中药代煎定义id
+        Long sufferingDefinitionId =
+            iActivityDefinitionService.getAppointActivityDefinitionId(CommonConstants.BusinessName.SUFFERING_TCM);
         // 保存时,校验库存
         if (is_save) {
             List<AdviceSaveDto> needCheckList = medicineList.stream()
@@ -300,9 +306,12 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
             // 删除费用项
             iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.MED_MEDICATION_REQUEST,
                 adviceSaveDto.getRequestId());
+            // 删除代煎费
+            iChargeItemService.remove(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getPrescriptionNo, adviceSaveDto.getPrescriptionNo())
+                .eq(ChargeItem::getProductId, sufferingDefinitionId));
+
         }
-        // 是否代煎
-        Integer sufferingFlag = adviceSaveParam.getSufferingFlag();
 
         if (is_sign) {
             // 按groupId分组
@@ -310,9 +319,16 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
                 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));
+                // 先查询当前groupId是否已经被签发生成过处方号
+                List<MedicationRequest> list = iMedicationRequestService
+                    .list(new LambdaQueryWrapper<MedicationRequest>().eq(MedicationRequest::getGroupId, groupId));
+                if (!list.isEmpty() && StringUtils.isNotEmpty(list.get(0).getPrescriptionNo())) {
+                    groupList.forEach(dto -> dto.setPrescriptionNo(list.get(0).getPrescriptionNo()));
+                } else {
+                    String prescriptionNo =
+                        assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_CHINESE_HERBAL_MEDICINE.getPrefix(), 8);
+                    groupList.forEach(dto -> dto.setPrescriptionNo(prescriptionNo));
+                }
             });
         }
 
@@ -326,13 +342,14 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
             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(), 4));
+                medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                medicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                medicationRequest.setGroupId(adviceSaveDto.getGroupId()); // 组号
                 medicationRequest.setChineseHerbsDoseQuantity(chineseHerbsDoseQuantity); // 中药付数
                 medicationRequest.setSufferingFlag(sufferingFlag); // 代煎标识
                 medicationRequest.setQuantity(adviceSaveDto.getQuantity().multiply(chineseHerbsDoseQuantity)); // 请求数量
@@ -357,16 +374,20 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
                 // medicationRequest.setDispensePerDuration(adviceSaveDto.getDispensePerDuration()); // 每次发药供应天数
                 medicationRequest.setContentJson(adviceSaveDto.getContentJson()); // 请求内容json
                 medicationRequest.setYbClassEnum(adviceSaveDto.getYbClassEnum());// 类别医保编码
+                medicationRequest.setDosageInstruction(adviceSaveDto.getDosageInstruction()); // 用药说明 , 即煎法
             }
             iMedicationRequestService.saveOrUpdate(medicationRequest);
             if (is_save) {
                 // 处理药品发放
-                iMedicationDispenseService.handleMedicationDispense(medicationRequest, adviceSaveDto.getDbOpType());
+                Long dispenseId =
+                    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.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -383,14 +404,14 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
                 chargeItem.setAccountId(adviceSaveDto.getAccountId());// 关联账户ID
                 chargeItem.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
                 chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                // chargeItem.setDispenseId(dispenseId); // 发放ID
 
                 chargeItem.setQuantityValue(medicationRequest.getQuantity()); // 数量
                 chargeItem.setQuantityUnit(medicationRequest.getUnitCode()); // 单位
                 chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
-                // 计算总价,保留4位小数
+                // 计算总价,保留6位小数
                 BigDecimal qty = chargeItem.getQuantityValue();
-                chargeItem.setTotalPrice(qty.multiply(chargeItem.getUnitPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-                chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
+                chargeItem.setTotalPrice(qty.multiply(chargeItem.getUnitPrice()).setScale(6, RoundingMode.HALF_UP)); // 总价
 
                 chargeItem.setTcmFlag(Whether.YES.getValue());// 中医标识
                 iChargeItemService.saveOrUpdate(chargeItem);
@@ -406,61 +427,63 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         Long conditionId = medicineList.get(0).getConditionId();
         // 就诊诊断id
         Long encounterDiagnosisId = medicineList.get(0).getEncounterDiagnosisId();
-        // 中药代煎定义id
-        Long sufferingDefinitionId =
-            iActivityDefinitionService.getAppointActivityDefinitionId(CommonConstants.BusinessName.SUFFERING_TCM);
-        // 签发时,生成中药代煎的账单,只生成一次
+        // 中药付数
+        BigDecimal chineseHerbsDoseQuantity = medicineList.get(0).getChineseHerbsDoseQuantity();
+        // 处方号
+        String prescriptionNo = insertOrUpdateList.get(0).getPrescriptionNo();
+
+        // 签发时,生成中药代煎的账单
         if (Whether.YES.getValue().equals(sufferingFlag) && is_sign) {
-            BigDecimal quantity = new BigDecimal("1"); // 请求数量
+            BigDecimal quantity = chineseHerbsDoseQuantity; // 请求数量
 
             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 = quantity;
-                        chargeItem
-                            .setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-                        chargeItem.setTcmFlag(Whether.YES.getValue());// 中医标识
-                        iChargeItemService.save(chargeItem);
-                    }
+            // 先删除中药代煎的账单
+            iChargeItemService.remove(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getPrescriptionNo, prescriptionNo).eq(ChargeItem::getProductId, sufferingDefinitionId));
+
+            // 对应的诊疗医嘱信息
+            AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null,
+                null, null, organizationId, 1, 1, Whether.NO.getValue(), List.of(3)).getRecords().get(0);
+            if (activityAdviceBaseDto != null) {
+                // 费用定价
+                AdvicePriceDto advicePriceDto = activityAdviceBaseDto.getPriceList().get(0);
+                if (advicePriceDto != null) {
+                    // 生成账单
+                    chargeItem = new ChargeItem();
+                    chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                    chargeItem.setPrescriptionNo(prescriptionNo); // 处方号
+                    chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 收费状态
+                    chargeItem.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix(), 4));
+                    chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                    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()); // 单价
+                    // 计算总价,保留6位小数
+                    BigDecimal qty = quantity;
+                    chargeItem.setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(6, 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));
+            iChargeItemService.remove(new LambdaQueryWrapper<ChargeItem>()
+                .eq(ChargeItem::getPrescriptionNo, prescriptionNo).eq(ChargeItem::getProductId, sufferingDefinitionId));
         }
 
         // 签发时,把草稿状态的账单更新为待收费[中医]
@@ -491,7 +514,8 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         // 医嘱请求数据
         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());
+            CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
+            GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto
@@ -515,10 +539,10 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
         // 当前账号的参与者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());
+        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(), GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto
diff --git a/openhis-server-new/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
index 0c95aa82..c19cc718 100644
--- a/openhis-server-new/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
@@ -32,43 +32,45 @@ public class DoctorStationAdviceController {
     /**
      * 查询医嘱信息
      *
-     * @param adviceBaseDto 查询条件
-     * @param searchKey 模糊查询关键字
-     * @param locationId 药房id
+     * @param adviceBaseDto               查询条件
+     * @param searchKey                   模糊查询关键字
+     * @param locationId                  药房id
      * @param adviceDefinitionIdParamList 医嘱定义id参数集合
-     * @param adviceTypes 医嘱类型参数集合
-     * @param organizationId 患者挂号对应的科室id
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
+     * @param adviceTypes                 医嘱类型参数集合
+     * @param organizationId              患者挂号对应的科室id
+     * @param pageNo                      当前页
+     * @param pageSize                    每页多少条
      * @return 医嘱信息
      */
     @GetMapping(value = "/advice-base-info")
     public R<?> getAdviceBaseInfo(AdviceBaseDto adviceBaseDto,
-        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
-        @RequestParam(value = "locationId", required = false) Long locationId,
-        @RequestParam(value = "adviceDefinitionIdParamList", required = false) List<Long> adviceDefinitionIdParamList,
-        @RequestParam(value = "organizationId", defaultValue = "0") Long organizationId,
-        @RequestParam(value = "adviceTypes", defaultValue = "1,2,3") List<Integer> adviceTypes,
-        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+                                  @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+                                  @RequestParam(value = "locationId", required = false) Long locationId,
+                                  @RequestParam(value = "adviceDefinitionIdParamList", required = false) List<Long> adviceDefinitionIdParamList,
+                                  @RequestParam(value = "organizationId", defaultValue = "0") Long organizationId,
+                                  @RequestParam(value = "adviceTypes", defaultValue = "1,2,3") 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(), adviceTypes));
+                adviceDefinitionIdParamList, organizationId, pageNo, pageSize, Whether.NO.getValue(), adviceTypes));
     }
 
     /**
-     * 查询诊疗绑定耗材信息
-     * 
-     * @param activityId 诊疗id
-     * @return 诊疗绑定耗材信息
+     * 查询医嘱绑定信息
+     *
+     * @param typeCode 1:用法绑东西 2:诊疗绑东西
+     * @param itemNo   用法的code 或者 诊疗定义id
+     * @return 医嘱绑定信息
      */
-    @GetMapping(value = "/activity-bind-device-info")
-    public R<?> getActivityBindDevice(@RequestParam(value = "activityId") Long activityId) {
-        return R.ok(iDoctorStationAdviceAppService.getActivityBindDevice(activityId));
+    @GetMapping(value = "/order-bind-info")
+    public R<?> getOrderBindInfo(@RequestParam(value = "typeCode") String typeCode,
+                                 @RequestParam(value = "itemNo") String itemNo) {
+        return R.ok(iDoctorStationAdviceAppService.getOrderBindInfo(typeCode, itemNo));
     }
 
     /**
      * 门诊保存医嘱
-     * 
+     *
      * @param adviceSaveParam 医嘱表单信息
      * @return 结果
      */
@@ -101,7 +103,7 @@ public class DoctorStationAdviceController {
 
     /**
      * 查询医嘱请求数据
-     * 
+     *
      * @param encounterId 就诊id
      * @return 医嘱请求数据
      */
@@ -123,7 +125,7 @@ public class DoctorStationAdviceController {
 
     /**
      * 更新组号
-     * 
+     *
      * @param updateGroupIdParam 更新组号参数
      */
     @PutMapping(value = "/update-groupid")
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
index 1e32e8b3..e32239da 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDetailDto.java
@@ -43,6 +43,14 @@ public class ActivityBindDeviceDetailDto {
      */
     private String unitCode;
 
+    /** 小数量 */
+    private BigDecimal minUnitCodeQuantity;
+
+    /**
+     * 小单位
+     */
+    private String minUnitCode;
+
     /**
      * 耗材详细信息
      */
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDto.java
deleted file mode 100644
index 2a47fb4c..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/ActivityBindDeviceDto.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.openhis.web.doctorstation.dto;
-
-import java.util.List;
-
-import com.openhis.common.annotation.Dict;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 诊疗绑定耗材 dto
- */
-@Data
-@Accessors(chain = true)
-public class ActivityBindDeviceDto {
-
-    /**
-     * 用于搭配Dict切面,无实际业务意义
-     */
-    @Dict(dictCode = "test_field")
-    private String testField;
-    private String testField_dictText;
-
-    /**
-     * 诊疗绑定耗材详情
-     */
-    private List<ActivityBindDeviceDetailDto> activityBindDeviceInfos;
-
-}
diff --git a/openhis-server-new/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
index becd16f2..5b5efd60 100644
--- a/openhis-server-new/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
@@ -20,6 +20,9 @@ public class AdviceBaseDto {
     /** 医嘱类型 */
     private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目
 
+    /** 编号 */
+    private String busNo;
+
     /**
      * 医嘱详细分类
      */
@@ -171,4 +174,9 @@ public class AdviceBaseDto {
     /** 限制使用范围 */
     private String restrictedScope;
 
+    /** 用药说明 */
+    @Dict(dictCode = "dosage_instruction")
+    private String dosageInstruction;
+    private String dosageInstruction_dictText;
+
 }
diff --git a/openhis-server-new/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
index c65852c4..84ec1d1b 100644
--- a/openhis-server-new/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
@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import com.core.common.utils.SecurityUtils;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.annotation.Dict;
 import com.openhis.common.enums.EncounterClass;
 import com.openhis.common.enums.TherapyTimeType;
 
@@ -225,6 +226,9 @@ public class AdviceSaveDto {
      */
     private Integer sufferingFlag;
 
+    /** 用药说明 */
+    private String dosageInstruction;
+
     /**
      * 排序号
      */
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java
new file mode 100644
index 00000000..bded72e1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/OrderBindInfoDto.java
@@ -0,0 +1,43 @@
+package com.openhis.web.doctorstation.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
+ */
+@Data
+@Accessors(chain = true)
+public class OrderBindInfoDto {
+
+    /**
+     * 医嘱定义id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orderDefinitionId;
+
+    /**
+     * 医嘱定义名称
+     */
+    private String orderDefinitionName;
+
+    /** 数量 */
+    private BigDecimal quantity;
+
+    /**
+     * 单位code
+     */
+    private String unitCode;
+
+    /**
+     * 单位
+     */
+    private String unitCodeName;
+
+}
diff --git a/openhis-server-new/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
index 55c99889..ed21cd77 100644
--- a/openhis-server-new/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
@@ -119,4 +119,9 @@ public class PatientInfoDto {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long jzPractitionerUserId;
+
+    /**
+     * 病历号
+     */
+    private String busNo;
 }
diff --git a/openhis-server-new/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
index 53edefdb..931f4cb2 100644
--- a/openhis-server-new/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
@@ -170,4 +170,9 @@ public class RequestBaseDto {
      */
     private Integer sortNumber;
 
+    /** 用药说明 */
+    @Dict(dictCode = "dosage_instruction")
+    private String dosageInstruction;
+    private String dosageInstruction_dictText;
+
 }
diff --git a/openhis-server-new/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
index 6fea26ce..315c91c0 100644
--- a/openhis-server-new/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
@@ -26,7 +26,6 @@ public interface DoctorStationAdviceAppMapper {
      * @param medicationTableName 药品定义表名
      * @param deviceTableName 耗材定义表名
      * @param activityTableName 诊疗定义表名
-     * @param singleUse 单次消耗类 (耗材只查这类)
      * @param pricingFlag 划价标记
      * @param adviceDefinitionIdParamList 医嘱定义id参数集合
      * @param adviceTypes 医嘱类型参数集合
@@ -36,8 +35,7 @@ public interface DoctorStationAdviceAppMapper {
     IPage<AdviceBaseDto> getAdviceBaseInfo(@Param("page") Page<AdviceBaseDto> page,
         @Param("statusEnum") Integer statusEnum, @Param("organizationId") Long organizationId,
         @Param("medicationTableName") String medicationTableName, @Param("deviceTableName") String deviceTableName,
-        @Param("activityTableName") String activityTableName, @Param("singleUse") String singleUse,
-        @Param("pricingFlag") Integer pricingFlag,
+        @Param("activityTableName") String activityTableName, @Param("pricingFlag") Integer pricingFlag,
         @Param("adviceDefinitionIdParamList") List<Long> adviceDefinitionIdParamList,
         @Param("adviceTypes") List<Integer> adviceTypes,
         @Param(Constants.WRAPPER) QueryWrapper<AdviceBaseDto> queryWrapper);
@@ -76,6 +74,16 @@ public interface DoctorStationAdviceAppMapper {
      */
     List<AdviceInventoryDto> getMedLocationConfig(@Param("organizationId") Long organizationId);
 
+    /**
+     * 查询耗材的取药科室
+     * 
+     * @param encounterId 就诊id
+     * @param distributionCategoryCode 发放编码(耗材)
+     * @return 耗材的取药科室id
+     */
+    Long getTakeDeviceLocationId(@Param("encounterId") Long encounterId,
+        @Param("distributionCategoryCode") String distributionCategoryCode);
+
     /**
      * 查询 费用定价子表
      * 
@@ -90,9 +98,11 @@ public interface DoctorStationAdviceAppMapper {
      * 查询 费用定价主表
      *
      * @param chargeItemDefinitionIdList 费用定价主表ID集合
+     * @param statusEnum 状态
      * @return 费用定价子表
      */
-    List<AdvicePriceDto> getMainCharge(@Param("chargeItemDefinitionIdList") List<Long> chargeItemDefinitionIdList);
+    List<AdvicePriceDto> getMainCharge(@Param("chargeItemDefinitionIdList") List<Long> chargeItemDefinitionIdList,
+        @Param("statusEnum") Integer statusEnum);
 
     /**
      * 查询医嘱请求数据
@@ -104,13 +114,14 @@ public interface DoctorStationAdviceAppMapper {
      * @param WOR_SERVICE_REQUEST 诊疗请求表名
      * @param practitionerId 当前账号的参与者id
      * @param historyFlag 历史医嘱标记
+     * @param generateSourceEnum 生成来源
      * @return 医嘱请求数据
      */
     List<RequestBaseDto> getRequestBaseInfo(@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("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
 
     /**
      * 查询就诊费用性质
@@ -131,4 +142,15 @@ public interface DoctorStationAdviceAppMapper {
     List<ActivityBindDeviceDetailDto> getActivityBindDevice(@Param("activityId") String activityId,
         @Param("status") Integer status, @Param("tableName") String tableName);
 
+    /**
+     * 查询医嘱绑定信息
+     *
+     * @param typeCode 1:用法绑东西 2:诊疗绑东西
+     * @param status 状态
+     * @param itemNo 用法的code 或者 诊疗定义id
+     * @return 医嘱绑定信息
+     */
+    List<OrderBindInfoDto> getOrderBindInfo(@Param("typeCode") String typeCode, @Param("status") Integer status,
+        @Param("itemNo") String itemNo);
+
 }
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
index a208091c..7aa1d64b 100644
--- 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
@@ -32,13 +32,14 @@ public interface DoctorStationChineseMedicalAppMapper {
      * @param WOR_SERVICE_REQUEST 诊疗请求表名
      * @param practitionerId 当前账号的参与者id
      * @param historyFlag 历史医嘱标记
+     * @param generateSourceEnum 生成来源
      * @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("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
 
     /**
      * 查询中医医嘱历史请求数据
@@ -50,13 +51,14 @@ public interface DoctorStationChineseMedicalAppMapper {
      * @param WOR_SERVICE_REQUEST 诊疗请求表名
      * @param practitionerId 当前账号的参与者id
      * @param historyFlag 历史医嘱标记
+     * @param generateSourceEnum 生成来源
      * @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);
+        @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
 
     /**
      * 查询中医诊断id集合
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
index dc87575c..0a0111ad 100644
--- 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
@@ -2,6 +2,7 @@ package com.openhis.web.doctorstation.utils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -9,25 +10,23 @@ 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.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 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.inhospitalnursestation.dto.MedicationRequestUseExe;
-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;
@@ -207,236 +206,6 @@ public class AdviceUtils {
         }).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;
-        BigDecimal quantity;
-        ChargeItem chargeItem;
-        DeviceRequest deviceRequest;
-        // 生成皮试检查对应的请求和账单;生成皮试检查这个诊疗自身的请求,以及皮试检查诊疗绑定的耗材(包括发放)
-        if (isSkinTest) {
-            quantity = new BigDecimal("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 = 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 = 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().multiply(new BigDecimal(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 = quantity;
-                            chargeItem.setTotalPrice(
-                                qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
-                            iChargeItemService.saveOrUpdate(chargeItem);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * 处理诊疗子项信息
      *
@@ -451,6 +220,11 @@ public class AdviceUtils {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         ObjectMapper objectMapper = new ObjectMapper();
+        // 注册 JavaTimeModule
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+
         try {
             // 将JSON字符串转换为List<ActivityChildJsonDto>
             List<ActivityChildJsonDto> activityChildJsonDtoList =
@@ -481,6 +255,7 @@ public class AdviceUtils {
                         serviceRequest = new ServiceRequest();
                         serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
                         serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                        serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                         serviceRequest.setQuantity(quantity); // 请求数量
                         serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
                         serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
@@ -498,10 +273,11 @@ public class AdviceUtils {
                         if (TherapyTimeType.TEMPORARY.getValue().equals(therapyEnum)) {
                             // 生成账单
                             chargeItem = new ChargeItem();
-                            chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue());
+                            chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
                             chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                             chargeItem
                                 .setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+                            chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                             chargeItem.setPatientId(activityChildrenJsonParams.getPatientId()); // 患者
                             chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
                             chargeItem.setEncounterId(activityChildrenJsonParams.getEncounterId()); // 就诊id
@@ -521,7 +297,7 @@ public class AdviceUtils {
                             // 计算总价,保留4位小数
                             BigDecimal qty = quantity;
                             chargeItem.setTotalPrice(
-                                qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                                qty.multiply(advicePriceDto.getPrice()).setScale(6, RoundingMode.HALF_UP)); // 总价
                             chargeItemList.add(chargeItem);
                         }
                     }
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
index 8bea5f32..c514abb9 100644
--- 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
@@ -14,7 +14,7 @@ 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.ActivityDefCategory;
+import com.openhis.common.enums.ActivityType;
 import com.openhis.common.enums.AdministrativeGender;
 import com.openhis.crosssystem.dto.LisApplyDto;
 import com.openhis.crosssystem.dto.LisApplyGroupDto;
@@ -32,7 +32,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * 跨系统发送申请工具类
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-06-27
  */
 @Slf4j
@@ -93,7 +93,7 @@ public class DoctorStationSendApplyUtil {
         }
 
         // 检验，发送LIS申请
-        if (ActivityDefCategory.PROOF.getCode().equals(activityDefinition.getCategoryCode())) {
+        if (ActivityType.PROOF.getValue().equals(activityDefinition.getTypeEnum())) {
             // LIS性别转换
             LisPatientSex lisPatientSex;
             if (patient.getGenderEnum() == null) {
@@ -122,7 +122,7 @@ public class DoctorStationSendApplyUtil {
             crossSystemSendApplyUtil.sendApplyToLis(lisApplyDto);
 
             // 检查，发送PACS申请
-        } else if (ActivityDefCategory.TEST.getCode().equals(activityDefinition.getCategoryCode())) {
+        } else if (ActivityType.TEST.getValue().equals(activityDefinition.getTypeEnum())) {
             // PACS性别转换
             PacsPatientSex pacsPatientSex;
             if (patient.getGenderEnum() == null) {
@@ -152,5 +152,4 @@ public class DoctorStationSendApplyUtil {
             crossSystemSendApplyUtil.sendApplyToPacs(pacsApplyDto);
         }
     }
-
 }
diff --git a/openhis-server-new/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
index 57c27f74..8c79ead7 100644
--- a/openhis-server-new/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
@@ -70,11 +70,80 @@ public class PrescriptionUtils {
             allGroups.forEach(group -> {
                 finalGroups.addAll(splitByPriceLimit(group));
             });
-            // 2.5 分配处方号
-            assignPrescriptionNumbers(finalGroups, pharmaGroup.get(0).getPharmacologyCategoryCode());
+
+            /**
+             * 如下文字适用 2.5 前提条件: 当 groupedMedicines 和 ungroupedMedicines都不为空的情况下 可以得知 finalGroups
+             * 的size至少是2(有组号的集合,无组号的集合) 假设有组号的集合为 groupList1 (也可能还有groupList2,groupList3 ...) 假设无组号的集合为 noGroupList1
+             * (也可能还有noGroupList2,noGroupList3 ...) 注意:上述的groupList1和noGroupList1只是为了方便描述finalGroups的组成部分,实际并不存在这样的变量
+             *
+             * 需求:对finalGroups的数据结构进行重新整合(groupList1,groupList2,groupList3,noGroupList1,noGroupList2,noGroupList3
+             * 这些集合集合不可以被拆分) 当finalGroups里的集合size < MAX_SINGLE_PRESCRIPTION_NUM
+             * 时,groupList1,noGroupList1这些集合元素进行整合,保证每个重新组合的size依旧 <= MAX_SINGLE_PRESCRIPTION_NUM;
+             */
+
+            // 2.5 重新整合小的分组（保持原有分组不被拆分）
+            List<List<AdviceSaveDto>> mergedGroups = mergeSmallGroups(finalGroups);
+            // 2.6 分配处方号
+            assignPrescriptionNumbers(mergedGroups, pharmaGroup.get(0).getPharmacologyCategoryCode());
         });
     }
 
+    /**
+     * 合并小的分组（保持原有分组不被拆分）
+     */
+    private List<List<AdviceSaveDto>> mergeSmallGroups(List<List<AdviceSaveDto>> groups) {
+        if (groups.size() <= 1) {
+            return groups;
+        }
+        List<List<AdviceSaveDto>> result = new ArrayList<>();
+        List<AdviceSaveDto> currentMergedGroup = new ArrayList<>();
+        for (List<AdviceSaveDto> group : groups) {
+            // 检查当前分组是否可以合并到现有组中
+            if (canMerge(currentMergedGroup, group)) {
+                currentMergedGroup.addAll(group);
+            } else {
+                // 如果不能合并，先保存当前合并组（如果不为空）
+                if (!currentMergedGroup.isEmpty()) {
+                    result.add(new ArrayList<>(currentMergedGroup));
+                }
+                // 开始新的合并组
+                currentMergedGroup = new ArrayList<>(group);
+            }
+        }
+        // 添加最后一个合并组
+        if (!currentMergedGroup.isEmpty()) {
+            result.add(currentMergedGroup);
+        }
+        return result;
+    }
+
+    /**
+     * 检查两个分组是否可以合并（合并后不超过最大限制）
+     */
+    private boolean canMerge(List<AdviceSaveDto> currentGroup, List<AdviceSaveDto> newGroup) {
+        if (currentGroup.isEmpty()) {
+            return true; // 当前组合为空，可以直接添加
+        }
+        // 检查合并后的药品数量是否超过限制
+        int mergedSize = currentGroup.size() + newGroup.size();
+        if (mergedSize > MAX_SINGLE_PRESCRIPTION_NUM) {
+            return false;
+        }
+        // 检查合并后的总金额是否超过限制
+        BigDecimal currentTotal = calculateTotalPrice(currentGroup);
+        BigDecimal newGroupTotal = calculateTotalPrice(newGroup);
+        BigDecimal mergedTotal = currentTotal.add(newGroupTotal);
+        return mergedTotal.compareTo(MAX_SINGLE_PRESCRIPTION_PRICE) <= 0;
+    }
+
+    /**
+     * 计算分组的总金额
+     */
+    private BigDecimal calculateTotalPrice(List<AdviceSaveDto> medicines) {
+        return medicines.stream().map(medicine -> medicine.getUnitPrice().multiply(medicine.getQuantity()))
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
     /**
      * 按药品种类上限拆分（仅用于无分组ID药品）
      */
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
index 6ac50b75..da1a529b 100644
--- 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
@@ -13,7 +13,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,8 +46,9 @@ public class DocDefinitionController {
         // 获取权限枚举列表
         map.put("permissions", EnumUtil.toMapList(DocPermissionEnum.class));
         //使用范围枚举
-
-        map.put("useRanges", EnumUtil.toMapList(DocUseRangeEnum.class));
+        List<String> noInUseCodes=new ArrayList<>();
+        noInUseCodes.add(DocUseRangeEnum.USE_BY_SELF.getCode());
+        map.put("useRanges", EnumUtil.toMapListFilter(DocUseRangeEnum.class, noInUseCodes));
         return R.ok(map);
     }
 
@@ -85,7 +88,7 @@ public class DocDefinitionController {
     }
 
     /**
-     * 获取文书定义详情
+     * 删除文书定义
      *
      * @param id 文书定义ID
      * @return 文书定义详情
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
index 670483b7..46f888f9 100644
--- 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
@@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * 文书模板 controller
+ * 文书模板/病历模板 controller
  *
  * @author wanghaiming
  * @date 2025-08-12
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
index d82544ca..81742f4e 100644
--- 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
@@ -13,6 +13,7 @@ import java.util.List;
 @Accessors(chain = true)
 public class DocDefinitonParam {
 
+    // 文书类型 一级菜单 ，从枚举中获取 DocTypeEnum
     private Integer primaryMenuEnum;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizationId;
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
index c8608696..c1ac3aae 100644
--- 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
@@ -2,11 +2,7 @@ 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.*;
 import java.util.stream.Collectors;
 
 /**
@@ -29,7 +25,37 @@ public class EnumUtil {
                 .map(EnumUtil::convertEnumToMap)
                 .collect(Collectors.toList());
     }
+    /**
+     * 将枚举转换为包含 value、code、info 的 Map 列表
+     *
+     * @param enumClass 枚举类
+     * @param filterCodes 接收 code 集合（如 List<String>）
+     * @return 包含枚举属性的 Map 列表
+     */
+    public static List<Map<String, Object>> toMapListFilter(
+            Class<? extends HisEnumInterface> enumClass,
+            Collection<String> filterCodes // 接收 code 集合（如 List<String>）
+    ) {
+        // 入参校验：enumClass 非法 或 filterCodes 为 null/空，直接返回空列表（或原枚举列表，按需调整）
+        if (enumClass == null || !enumClass.isEnum()) {
+            return Collections.emptyList();
+        }
+        // 若过滤集合为 null/空，返回所有枚举项（避免误过滤）
+        if (filterCodes == null || filterCodes.isEmpty()) {
+            return Arrays.stream(enumClass.getEnumConstants())
+                    .map(EnumUtil::convertEnumToMap)
+                    .collect(Collectors.toList());
+        }
 
+        // 核心逻辑：过滤掉 code 在 filterCodes 中的枚举项
+        return Arrays.stream(enumClass.getEnumConstants())
+                // 过滤条件：枚举的 code 不在过滤集合中
+                .filter(item -> !filterCodes.contains(item.getCode()))
+                // 转换为 Map
+                .map(EnumUtil::convertEnumToMap)
+                // 收集为 List
+                .collect(Collectors.toList());
+    }
     /**
      * 将枚举项转换为 Map
      *
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java
index 78b831cb..462e1b26 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IBankPosCloudAppService.java
@@ -1,11 +1,107 @@
 package com.openhis.web.externalintegration.appservice;
 
+import com.core.common.core.domain.R;
+
 /**
  * BPC商户接口Service接口
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public interface IBankPosCloudAppService {
 
+    /**
+     * 被扫消费
+     *
+     * @param txnAmt 交易金额
+     * @param merTradeNo 商户系统订单号
+     * @param scanCode 二维码信息
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> processConsumerScan(String txnAmt, String merTradeNo, String scanCode, String posNo);
+
+    /**
+     * 主扫下单
+     *
+     * @param txnAmt 交易金额
+     * @param merTradeNo 商户系统订单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> createMerchantScanOrder(String txnAmt, String merTradeNo, String posNo);
+
+    /**
+     * 消费订单查询
+     *
+     * @param merTradeNo 商户系统订单号
+     * @param tradeNo 原交易订单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> queryPaymentOrder(String merTradeNo, String tradeNo, String posNo);
+
+    /**
+     * 关闭订单
+     *
+     * @param merTradeNo 商户系统订单号
+     * @param tradeNo 原交易订单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> closeOrder(String merTradeNo, String tradeNo, String posNo);
+
+    /**
+     * 申请退货
+     *
+     * @param txnAmt 交易金额
+     * @param vfTradeNo 退款退订定金单号
+     * @param merTradeNo 商户系统订单号
+     * @param tradeNo 原交易订单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> applyForRefund(String txnAmt, String vfTradeNo, String merTradeNo, String tradeNo, String posNo);
+
+    /**
+     * 查询退货订单
+     *
+     * @param vfTradeNo 退款退订定金单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> queryRefundOrder(String vfTradeNo, String posNo);
+
+    /**
+     * 消费撤销
+     *
+     * @param txnAmt 交易金额
+     * @param vfTradeNo 退款退订定金单号
+     * @param merTradeNo 商户系统订单号
+     * @param tradeNo 原交易订单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> reversePayment(String txnAmt, String vfTradeNo, String merTradeNo, String tradeNo, String posNo);
+
+    /**
+     * 查询撤销订单
+     *
+     * @param merTradeNo 商户系统订单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> queryReversalOrder(String merTradeNo, String posNo);
+
+    /**
+     * 银行卡退货功能
+     *
+     * @param txnAmt 交易金额
+     * @param pan 银行卡号
+     * @param vfTradeNo 退款退订定金单号
+     * @param posNo 设备终端编号
+     * @return 结果
+     */
+    R<?> processCardRefund(String txnAmt, String pan, String vfTradeNo, String posNo);
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
index fc15f5ef..e428537e 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/IFoodborneAcquisitionAppService.java
@@ -5,7 +5,7 @@ import com.core.common.core.domain.R;
 /**
  * 食源性疾病病例数据智能采集Service接口
  * 
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-10
  */
 public interface IFoodborneAcquisitionAppService {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
index af70afcf..d9cc456d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/BankPosCloudAppServiceImpl.java
@@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * BPC商户接口Service业务层处理
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 @Slf4j
@@ -36,6 +36,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> processConsumerScan(String txnAmt, String merTradeNo, String scanCode, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(txnAmt)) {
@@ -75,6 +76,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> createMerchantScanOrder(String txnAmt, String merTradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(txnAmt)) {
@@ -109,6 +111,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> queryPaymentOrder(String merTradeNo, String tradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(merTradeNo)) {
@@ -143,6 +146,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> closeOrder(String merTradeNo, String tradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(merTradeNo)) {
@@ -179,6 +183,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> applyForRefund(String txnAmt, String vfTradeNo, String merTradeNo, String tradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(txnAmt)) {
@@ -223,6 +228,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> queryRefundOrder(String vfTradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(vfTradeNo)) {
@@ -254,6 +260,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> reversePayment(String txnAmt, String vfTradeNo, String merTradeNo, String tradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(txnAmt)) {
@@ -298,6 +305,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> queryReversalOrder(String merTradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(merTradeNo)) {
@@ -328,6 +336,7 @@ public class BankPosCloudAppServiceImpl implements IBankPosCloudAppService {
      * @param posNo 设备终端编号
      * @return 结果
      */
+    @Override
     public R<?> processCardRefund(String txnAmt, String pan, String vfTradeNo, String posNo) {
         // 参数验证
         if (StringUtils.isEmpty(txnAmt)) {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
index af560706..f87507ab 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/appservice/impl/FoodborneAcquisitionAppServiceImpl.java
@@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * 食源性疾病病例数据智能采集Service业务层处理
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-10
  */
 @Slf4j
@@ -74,7 +74,7 @@ public class FoodborneAcquisitionAppServiceImpl implements IFoodborneAcquisition
         // 定义诊断列表参数
         List<String> diagnosisNameList = new ArrayList<>();
 
-        // TODO:郭睿 等待从doc_statistics表取主诉诊断
+        // TODO: 等待从doc_statistics表取主诉诊断
 
         // 查询就诊诊断内容列表
         List<String> encounterDiagnosisConditionNameList =
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java
index 3d4bd70c..6a2169e1 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/controller/FoodborneAcquisitionAppController.java
@@ -12,7 +12,7 @@ import com.openhis.web.externalintegration.appservice.IFoodborneAcquisitionAppSe
 /**
  * 食源性疾病病例数据智能采集Controller
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-10
  */
 @RestController
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java
index 4e1fab55..ccc89d2e 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcDataElementDto.java
@@ -9,7 +9,7 @@ import lombok.Data;
 /**
  * 【BPC】数据元
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
index a516fb57..dae6eec3 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcPaymentScanNotifyDto.java
@@ -9,7 +9,7 @@ import lombok.Data;
 /**
  * 【BPC】主扫支付结果通知
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java
index a59fe041..bd0334be 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionRequestDto.java
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 /**
  * 【BPC】交易请求
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java
index 2b35902b..a779ce69 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/BpcTransactionResponseDto.java
@@ -9,7 +9,7 @@ import lombok.Data;
 /**
  * 【BPC】交易回应
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
index c7e99d4f..6a3ef9a7 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/dto/FaSimplediseaseAddNopwParam.java
@@ -5,7 +5,7 @@ import lombok.Data;
 /**
  * 【食源性】跳转页面所需参数
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-10
  */
 @Data
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java
index ef09f8f0..bfc9e206 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayType.java
@@ -3,7 +3,7 @@ package com.openhis.web.externalintegration.enums;
 /**
  * 【BPC】支付方式
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public enum BpcPayType {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java
index 85246531..ef791b12 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcPayerIdType.java
@@ -3,7 +3,7 @@ package com.openhis.web.externalintegration.enums;
 /**
  * 【BPC】付款人身份证件类型
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public enum BpcPayerIdType {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java
index aa3b8b85..8e8a26d9 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRealNameAuthFlag.java
@@ -3,7 +3,7 @@ package com.openhis.web.externalintegration.enums;
 /**
  * 【BPC】实名认证标志
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public enum BpcRealNameAuthFlag {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java
index 4be7f614..0e6bdbb8 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcRespType.java
@@ -3,7 +3,7 @@ package com.openhis.web.externalintegration.enums;
 /**
  * 【BPC】交易返回应答码
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public enum BpcRespType {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java
index 23c2705a..f0ef1329 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/enums/BpcTranType.java
@@ -3,7 +3,7 @@ package com.openhis.web.externalintegration.enums;
 /**
  * 【BPC】交易类型
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public enum BpcTranType {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
index 290e206e..3d646f61 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/mapper/FoodborneAcquisitionAppMapper.java
@@ -10,7 +10,7 @@ import com.openhis.web.externalintegration.dto.FaSimplediseaseAddNopwParam;
 /**
  * 食源性疾病病例数据智能采集Mapper
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-10
  */
 @Repository
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java
index c03ced6d..3f37415d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcHttpUtil.java
@@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * 【BPC】HTTP请求共通方法
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 @Slf4j
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java
index ef3462f1..ff764211 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/externalintegration/utils/BpcTraceNoGenerator.java
@@ -5,7 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * 【BPC】终端流水号生成器
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-10-16
  */
 public class BpcTraceNoGenerator {
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
index c6070867..7cc2b908 100644
--- 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
@@ -33,6 +33,7 @@ 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 com.openhis.yb.service.YbManager;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -79,6 +80,9 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
     @Resource
     IPatientService iPatientService;
 
+    @Resource
+    private YbManager ybManager;
+
     /**
      * 门诊医生开住院申请
      *
@@ -96,7 +100,7 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
         // 获取执行科室
         LambdaQueryWrapper<Encounter> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Encounter::getAmbEncounterId, ambEncounterId);
-        if (iEncounterService.list(queryWrapper).size() > 0) {
+        if (!iEncounterService.list(queryWrapper).isEmpty()) {
             return R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null));
         }
 
@@ -447,7 +451,8 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
             zYEncounterDiagnosis.setIptDiseTypeCode(YbIptDiseTypeCode.ADMISSION_DIAGNOSIS.getValue()); // 住院患者疾病诊断类型代码
             iEncounterDiagnosisService.save(zYEncounterDiagnosis);
         }
-
+        // 调用医保入院办理
+        ybManager.hospitalAdmission();
     }
 
 }
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
index 83adb7ed..5a02b65b 100644
--- 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
@@ -25,7 +25,7 @@ public interface AdvancePaymentManageAppMapper {
      * @param wardEnum 病区
      * @param houseEnum 病房
      * @param bedEnum 床位
-     * @param encounterLocationStatus 使用状态
+     * @param encounterActivityStatus 使用状态
      * @param status1 待结算
      * @param status2 已收费
      * @param status3 已退费
@@ -35,7 +35,7 @@ public interface AdvancePaymentManageAppMapper {
      */
     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("bedEnum") Integer bedEnum, @Param("encounterActivityStatus") Integer encounterActivityStatus,
         @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);
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
index 06e9c808..a353f97c 100644
--- 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
@@ -17,6 +17,13 @@ import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientInfoDto;
  */
 public interface IATDManageAppService {
 
+    /**
+     * 入出转管理页面初始化
+     *
+     * @return 初始化信息
+     */
+    R<?> atdManageInit();
+
     /**
      * 入院患者分页列表
      *
@@ -49,11 +56,12 @@ public interface IATDManageAppService {
     R<?> getAdmissionPatientInfo(Long encounterId);
 
     /**
-     * 入出转管理页面初始化
+     * 住院患者待处理信息列表
      *
-     * @return 初始化信息
+     * @param encounterId 住院id
+     * @return 待处理信息列表
      */
-    R<?> atdManageInit();
+    R<?> getInPatientPendingList(Long encounterId);
 
     /**
      * 入科床位分配
@@ -62,4 +70,20 @@ public interface IATDManageAppService {
      * @return 结果
      */
     R<?> admissionBedAssignment(AdmissionPatientInfoDto admissionPatientInfoDto);
+
+    /**
+     * 转科
+     *
+     * @param encounterId 住院id
+     * @return 结果
+     */
+    R<?> transferDepartment(Long encounterId);
+
+    /**
+     * 出院
+     *
+     * @param encounterId 住院id
+     * @return 结果
+     */
+    R<?> hospitalDischarge(Long encounterId);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
index 6d581d5c..1ff28a3e 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IMedicineSummaryAppService.java
@@ -5,8 +5,8 @@ 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.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
 
 /**
  * 住院领药 应用实现接口
@@ -17,48 +17,45 @@ import com.openhis.web.inhospitalnursestation.dto.InpatientMedicineSearchParam;
 public interface IMedicineSummaryAppService {
 
     /**
-     * 分页查询在科病人列表
+     * 查询发药单信息
      *
-     * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
+     * @param dispenseFormSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 发药病人列表
+     * @param request 请求
+     * @return 发药单信息
      */
-    R<?> getEncounterInfoListPage(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
-        Integer pageSize, HttpServletRequest request);
+    R<?> getMedicineDispenseFormPage(DispenseFormSearchParam dispenseFormSearchParam, Integer pageNo, Integer pageSize,
+        HttpServletRequest request);
 
     /**
-     * 查询医嘱列表
+     * 查询药品汇总单
      *
-     * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
+     * @param dispenseFormSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 处方单列表
+     * @param searchKey 模糊查询关键字
+     * @param request 请求
+     * @return 药品汇总单
      */
-    R<?> getPrescriptionInfo(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
-        Integer pageSize, HttpServletRequest request);
+    R<?> getMedicineSummaryFormPage(DispenseFormSearchParam dispenseFormSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
 
     /**
-     * 显示汇总发药单（生成之前的确认，此刻还没生成汇总单）
+     * 查询药品汇总单详情
      *
-     * @param searchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @return 处理结果
+     * @param summaryNo 汇总单号
+     * @return 药品汇总单详情
      */
-    R<?> showMedicineSummary(List<InpatientMedicineSearchParam> searchParam, Integer pageNo, Integer pageSize);
+    R<?> getMedicineSummaryFormDetail(String summaryNo);
 
     /**
      * 生成汇总发药单
      *
-     * @param prescriptionInfo 汇总发药单
+     * @param medicineSummaryParamList 汇总发申请参数
      * @return 处理结果
      */
-    R<?> medicineSummary(List<InpatientMedicinePrescriptionInfoDto> prescriptionInfo);
+    R<?> medicineSummary(List<MedicineSummaryParam> medicineSummaryParamList);
 
     /**
      * 校验库存
@@ -68,4 +65,12 @@ public interface IMedicineSummaryAppService {
      * @return 处理结果
      */
     R<?> checkInventoryItem(List<Long> devDispenseId, List<Long> medDispenseId);
+
+    /**
+     * 取消汇总
+     *
+     * @param summaryNo 汇总单号
+     * @return 处理结果
+     */
+    R<?> cancelSummary(String summaryNo);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java
new file mode 100644
index 00000000..891d2dec
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/INurseBillingAppService.java
@@ -0,0 +1,39 @@
+package com.openhis.web.inhospitalnursestation.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+
+public interface INurseBillingAppService {
+    /*
+     * 住院护士 划价添加
+     * @return
+     */
+    public R<?> addInNurseBilling(RegAdviceSaveParam regAdviceSaveParam);
+    /*
+     * 住院护士 划价列表 根据护士encounterId查询
+     * @return
+     */
+    public  R<?> getBillingListByEncounterId();
+    /*
+     * 住院护士撤销划价
+     * @return
+     */
+    public  R<?> deleteInNurseBilling();
+    /*
+     * 医嘱计费添加 诊疗 耗材
+     */
+    public  R<?> addOrderBilling();
+    /*
+     * 医嘱计费删除 诊疗 耗材
+     */
+    public  R<?> deleteOrderBilling();
+    /*
+     * 医嘱计费修改 诊疗 耗材
+     */
+    public  R<?> updateOrderBilling();
+    /*
+     根据医嘱id查询已计费的 耗材列表
+     * @return
+     */
+    public  R<?> getOrderBillingByRequestId();
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
new file mode 100644
index 00000000..075bbdd2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IOrgDeviceStockTakeAppService.java
@@ -0,0 +1,40 @@
+package com.openhis.web.inhospitalnursestation.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 科室耗材盘点 应用实现接口
+ *
+ * @author wuyan
+ * @date 2025/11/05
+ */
+public interface IOrgDeviceStockTakeAppService {
+
+    /**
+     * 查询科室耗材汇总
+     *
+     * @param orgDeviceSummaryParam 查询条件
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求
+     * @return 科室耗材汇总单
+     */
+    R<?> getOrgDeviceSummaryFromPage(OrgDeviceSummaryParam orgDeviceSummaryParam, String startTime, String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, String searchKey,
+        HttpServletRequest request);
+
+    /**
+     * 科室耗材汇总
+     *
+     * @return 科室耗材汇总单
+     */
+    R<?> orgDeviceSummary(OrgDeviceSummaryParam orgDeviceSummaryParam);
+}
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
index 2681baaf..ae052730 100644
--- 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
@@ -182,6 +182,22 @@ public class ATDManageAppServiceImpl implements IATDManageAppService {
         return R.ok(admissionPatientInfoDto);
     }
 
+    /**
+     * 住院患者待处理信息列表
+     *
+     * @param encounterId 住院id
+     * @return 待处理信息列表
+     */
+    @Override
+    public R<?> getInPatientPendingList(Long encounterId) {
+//        List<InpatientAdviceDto> inPatientPendingList =
+//            atdManageAppMapper.selectInPatientPendingList(encounterId, EncounterActivityStatus.ACTIVE.getValue(),
+//                LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(),
+//                ParticipantType.PRIMARY_NURSE.getCode(), ParticipantType.ATTENDING_DOCTOR.getCode(),
+//                ParticipantType.ADMITTING_DOCTOR.getCode());
+        return null;
+    }
+
     /**
      * 入科床位分配
      *
@@ -329,4 +345,26 @@ public class ATDManageAppServiceImpl implements IATDManageAppService {
         }
         return R.ok("床位分配成功");
     }
+
+    /**
+     * 转科
+     *
+     * @param encounterId 住院id
+     * @return 结果
+     */
+    @Override
+    public R<?> transferDepartment(Long encounterId) {
+        return null;
+    }
+
+    /**
+     * 出院
+     *
+     * @param encounterId 住院id
+     * @return 结果
+     */
+    @Override
+    public R<?> hospitalDischarge(Long encounterId) {
+        return null;
+    }
 }
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
index f692f8e7..a3de5ab4 100644
--- 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
@@ -21,9 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.core.common.exception.ServiceException;
+import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
 import com.openhis.administration.domain.ChargeItem;
 import com.openhis.administration.service.IChargeItemService;
@@ -44,17 +43,20 @@ import com.openhis.medication.service.IMedicationRequestService;
 import com.openhis.web.common.dto.PerformInfoDto;
 import com.openhis.web.common.dto.PerformRecordDto;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.openhis.web.doctorstation.dto.ActivityBindDeviceDetailDto;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
+import com.openhis.web.doctorstation.dto.AdviceInventoryDto;
 import com.openhis.web.doctorstation.dto.AdvicePriceDto;
+import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
 import com.openhis.web.inhospitalnursestation.appservice.IAdviceProcessAppService;
 import com.openhis.web.inhospitalnursestation.dto.*;
 import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
 import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
 import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.workflow.domain.DeviceRequest;
 import com.openhis.workflow.domain.ServiceRequest;
-import com.openhis.workflow.service.IDeviceDispenseService;
-import com.openhis.workflow.service.IServiceRequestService;
+import com.openhis.workflow.service.*;
 
 /**
  * 护士站医嘱处理实现类
@@ -65,9 +67,15 @@ import com.openhis.workflow.service.IServiceRequestService;
 @Service
 public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
 
+    @Resource
+    AssignSeqUtil assignSeqUtil;
+
     @Resource
     private AdviceProcessAppMapper adviceProcessAppMapper;
 
+    @Resource
+    private DoctorStationAdviceAppMapper doctorStationAdviceAppMapper;
+
     @Resource
     private IProcedureService procedureService;
 
@@ -86,6 +94,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
     @Resource
     private IDeviceDispenseService deviceDispenseService;
 
+    @Resource
+    private IDeviceRequestService deviceRequestService;
+
     @Resource
     private IEncounterService encounterService;
 
@@ -99,7 +110,13 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
     private AdviceUtils adviceUtils;
 
     @Resource
-    private IDoctorStationAdviceAppService iDoctorStationAdviceAppService;
+    private IDoctorStationAdviceAppService doctorStationAdviceAppService;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private ISupplyDeliveryService supplyDeliveryService;
 
     /**
      * 住院患者分页列表
@@ -156,10 +173,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         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);
+        QueryWrapper<InpatientAdviceParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
 
         // 手动拼接住院患者id条件
         if (encounterIds != null && !encounterIds.isEmpty()) {
@@ -167,7 +182,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 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,
@@ -408,39 +423,41 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
             .filter(x -> x.getTherapyEnum().equals(TherapyTimeType.TEMPORARY.getValue()))
             .map(AdviceExecuteDetailParam::getProcedureId).distinct().toList();
 
+        // 合并长期和临时的执行记录
+        List<Long> procedureIdList = new ArrayList<>(longProcIdList);
+        procedureIdList.addAll(tempProcIdList);
+        // 查询执行记录
+        List<Procedure> procedureList = procedureService.listByIds(procedureIdList);
+        Map<Long, Long> procedureIdMap = new HashMap<>();
+        if (procedureList != null && !procedureList.isEmpty()) {
+            for (Procedure procedure : procedureList) {
+                // 根据执行记录新增取消执行记录
+                Long newProcedureId = procedureService.addProcedureRecord(procedure.getEncounterId(),
+                    procedure.getPatientId(), procedure.getRequestId(), procedure.getRequestTable(), EventStatus.CANCEL,
+                    ProcedureCategory.INPATIENT_ADVICE, null, procedure.getOccurrenceTime(), procedure.getGroupId(),
+                    procedure.getId());
+                // 将旧的执行Id和新的执行Id存入map
+                procedureIdMap.put(procedure.getId(), newProcedureId);
+            }
+        }
         // 分别处理长期和临时的医嘱
         // 长期已发放药品
         List<MedicationDispense> longMedDispensedList = new ArrayList<>();
         // 长期未发放药品
         List<MedicationDispense> longMedUndispenseList = new ArrayList<>();
-        // 长期已发放耗材
-        List<DeviceDispense> longDevDispensedList = new ArrayList<>();
-        // 长期未发放耗材
-        List<DeviceDispense> longDevUndispenseList = new ArrayList<>();
         // 处理长期医嘱
         if (!longProcIdList.isEmpty()) {
             // 长期药品
             List<MedicationDispense> longMedDispenseList =
                 medicationDispenseService.getMedDispenseByProcedureId(longProcIdList);
-            // 长期耗材
-            List<DeviceDispense> longDevDispenseList =
-                deviceDispenseService.getDevDispenseByProcedureId(longProcIdList);
             // 分离已发药发药单和未发药发药单
             for (MedicationDispense medicationDispense : longMedDispenseList) {
-                if (DispenseStatus.COMPLETED.getValue().equals(medicationDispense.getDispenseEnum())) {
+                if (DispenseStatus.COMPLETED.getValue().equals(medicationDispense.getStatusEnum())) {
                     longMedDispensedList.add(medicationDispense);
-                } else if (DispenseStatus.PREPARATION.getValue().equals(medicationDispense.getDispenseEnum())) {
+                } else if (DispenseStatus.PREPARATION.getValue().equals(medicationDispense.getStatusEnum())) {
                     longMedUndispenseList.add(medicationDispense);
                 }
             }
-            // 分离已发耗材单和未发耗材单
-            for (DeviceDispense deviceDispense : longDevDispenseList) {
-                if (DispenseStatus.COMPLETED.getValue().equals(deviceDispense.getStatusEnum())) {
-                    longDevDispensedList.add(deviceDispense);
-                } else if (DispenseStatus.PREPARATION.getValue().equals(deviceDispense.getStatusEnum())) {
-                    longDevUndispenseList.add(deviceDispense);
-                }
-            }
             // 查询账单
             List<ChargeItem> chargeItemList = chargeItemService.getChargeItemByProcedureId(longProcIdList);
             if (chargeItemList != null && !chargeItemList.isEmpty()) {
@@ -455,34 +472,19 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         List<MedicationDispense> tempMedDispensedList = new ArrayList<>();
         // 临时未发放药品
         List<MedicationDispense> tempMedUndispenseList = new ArrayList<>();
-        // 临时已发放耗材
-        List<DeviceDispense> tempDevDispensedList = new ArrayList<>();
-        // 临时未发放耗材
-        List<DeviceDispense> tempDevUndispenseList = new ArrayList<>();
         // 处理临时医嘱
         if (!tempProcIdList.isEmpty()) {
-            // 长期药品
+            // 临时药品
             List<MedicationDispense> tempMedDispenseList =
                 medicationDispenseService.getMedDispenseByProcedureId(tempProcIdList);
-            // 长期耗材
-            List<DeviceDispense> tempDevDispenseList =
-                deviceDispenseService.getDevDispenseByProcedureId(tempProcIdList);
             // 分离已发药发药单和未发药发药单
             for (MedicationDispense medicationDispense : tempMedDispenseList) {
-                if (DispenseStatus.COMPLETED.getValue().equals(medicationDispense.getDispenseEnum())) {
+                if (DispenseStatus.COMPLETED.getValue().equals(medicationDispense.getStatusEnum())) {
                     tempMedDispensedList.add(medicationDispense);
-                } else if (DispenseStatus.PREPARATION.getValue().equals(medicationDispense.getDispenseEnum())) {
+                } else if (DispenseStatus.PREPARATION.getValue().equals(medicationDispense.getStatusEnum())) {
                     tempMedUndispenseList.add(medicationDispense);
                 }
             }
-            // 分离已发耗材单和未发耗材单
-            for (DeviceDispense deviceDispense : tempDevDispenseList) {
-                if (DispenseStatus.COMPLETED.getValue().equals(deviceDispense.getStatusEnum())) {
-                    tempDevDispensedList.add(deviceDispense);
-                } else if (DispenseStatus.PREPARATION.getValue().equals(deviceDispense.getStatusEnum())) {
-                    tempDevUndispenseList.add(deviceDispense);
-                }
-            }
             // 查询账单
             List<ChargeItem> chargeItemList = chargeItemService.getChargeItemByProcedureId(tempProcIdList);
             if (chargeItemList != null && !chargeItemList.isEmpty()) {
@@ -491,27 +493,152 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                     .updatePlannedChargeStatus(chargeItemList.stream().map(ChargeItem::getProcedureId).toList());
             }
         }
-        // 统一处理已发放药品或耗材
-        List<MedicationDispense> medDispensedList = new ArrayList<>(tempMedDispensedList);
-        medDispensedList.addAll(longMedDispensedList);
-        // 统一处理已发放药品或耗材
-        List<DeviceDispense> devDispensedList = new ArrayList<>(tempDevDispensedList);
-        devDispensedList.addAll(longDevDispensedList);
-        // 合并长期和临时的执行记录
-        List<Long> procedureIdList = new ArrayList<>(longProcIdList);
-        procedureIdList.addAll(tempProcIdList);
-        // 查询执行记录
-        List<Procedure> procedureList = procedureService.listByIds(procedureIdList);
-        if (procedureList != null && !procedureList.isEmpty()) {
-            for (Procedure procedure : procedureList) {
-                // 根据执行记录新增取消执行记录
-                procedureService.addProcedureRecord(procedure.getEncounterId(), procedure.getPatientId(),
-                    procedure.getRequestId(), procedure.getRequestTable(), EventStatus.CANCEL,
-                    ProcedureCategory.INPATIENT_ADVICE, null, procedure.getOccurrenceTime(), procedure.getGroupId(),
-                    procedure.getId());
+        // 处理长期已发放的药品
+        if (!longMedDispensedList.isEmpty()) {
+            // 生成退药单
+            this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap);
+        }
+        // 处理临时已发放药品
+        if (!tempMedDispensedList.isEmpty()) {
+            // 生成退药单
+            this.creatRefundMedicationList(tempMedDispensedList, procedureIdMap);
+            // 药品退药请求状态变更(待退药)
+            medicationRequestService.updateCancelledStatusBatch(
+                tempMedDispensedList.stream().map(MedicationDispense::getMedReqId).toList(), null, null);
+        }
+        // 未发放药品需先判断是否申请汇总
+        List<MedicationDispense> medUndispenseList = new ArrayList<>(tempMedUndispenseList);
+        medUndispenseList.addAll(longMedUndispenseList);
+        // 重新生成汇总发药单
+        if (!medUndispenseList.isEmpty()) {
+            // 查询所有汇总单号
+            List<String> summaryNoList =
+                medUndispenseList.stream().filter(x -> x.getSummaryNo() != null && !x.getSummaryNo().isEmpty())
+                    .map(MedicationDispense::getSummaryNo).distinct().toList();
+            if (!summaryNoList.isEmpty()) {
+                // 查询所有被汇总的药品发放
+                List<MedicationDispense> medSummaryList =
+                    medicationDispenseService.getMedDispenseBySummaryNo(summaryNoList);
+                // 被汇总的发药单
+                Map<String, List<MedicationDispense>> medSummaryMap =
+                    medSummaryList.stream().filter(x -> x.getSummaryNo() != null)
+                        .collect(Collectors.groupingBy(MedicationDispense::getSummaryNo));
+                // 被取消汇总的发药单
+                Map<String, List<MedicationDispense>> medSummaryCancelMap =
+                    medUndispenseList.stream().filter(x -> x.getSummaryNo() != null)
+                        .collect(Collectors.groupingBy(MedicationDispense::getSummaryNo));
+                // 过滤掉被取消汇总的发药单,重新做成汇总单
+                Map<String, List<MedicationDispense>> reSummaryMap = new HashMap<>();
+                // 遍历所有被汇总的发药单
+                for (Map.Entry<String, List<MedicationDispense>> entry : medSummaryMap.entrySet()) {
+                    String summaryNo = entry.getKey();
+                    List<MedicationDispense> allDispenses = entry.getValue();
+                    // 检查是否存在对应的取消汇总记录
+                    if (medSummaryCancelMap.containsKey(summaryNo)) {
+                        // 如果存在取消记录，需要过滤掉被取消的发药单
+                        List<MedicationDispense> cancelDispenses = medSummaryCancelMap.get(summaryNo);
+                        // 创建被取消的发药单ID集合，便于快速查找
+                        Set<Long> cancelIds =
+                            cancelDispenses.stream().map(MedicationDispense::getId).collect(Collectors.toSet());
+                        // 过滤出未被取消的发药单
+                        List<MedicationDispense> remainingDispenses = allDispenses.stream()
+                            .filter(dispense -> !cancelIds.contains(dispense.getId())).collect(Collectors.toList());
+                        // 只有当还有剩余的发药单时才加入结果
+                        if (!remainingDispenses.isEmpty()) {
+                            reSummaryMap.put(summaryNo, remainingDispenses);
+                        }
+                    }
+                }
+                if (!reSummaryMap.isEmpty()) {
+                    for (Map.Entry<String, List<MedicationDispense>> entry : reSummaryMap.entrySet()) {
+                        List<MedicationDispense> medicationDispenses = entry.getValue();
+                        // 查询药品信息
+                        List<MedicationDefinition> medicationDefinitions = medicationDefinitionService
+                            .listByIds(medicationDispenses.stream().map(MedicationDispense::getMedicationId).toList());
+                        // 汇总单据号
+                        String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICINE_SUMMARY_NO.getPrefix(), 4);
+                        // 根据相同批号的同一药品进行汇总
+                        Map<String, List<MedicationDispense>> medicationSummaryInfoMap =
+                            medicationDispenses.stream().collect(Collectors
+                                .groupingBy(x -> x.getMedicationId() + CommonConstants.Common.DASH + x.getLotNumber()));
+                        for (Map.Entry<String,
+                            List<MedicationDispense>> medicationSummaryInfoList : medicationSummaryInfoMap.entrySet()) {
+                            List<MedicationDispense> medicationSummaryList = medicationSummaryInfoList.getValue();
+                            MedicationDispense medicationDispense = medicationSummaryList.get(0);
+                            Long medicationId = medicationDispense.getMedicationId();
+                            Long locationId = medicationDispense.getLocationId();
+                            String lotNumber = medicationDispense.getLotNumber();
+                            Long patientId = medicationDispense.getPatientId();
+                            // 拆零比例
+                            BigDecimal partPercent = BigDecimal.ONE;
+                            // 最小单位
+                            String minUnitCode = null;
+                            // 单位
+                            String unitCode = null;
+                            // 根据药品id获取对应的药品信息
+                            Optional<MedicationDefinition> medicationDefinition =
+                                medicationDefinitions.stream().filter(x -> x.getId().equals(medicationId)).findFirst();
+                            if (medicationDefinition.isPresent()) {
+                                partPercent = medicationDefinition.get().getPartPercent();
+                                minUnitCode = medicationDefinition.get().getMinUnitCode();
+                                unitCode = medicationDefinition.get().getUnitCode();
+                            }
+                            if (minUnitCode == null || unitCode == null || partPercent == null) {
+                                throw new ServiceException("药品信息有误,请联系管理员");
+                            }
+                            // 最小单位数量
+                            BigDecimal minQuantity = BigDecimal.ZERO;
+                            for (MedicationDispense medicationSummaryInfo : medicationSummaryList) {
+                                BigDecimal quantity = medicationSummaryInfo.getQuantity();
+                                if (unitCode.equals(medicationDispense.getUnitCode())) {
+                                    // 转换为小单位进行累加
+                                    quantity = medicationSummaryInfo.getQuantity().multiply(partPercent);
+                                }
+                                minQuantity = minQuantity.add(quantity);
+                            }
+                            Long supplyRequestId = supplyRequestService.createSummarySupplyRequest(medicationId,
+                                locationId, lotNumber, patientId, minQuantity, minUnitCode, null, null, busNo);
+                            supplyDeliveryService.createSummarySupplyDelivery(medicationId, lotNumber, patientId,
+                                minQuantity, minUnitCode, null, supplyRequestId);
+                        }
+                    }
+                    // 删除原汇总单
+                    List<String> delSummaryNoList = reSummaryMap.keySet().stream().toList();
+                    // 取消汇总申请（软删除）
+                    List<Long> requestIdList = supplyRequestService.cancelSummarySupplyRequest(delSummaryNoList);
+                    // 软删除汇总发放
+                    supplyDeliveryService.deleteSupplyDeliveryByReqId(requestIdList);
+                    // 取消药品汇总
+                    medicationDispenseService.cancelMedicationSummary(delSummaryNoList);
+                }
             }
         }
-        return R.ok("取消执行成功");
+        // 处理临时未发放的药品
+        if (!tempMedUndispenseList.isEmpty()) {
+            // 排除已汇总的药品
+            List<MedicationDispense> medicationDispenseList =
+                tempMedUndispenseList.stream().filter(x -> x.getSummaryNo() == null).toList();
+            // 更新状态为草稿
+            medicationDispenseService.updateDispenseStatus(
+                medicationDispenseList.stream().map(MedicationDispense::getId).toList(),
+                DispenseStatus.DRAFT.getValue());
+        }
+        // 处理长期未发的药品
+        if (!longMedUndispenseList.isEmpty()) {
+            // 排除已汇总的药品
+            List<MedicationDispense> medicationDispenseList =
+                tempMedUndispenseList.stream().filter(x -> x.getSummaryNo() == null).toList();
+            medicationDispenseService
+                .removeByIds(medicationDispenseList.stream().map(MedicationDispense::getId).toList());
+        }
+        // 根据执行记录查询生成的耗材发放单
+        List<DeviceDispense> deviceDispenseList = deviceDispenseService.getDevDispenseByProcedureId(procedureIdList);
+        if (deviceDispenseList != null && !deviceDispenseList.isEmpty()) {
+            // 软删除对应的耗材申请，耗材发放
+            deviceDispenseService.removeByIds(deviceDispenseList.stream().map(DeviceDispense::getId).toList());
+            deviceRequestService.removeByIds(deviceDispenseList.stream().map(DeviceDispense::getDeviceReqId).toList());
+        }
+        return R.ok("取消执行成功,相关汇总领药单已重新生成");
     }
 
     /**
@@ -522,11 +649,29 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
      */
     @Override
     public R<?> adviceVoid(AdviceExecuteParam adviceExecuteParam) {
-        // 长期临时都可以不执行，长期不执行的是某一时间点，也可以不执行这一整个医嘱（更新serviceRequest状态为7）
-        // 已执行的时间点不能不执行，需要先取消
-        // 增加不执行记录
-        // 不执行的医嘱还可以再执行（暂时不做限制）
-        return null;
+        List<AdviceExecuteDetailParam> adviceExecuteDetailList = adviceExecuteParam.getAdviceExecuteDetailList();
+
+        // 判断是否有空的pID
+        for (AdviceExecuteDetailParam adviceExecuteDetailParam : adviceExecuteDetailList)
+            if (adviceExecuteDetailParam.getProcedureId() != null)
+                return R.fail("执行失败");
+
+        for (AdviceExecuteDetailParam adviceExecuteDetailParam : adviceExecuteDetailList) {
+            for (String executeTime : adviceExecuteDetailParam.getExecuteTimes()) {
+                // 生成执行记录
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                // 转换为 LocalDateTime
+                LocalDateTime localDateTime = LocalDateTime.parse(executeTime, formatter);
+                // 转换为 Date
+                Date exeDate = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+                // 根据执行记录新增不执行记录
+                procedureService.addProcedureRecord(adviceExecuteDetailParam.getEncounterId(),
+                    adviceExecuteDetailParam.getPatientId(), adviceExecuteDetailParam.getRequestId(),
+                    adviceExecuteDetailParam.getAdviceTable(), EventStatus.STOPPED, ProcedureCategory.INPATIENT_ADVICE,
+                    null, exeDate, adviceExecuteDetailParam.getGroupId(), null);
+            }
+        }
+        return R.ok("不执行成功");
     }
 
     /**
@@ -537,15 +682,15 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
     private void exeMedication(List<MedicationRequestUseExe> medUseExeList) {
         // 长期医嘱
         List<MedicationRequestUseExe> longMedication = medUseExeList.stream()
-            .filter(e -> TherapyTimeType.LONG_TERM.getValue().equals(e.getTherapyEnum())).collect(Collectors.toList());
+            .filter(e -> TherapyTimeType.LONG_TERM.getValue().equals(e.getTherapyEnum())).toList();
         // 临时医嘱
         List<MedicationRequestUseExe> tempMedication = medUseExeList.stream()
-            .filter(e -> TherapyTimeType.TEMPORARY.getValue().equals(e.getTherapyEnum())).collect(Collectors.toList());
+            .filter(e -> TherapyTimeType.TEMPORARY.getValue().equals(e.getTherapyEnum())).toList();
         // 药品定义id集合
         List<Long> medicationDefinitionIdList =
             medUseExeList.stream().map(MedicationRequestUseExe::getMedicationId).collect(Collectors.toList());
         // 医嘱详细信息
-        List<AdviceBaseDto> medicationInfos = iDoctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
+        List<AdviceBaseDto> medicationInfos = doctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
             medicationDefinitionIdList, 0L, 1, 500, Whether.NO.getValue(), List.of(1)).getRecords();
 
         // 当前时间
@@ -576,12 +721,14 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                     ProcedureCategory.INPATIENT_ADVICE, null, exeDate, longMedicationRequest.getGroupId(), null);
 
                 // 生成药品发放
-                medicationDispenseService.generateMedicationDispense(longMedicationRequest, procedureId);
+                Long dispenseId =
+                    medicationDispenseService.generateMedicationDispense(longMedicationRequest, procedureId, exeDate);
 
                 // 生成账单
                 chargeItem = new ChargeItem();
                 chargeItem.setStatusEnum(ChargeItemStatus.BILLABLE.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(longMedicationRequest.getBusNo()));
+                chargeItem.setGenerateSourceEnum(GenerateSource.ORDER_EXECUTE.getValue()); // 生成来源
                 chargeItem.setPrescriptionNo(longMedicationRequest.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(longMedicationRequest.getPatientId()); // 患者
                 chargeItem.setContextEnum(ChargeItemContext.MEDICATION.getValue()); // 类型
@@ -596,7 +743,10 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 chargeItem.setAccountId(medicationRequestUseExe.getAccountId());// 关联账户ID
                 chargeItem.setConditionId(longMedicationRequest.getConditionId()); // 诊断id
                 chargeItem.setEncounterDiagnosisId(longMedicationRequest.getEncounterDiagnosisId()); // 就诊诊断id
-                chargeItem.setProcedureId(procedureId);
+                chargeItem.setProcedureId(procedureId); // 执行id
+                chargeItem.setDispenseTable(CommonConstants.TableName.MED_MEDICATION_DISPENSE); // 发放表名
+                // chargeItem.setDispenseId(dispenseId); // 发放ID
+
                 // ------------------------------ 匹配定价信息
                 // 根据 medicationId 查找对应的医嘱信息
                 MedicationRequest finalLongMedicationRequest = longMedicationRequest;
@@ -604,7 +754,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                     .filter(
                         advice -> finalLongMedicationRequest.getMedicationId().equals(advice.getAdviceDefinitionId()))
                     .findFirst();
-                if (!matchedAdvice.isPresent()) {
+                if (matchedAdvice.isEmpty()) {
                     throw new RuntimeException(
                         "未找到对应的医嘱信息，medicationId: " + finalLongMedicationRequest.getMedicationId());
                 }
@@ -616,18 +766,18 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 Optional<AdvicePriceDto> matchedPrice = advice.getPriceList().stream()
                     .filter(price -> finalLongMedicationRequest.getLotNumber().equals(price.getConditionValue()))
                     .findFirst();
-                if (!matchedPrice.isPresent()) {
+                if (matchedPrice.isEmpty()) {
                     throw new RuntimeException("未找到匹配的定价信息，lotNumber: " + finalLongMedicationRequest.getLotNumber());
                 }
                 AdvicePriceDto priceDto = matchedPrice.get();
                 // 计算价格
                 BigDecimal price;
                 if (finalLongMedicationRequest.getUnitCode().equals(priceDto.getUnitCode())) {
-                    // unitCode 匹配，直接取 price
+                    // (大单位)unitCode 匹配，直接取 price
                     price = priceDto.getPrice();
                 } else {
-                    // unitCode 不匹配，计算 price / partPercent
-                    price = priceDto.getPrice().divide(partPercent, RoundingMode.HALF_UP);
+                    // (小单位)unitCode 不匹配，计算 price / partPercent
+                    price = priceDto.getPrice().divide(partPercent, 6, RoundingMode.HALF_UP);
                 }
                 chargeItem.setDefinitionId(priceDto.getDefinitionId()); // 费用定价ID
                 chargeItem.setDefDetailId(priceDto.getDefinitionDetailId()); // 定价子表主键
@@ -635,7 +785,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 chargeItem.setQuantityUnit(longMedicationRequest.getUnitCode()); // 单位
                 chargeItem.setUnitPrice(price); // 单价
                 chargeItem.setTotalPrice(
-                    longMedicationRequest.getQuantity().multiply(price).setScale(4, RoundingMode.HALF_UP)); // 总价
+                    longMedicationRequest.getQuantity().multiply(price).setScale(6, RoundingMode.HALF_UP)); // 总价
 
                 chargeItemService.saveOrUpdate(chargeItem);
             }
@@ -683,15 +833,15 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
     private void exeActivity(List<ServiceRequestUseExe> actUseExeList) {
         // 长期医嘱
         List<ServiceRequestUseExe> longActivity = actUseExeList.stream()
-            .filter(e -> TherapyTimeType.LONG_TERM.getValue().equals(e.getTherapyEnum())).collect(Collectors.toList());
+            .filter(e -> TherapyTimeType.LONG_TERM.getValue().equals(e.getTherapyEnum())).toList();
         // 临时医嘱
         List<ServiceRequestUseExe> tempActivity = actUseExeList.stream()
-            .filter(e -> TherapyTimeType.TEMPORARY.getValue().equals(e.getTherapyEnum())).collect(Collectors.toList());
+            .filter(e -> TherapyTimeType.TEMPORARY.getValue().equals(e.getTherapyEnum())).toList();
         // 诊疗定义id集合
         List<Long> activityDefinitionIdList =
             actUseExeList.stream().map(ServiceRequestUseExe::getActivityId).collect(Collectors.toList());
         // 医嘱详细信息
-        List<AdviceBaseDto> activityInfos = iDoctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
+        List<AdviceBaseDto> activityInfos = doctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
             activityDefinitionIdList, 0L, 1, 500, Whether.NO.getValue(), List.of(3)).getRecords();
 
         // 当前时间
@@ -701,10 +851,15 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
 
+        Date clickDate = new Date();
+
         // 长期
         ServiceRequest longServiceRequest;
         ChargeItem chargeItem;
         for (ServiceRequestUseExe serviceRequestUseExe : longActivity) {
+            // 查询耗材的取药科室
+            Long takeDeviceLocationId = doctorStationAdviceAppMapper
+                .getTakeDeviceLocationId(serviceRequestUseExe.getEncounterId(), ItemCategoryCode.DEVICE.getCode());
             for (String executeTime : serviceRequestUseExe.getExecuteTimes()) {
                 longServiceRequest = new ServiceRequest();
                 BeanUtils.copyProperties(serviceRequestUseExe, longServiceRequest);
@@ -725,6 +880,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 chargeItem = new ChargeItem();
                 chargeItem.setStatusEnum(ChargeItemStatus.BILLABLE.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(longServiceRequest.getBusNo()));
+                chargeItem.setGenerateSourceEnum(GenerateSource.ORDER_EXECUTE.getValue()); // 生成来源
                 chargeItem.setPatientId(longServiceRequest.getPatientId()); // 患者
                 chargeItem.setContextEnum(ChargeItemContext.ACTIVITY.getValue()); // 类型
                 chargeItem.setEncounterId(longServiceRequest.getEncounterId()); // 就诊id
@@ -745,7 +901,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 Optional<AdviceBaseDto> matchedAdvice = activityInfos.stream()
                     .filter(advice -> finalLongServiceRequest.getActivityId().equals(advice.getAdviceDefinitionId()))
                     .findFirst();
-                if (!matchedAdvice.isPresent()) {
+                if (matchedAdvice.isEmpty()) {
                     throw new RuntimeException("未找到对应的医嘱信息，activityId: " + finalLongServiceRequest.getActivityId());
                 }
                 // 医嘱信息
@@ -760,14 +916,21 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 chargeItem.setQuantityUnit(longServiceRequest.getUnitCode()); // 单位
                 chargeItem.setUnitPrice(price); // 单价
                 chargeItem
-                    .setTotalPrice(longServiceRequest.getQuantity().multiply(price).setScale(4, RoundingMode.HALF_UP)); // 总价
+                    .setTotalPrice(longServiceRequest.getQuantity().multiply(price).setScale(6, RoundingMode.HALF_UP)); // 总价
                 chargeItemService.saveOrUpdate(chargeItem);
+
+                // 处理诊疗绑定耗材
+                this.handleBindDevice(longServiceRequest, procedureId, takeDeviceLocationId, curDate, practitionerId,
+                    orgId, serviceRequestUseExe.getAccountId(), exeDate, clickDate);
             }
         }
 
         // 临时
         ServiceRequest tempServiceRequest;
         for (ServiceRequestUseExe serviceRequestUseExe : tempActivity) {
+            // 查询耗材的取药科室
+            Long takeDeviceLocationId = doctorStationAdviceAppMapper
+                .getTakeDeviceLocationId(serviceRequestUseExe.getEncounterId(), ItemCategoryCode.DEVICE.getCode());
             for (String executeTime : serviceRequestUseExe.getExecuteTimes()) {
                 tempServiceRequest = new ServiceRequest();
                 BeanUtils.copyProperties(serviceRequestUseExe, tempServiceRequest);
@@ -789,11 +952,201 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                     new LambdaUpdateWrapper<ChargeItem>().eq(ChargeItem::getServiceId, tempServiceRequest.getId())
                         .set(ChargeItem::getProcedureId, procedureId)
                         .set(ChargeItem::getStatusEnum, ChargeItemStatus.BILLABLE.getValue()));
+
+                // 处理诊疗绑定耗材
+                this.handleBindDevice(tempServiceRequest, procedureId, takeDeviceLocationId, curDate, practitionerId,
+                    orgId, serviceRequestUseExe.getAccountId(), exeDate, clickDate);
             }
         }
 
     }
 
+    /**
+     * 处理诊疗绑定耗材
+     *
+     * @param serviceRequest 诊疗请求
+     * @param procedureId 执行id
+     * @param locationId 取耗材的库房id
+     * @param curDate 时间
+     * @param practitionerId 参与者id
+     * @param orgId 当前登录账号的科室id
+     * @param accountId 支付账号ID
+     * @param exeDate 执行时间(页面传的)
+     * @param clickDate 执行时间(实际点击时间)
+     */
+    private void handleBindDevice(ServiceRequest serviceRequest, Long procedureId, Long locationId, Date curDate,
+        Long practitionerId, Long orgId, Long accountId, Date exeDate, Date clickDate) {
+        // 查询诊疗绑定耗材的信息
+        List<ActivityBindDeviceDetailDto> activityBindDevice =
+            doctorStationAdviceAppMapper.getActivityBindDevice(serviceRequest.getActivityId() + "",
+                PublicationStatus.ACTIVE.getValue(), CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        // 满足此条件,说明诊疗绑了耗材
+        if (!activityBindDevice.isEmpty()) {
+            if (locationId == null) {
+                throw new RuntimeException("【" + serviceRequest.getBusNo() + "】诊疗请求,绑定的耗材未配置发放耗材房");
+            }
+            // 耗材定义id集合
+            List<Long> deviceIds =
+                activityBindDevice.stream().map(ActivityBindDeviceDetailDto::getDeviceId).collect(Collectors.toList());
+            // 耗材库存集合
+            List<AdviceInventoryDto> adviceInventoryList = doctorStationAdviceAppMapper.getAdviceInventory(locationId,
+                deviceIds, 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 =
+                adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
+
+            // 耗材医嘱详细信息
+            List<AdviceBaseDto> deviceInfos = doctorStationAdviceAppService
+                .getAdviceBaseInfo(null, null, null, deviceIds, 0L, 1, 500, Whether.NO.getValue(), List.of(2))
+                .getRecords();
+
+            DeviceRequest deviceRequest;
+            BigDecimal minUnitCodeQuantity;
+            ChargeItem chargeItem;
+            for (ActivityBindDeviceDetailDto activityBindDeviceDetailDto : activityBindDevice) {
+                Optional<AdviceInventoryDto> matchedInventory = adviceInventory.stream()
+                    .filter(inventoryDto -> activityBindDeviceDetailDto.getDeviceId().equals(inventoryDto.getItemId())
+                        && CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(inventoryDto.getItemTable())
+                        && locationId.equals(inventoryDto.getLocationId()))
+                    .findFirst();
+                // 匹配到库存信息,并校验
+                if (matchedInventory.isPresent()) {
+                    AdviceInventoryDto inventoryDto = matchedInventory.get();
+                    if (activityBindDeviceDetailDto.getMinUnitCodeQuantity()
+                        .compareTo(inventoryDto.getQuantity()) > 0) {
+                        throw new RuntimeException("【" + serviceRequest.getBusNo() + "】诊疗请求,绑定的耗材数量不足");
+                    }
+                } else {
+                    throw new RuntimeException("【" + serviceRequest.getBusNo() + "】诊疗请求,绑定的耗材未匹配到库存信息");
+                }
+                // 根据 deviceId 查找对应的医嘱信息
+                Optional<AdviceBaseDto> deviceAdvice = deviceInfos.stream()
+                    .filter(advice -> activityBindDeviceDetailDto.getDeviceId().equals(advice.getAdviceDefinitionId()))
+                    .findFirst();
+                if (deviceAdvice.isEmpty()) {
+                    throw new RuntimeException("未找到对应的医嘱信息，deviceId: " + activityBindDeviceDetailDto.getDeviceId());
+                }
+                AdviceBaseDto advice = deviceAdvice.get();
+
+                // 生成耗材请求
+                deviceRequest = new DeviceRequest();
+                deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4)); // 耗材请求编码
+                deviceRequest.setGenerateSourceEnum(GenerateSource.ORDER_EXECUTE.getValue()); // 生成来源
+                deviceRequest.setStatusEnum(RequestStatus.COMPLETED.getValue()); // 请求状态
+                deviceRequest.setBasedOnId(serviceRequest.getId());
+                deviceRequest.setBasedOnTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);
+                deviceRequest.setQuantity(activityBindDeviceDetailDto.getQuantity()); // 请求数量
+                deviceRequest.setUnitCode(activityBindDeviceDetailDto.getUnitCode()); // 请求单位编码
+                // deviceRequest.setLotNumber();// 产品批号
+                deviceRequest.setCategoryEnum(Integer.valueOf(advice.getCategoryCode())); // 请求类型
+                deviceRequest.setDeviceDefId(activityBindDeviceDetailDto.getDeviceId());// 耗材定义id
+                deviceRequest.setPatientId(serviceRequest.getPatientId()); // 患者
+                deviceRequest.setRequesterId(practitionerId); // 开方人
+                deviceRequest.setOrgId(orgId);// 开方人科室
+                deviceRequest.setReqAuthoredTime(clickDate); // 请求开始时间
+                deviceRequest.setPerformLocation(locationId); // 发放耗材房
+                deviceRequest.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
+                deviceRequest.setConditionId(serviceRequest.getConditionId()); // 诊断id
+                deviceRequest.setEncounterDiagnosisId(serviceRequest.getEncounterDiagnosisId()); // 就诊诊断id
+
+                deviceRequestService.save(deviceRequest);
+
+                // 需要的耗材数量(小单位)
+                minUnitCodeQuantity = activityBindDeviceDetailDto.getMinUnitCodeQuantity();
+                // 单位(小单位)
+                // String minUnitCode = activityBindDeviceDetailDto.getMinUnitCode();
+                // 库存集合
+                List<AdviceInventoryDto> inventoryList = advice.getInventoryList();
+                // 价格集合
+                List<AdvicePriceDto> priceList = advice.getPriceList();
+                // 剩余需要分配的数量
+                BigDecimal remainingQuantity = minUnitCodeQuantity;
+                // 按批次循环分配数量
+                for (AdviceInventoryDto inventory : inventoryList) {
+                    if (remainingQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                        break;
+                    }
+                    // 可用量
+                    BigDecimal availableQuantity = inventory.getQuantity();
+                    // 实际供应量
+                    BigDecimal actualQuantity;
+                    if (availableQuantity.compareTo(remainingQuantity) >= 0) {
+                        // 当前批次足够满足剩余需求
+                        actualQuantity = remainingQuantity;
+                        remainingQuantity = BigDecimal.ZERO;
+                    } else {
+                        // 当前批次全部用完
+                        actualQuantity = availableQuantity;
+                        remainingQuantity = remainingQuantity.subtract(availableQuantity);
+                    }
+                    // 批次号
+                    String lotNumber = inventory.getLotNumber();
+                    // 查找对应批次的价格
+                    AdvicePriceDto priceInfos = findPriceByLotNumber(inventory.getLotNumber(), priceList);
+
+                    // 根据批次库存量,生成耗材发放
+                    deviceRequest.setQuantity(actualQuantity);
+                    deviceRequest.setLotNumber(lotNumber);
+                    // 发放ID
+                    Long dispenseId =
+                        deviceDispenseService.generateDeviceDispense(deviceRequest, procedureId, locationId, exeDate);
+
+                    // 根据批次库存量,生成账单
+                    chargeItem = new ChargeItem();
+                    chargeItem.setStatusEnum(ChargeItemStatus.BILLABLE.getValue()); // 收费状态
+                    chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
+                    chargeItem.setGenerateSourceEnum(GenerateSource.ORDER_EXECUTE.getValue()); // 生成来源
+                    chargeItem.setPatientId(deviceRequest.getPatientId()); // 患者
+                    chargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 类型
+                    chargeItem.setEncounterId(deviceRequest.getEncounterId()); // 就诊id
+                    chargeItem.setDefinitionId(priceInfos.getDefinitionId()); // 费用定价ID
+                    chargeItem.setDefDetailId(priceInfos.getDefinitionDetailId()); // 定价子表主键
+                    chargeItem.setEntererId(practitionerId);// 开立人ID
+                    chargeItem.setRequestingOrgId(orgId); // 开立科室
+                    chargeItem.setEnteredDate(curDate); // 开立时间
+                    chargeItem.setServiceTable(CommonConstants.TableName.WOR_DEVICE_REQUEST);// 医疗服务类型
+                    chargeItem.setServiceId(deviceRequest.getId()); // 医疗服务ID
+                    chargeItem.setProductTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION);// 产品所在表
+                    chargeItem.setProductId(activityBindDeviceDetailDto.getDeviceId());// 收费项id
+                    chargeItem.setAccountId(accountId);// 关联账户ID
+                    chargeItem.setConditionId(deviceRequest.getConditionId()); // 诊断id
+                    chargeItem.setEncounterDiagnosisId(deviceRequest.getEncounterDiagnosisId()); // 就诊诊断id
+                    chargeItem.setDispenseTable(CommonConstants.TableName.WOR_DEVICE_DISPENSE); // 发放表名
+                    // chargeItem.setDispenseId(dispenseId); // 发放ID
+
+                    chargeItem.setQuantityValue(actualQuantity); // 数量
+                    chargeItem.setQuantityUnit(priceInfos.getUnitCode()); // 单位
+                    chargeItem.setUnitPrice(priceInfos.getPrice()); // 单价
+                    chargeItem.setTotalPrice(
+                        actualQuantity.multiply(priceInfos.getPrice()).setScale(6, RoundingMode.HALF_UP)); // 总价
+
+                    chargeItemService.save(chargeItem);
+
+                }
+            }
+        }
+    }
+
+    /**
+     * 根据批次号查找价格
+     *
+     * @param lotNumber 批次号
+     * @param priceList 价格列表
+     * @return 价格信息，如果找不到则返回null
+     */
+    private AdvicePriceDto findPriceByLotNumber(String lotNumber, List<AdvicePriceDto> priceList) {
+        if (priceList == null || priceList.isEmpty()) {
+            return null;
+        }
+        return priceList.stream().filter(price -> Objects.equals(price.getConditionValue(), lotNumber)).findFirst()
+            .get();
+
+    }
+
     /**
      * 组装药品请求用于执行的数据结构
      *
@@ -900,4 +1253,31 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         return actUseExeList;
     }
 
+    /**
+     * 生成退药单
+     *
+     * @param longMedDispensedList 已发放的药品列表
+     * @param procedureIdMap 执行idMap
+     */
+    private void creatRefundMedicationList(List<MedicationDispense> longMedDispensedList,
+        Map<Long, Long> procedureIdMap) {
+        List<MedicationDispense> medicationRefundList = new ArrayList<>();
+        // 根据发药单对应生成退药单
+        for (MedicationDispense medicationDispense : longMedDispensedList) {
+            // 药品发放编码
+            medicationDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
+            // 退药状态
+            medicationDispense.setStatusEnum(DispenseStatus.PREPARATION.getValue());
+            // 状态变更时间
+            medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
+            // 取消执行id
+            Long newProcedureId = procedureIdMap.get(medicationDispense.getProcedureId());
+            if (newProcedureId != null) {
+                medicationDispense.setProcedureId(newProcedureId);
+            }
+            medicationDispense.setId(null);
+            medicationRefundList.add(medicationDispense);
+        }
+        medicationDispenseService.saveBatch(medicationRefundList);
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
index 898a8458..d0e0479b 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
@@ -7,33 +7,31 @@ import java.util.stream.Collectors;
 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.constant.HttpStatus;
 import com.core.common.core.domain.R;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 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.domain.MedicationDefinition;
+import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDefinitionService;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
-import com.openhis.web.inhospitalnursestation.dto.InpatientMedicineEncounterInfoDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientMedicinePrescriptionInfoDto;
-import com.openhis.web.inhospitalnursestation.dto.InpatientMedicineSearchParam;
-import com.openhis.web.inhospitalnursestation.mapper.InpatientMedicineCollectionMapper;
-import com.openhis.web.pharmacymanage.dto.InventoryDto;
+import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto;
+import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
+import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
+import com.openhis.web.inhospitalnursestation.mapper.MedicineSummaryAppMapper;
+import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
 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.ISupplyDeliveryService;
 import com.openhis.workflow.service.ISupplyRequestService;
 
@@ -49,236 +47,200 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
     @Resource
     private AssignSeqUtil assignSeqUtil;
 
-    @Autowired
+    @Resource
     private IMedicationDispenseService medicationDispenseService;
 
-    @Autowired
-    private IDeviceDispenseService deviceDispenseService;
+    @Resource
+    private MedicineSummaryAppMapper medicineSummaryAppMapper;
 
-    @Autowired
-    private InpatientMedicineCollectionMapper inpatientMedicineCollectionMapper;
     @Resource
     private ISupplyRequestService supplyRequestService;
 
     @Resource
     private ISupplyDeliveryService supplyDeliveryService;
-    @Autowired
+
+    @Resource
+    private IMedicationDefinitionService medicationDefinitionService;
+
+    @Resource
     private ReturnMedicineMapper returnMedicineMapper;
 
     /**
-     * 分页查询在科病人列表
+     * 查询发药单信息
      *
-     * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
+     * @param dispenseFormSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 发药病人列表
+     * @param request 请求
+     * @return 发药单信息
      */
     @Override
-    public R<?> getEncounterInfoListPage(InpatientMedicineSearchParam searchParam, String searchKey, Integer pageNo,
+    public R<?> getMedicineDispenseFormPage(DispenseFormSearchParam dispenseFormSearchParam, Integer pageNo,
         Integer pageSize, HttpServletRequest request) {
-        // 参与者科室id
-        Long orgId = SecurityUtils.getLoginUser().getOrgId();
-        searchParam.setOrganizationId(orgId);
-
+        // 初始化查询参数
+        String encounterIds = dispenseFormSearchParam.getEncounterIds();
+        dispenseFormSearchParam.setEncounterIds(null);
         // 构建查询条件
-        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);
+        QueryWrapper<DispenseFormSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(dispenseFormSearchParam, null, null, request);
 
-        // 查询就诊病人列表
-        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()));
+        // 手动拼接住院患者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<MedicineDispenseFormDto> medicineDispenseFormPage =
+            medicineSummaryAppMapper.selectMedicineDispenseFormPage(new Page<>(pageNo, pageSize), queryWrapper,
+                RequestStatus.COMPLETED.getValue(), EncounterActivityStatus.ACTIVE.getValue(),
+                LocationForm.BED.getValue(), ParticipantType.ADMITTING_DOCTOR.getCode(),
+                AccountType.PERSONAL_CASH_ACCOUNT.getCode(), ChargeItemStatus.BILLABLE.getValue(),
+                ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.REFUNDED.getValue(),
+                DispenseStatus.SUMMARIZED.getValue());
+        medicineDispenseFormPage.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.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+            // 计算年龄
+            if (e.getBirthDate() != null) {
+                e.setAge(AgeCalculatorUtil.getAge(e.getBirthDate()));
+            }
         });
-
-        return R.ok(encounterInfoPageDto);
+        return R.ok(medicineDispenseFormPage);
     }
 
     /**
-     * 查询医嘱列表
+     * 查询药品汇总单
      *
-     * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
+     * @param dispenseFormSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 处方单列表
+     * @param searchKey 模糊查询关键字
+     * @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);
-
+    public R<?> getMedicineSummaryFormPage(DispenseFormSearchParam dispenseFormSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
         // 构建查询条件
-        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);
+        QueryWrapper<DispenseFormSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(dispenseFormSearchParam,
+            searchKey, new HashSet<>(List.of(CommonConstants.FieldName.BusNo)), request);
 
-        // 查询医嘱列表
-        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()));
+        // 汇总单分页列表
+        Page<MedicineSummaryFormDto> medicineSummaryFormPage = medicineSummaryAppMapper.selectMedicineSummaryFormPage(
+            new Page<>(pageNo, pageSize), queryWrapper, DispenseStatus.COMPLETED.getValue(),
+            DispenseStatus.IN_PROGRESS.getValue(), SupplyType.SUMMARY_DISPENSE.getValue());
+        medicineSummaryFormPage.getRecords().forEach(e -> {
+            // 发药状态
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, e.getStatusEnum()));
         });
-
-        return R.ok(prescriptionInfoPageDto);
+        return R.ok(medicineSummaryFormPage);
     }
 
     /**
-     * 显示汇总发药单（生成之前的确认，此刻还没生成汇总单）
+     * 查询药品汇总单详情
      *
-     * @param searchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @return 处理结果
+     * @param summaryNo 汇总单号
+     * @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);
+    public R<?> getMedicineSummaryFormDetail(String summaryNo) {
+        // 药品汇总单详情
+        return R.ok(medicineSummaryAppMapper.selectMedicineSummaryFormDetail(summaryNo));
     }
 
     /**
      * 生成汇总发药单
      *
-     * @param prescriptionInfo 汇总发药单
+     * @param medicineSummaryParamList 汇总发药申请参数
      * @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;
+    public R<?> medicineSummary(List<MedicineSummaryParam> medicineSummaryParamList) {
+        // 领药人
+        Long receiverId = medicineSummaryParamList.get(0).getReceiverId();
+        // 申请时间
         Date now = DateUtils.getNowDate();
-
-        // 校验库存
-        R<?> checkInventoryReturn = this.checkInventoryItem(devDispenseId, medDispenseId);
-        if (checkInventoryReturn.getCode() != HttpStatus.SUCCESS) {
-            return checkInventoryReturn;
+        // 申请人
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 药品发放id
+        List<Long> medDispenseIdList =
+            medicineSummaryParamList.stream().map(MedicineSummaryParam::getDispenseId).toList();
+        // 药品发放信息列表
+        List<MedicationDispense> medicationDispenseList = medicationDispenseService.listByIds(medDispenseIdList);
+        if (medicationDispenseList == null || medicationDispenseList.isEmpty()) {
+            throw new ServiceException("未找到药品发放信息");
         }
-
-        // 单据号
-        String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.DISPENSING_ORDER.getPrefix(), 4);
-        if (prescriptionInfo.stream().map(InpatientMedicinePrescriptionInfoDto::getStatusEnum)
+        if (medicationDispenseList.stream().map(MedicationDispense::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);
+        }
+        // 查询药品信息
+        List<MedicationDefinition> medicationDefinitions = medicationDefinitionService
+            .listByIds(medicationDispenseList.stream().map(MedicationDispense::getMedicationId).toList());
+        // 根据发放药房分组
+        Map<Long, List<MedicationDispense>> medicationLocationMap =
+            medicationDispenseList.stream().collect(Collectors.groupingBy(MedicationDispense::getLocationId));
+        // 循环每个药房
+        for (Map.Entry<Long, List<MedicationDispense>> entry : medicationLocationMap.entrySet()) {
+            // 汇总单据号
+            String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICINE_SUMMARY_NO.getPrefix(), 4);
 
-                // 供应发放
-                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());
+            List<MedicationDispense> medicationDispenses = entry.getValue();
+            // 根据相同批号的同一药品进行汇总
+            Map<String, List<MedicationDispense>> medicationSummaryInfoMap = medicationDispenses.stream().collect(
+                Collectors.groupingBy(x -> x.getMedicationId() + CommonConstants.Common.DASH + x.getLotNumber()));
+            for (Map.Entry<String, List<MedicationDispense>> medicationSummaryInfoList : medicationSummaryInfoMap
+                .entrySet()) {
+                List<MedicationDispense> medicationSummaryList = medicationSummaryInfoList.getValue();
+                MedicationDispense medicationDispense = medicationSummaryList.get(0);
+                Long medicationId = medicationDispense.getMedicationId();
+                Long locationId = medicationDispense.getLocationId();
+                String lotNumber = medicationDispense.getLotNumber();
+                Long patientId = medicationDispense.getPatientId();
+                // 拆零比例
+                BigDecimal partPercent = BigDecimal.ONE;
+                // 最小单位
+                String minUnitCode = null;
+                // 单位
+                String unitCode = null;
+                // 根据药品id获取对应的药品信息
+                Optional<MedicationDefinition> medicationDefinition =
+                    medicationDefinitions.stream().filter(x -> x.getId().equals(medicationId)).findFirst();
+                if (medicationDefinition.isPresent()) {
+                    partPercent = medicationDefinition.get().getPartPercent();
+                    minUnitCode = medicationDefinition.get().getMinUnitCode();
+                    unitCode = medicationDefinition.get().getUnitCode();
                 }
-                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));
+                if (minUnitCode == null || unitCode == null || partPercent == null) {
+                    throw new ServiceException("药品信息有误,请联系管理员");
+                }
+                // 最小单位数量
+                BigDecimal minQuantity = BigDecimal.ZERO;
+                for (MedicationDispense medicationSummaryInfo : medicationSummaryList) {
+                    BigDecimal quantity = medicationSummaryInfo.getQuantity();
+                    if (unitCode.equals(medicationDispense.getUnitCode())) {
+                        // 转换为小单位进行累加
+                        quantity = medicationSummaryInfo.getQuantity().multiply(partPercent);
+                    }
+                    minQuantity = minQuantity.add(quantity);
+                }
+                Long supplyRequestId = supplyRequestService.createSummarySupplyRequest(medicationId, locationId,
+                    lotNumber, patientId, minQuantity, minUnitCode, practitionerId, now, busNo);
+                supplyDeliveryService.createSummarySupplyDelivery(medicationId, lotNumber, patientId, minQuantity,
+                    minUnitCode, receiverId, supplyRequestId);
             }
             // 药品发放状态更新
-            medicationDispenseService.updateDispenseStatusSummarized(medDispenseId);
-            // 耗材发放状态更新
-            deviceDispenseService.updateDispenseStatusSummarized(devDispenseId);
+            medicationDispenseService.updateDispenseStatusSummarized(
+                medicationDispenses.stream().map(MedicationDispense::getId).toList(), busNo);
         }
-
-        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null));
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"汇总申请"}));
     }
 
     /**
@@ -293,45 +255,45 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
 
         List<InventoryItem> inventoryItemList = new ArrayList<>();
         // 获取库存信息
-        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseId, medDispenseId,
+        List<UnDispenseInventoryDto> 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));
+        Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
         // 遍历每个分组校验库存状态
-        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
-            List<InventoryDto> groupItems = entry.getValue();
-            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+        for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<UnDispenseInventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(UnDispenseInventoryDto::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())) {
+            for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
                     InventoryItem inventoryItem = new InventoryItem();
                     // 库存数量判定
-                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                    if (unDispenseInventoryDto.getDispenseUnit().equals(unDispenseInventoryDto.getInventoryUnitCode())) {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(unDispenseInventoryDto.getQuantity());
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     } else {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
-                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                            .subtract(unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     }
                     inventoryItemList.add(inventoryItem);
@@ -341,4 +303,27 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
         return R.ok(inventoryItemList);
     }
 
+    /**
+     * 取消汇总
+     *
+     * @param summaryNo 汇总单号
+     * @return 处理结果
+     */
+    @Override
+    public R<?> cancelSummary(String summaryNo) {
+        // 取消汇总申请（软删除）
+        List<Long> requestIdList = supplyRequestService.cancelSummarySupplyRequest(List.of(summaryNo));
+        if (requestIdList.isEmpty()) {
+            return R.fail("取消汇总申请失败");
+        }
+        // 软删除汇总发放
+        supplyDeliveryService.deleteSupplyDeliveryByReqId(requestIdList);
+        // 取消药品汇总
+        boolean result = medicationDispenseService.cancelMedicationSummary(List.of(summaryNo));
+        if (!result) {
+            return R.fail("取消汇总申请失败");
+        }
+        return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"取消"}));
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
new file mode 100644
index 00000000..42a3201d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java
@@ -0,0 +1,428 @@
+package com.openhis.web.inhospitalnursestation.appservice.impl;
+
+import com.core.common.core.domain.R;
+import com.core.common.core.domain.model.LoginUser;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.AssignSeqUtil;
+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.enums.*;
+import com.openhis.web.doctorstation.dto.AdviceSaveDto;
+import com.openhis.web.doctorstation.utils.AdviceUtils;
+import com.openhis.web.inhospitalnursestation.appservice.INurseBillingAppService;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveDto;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+import com.openhis.workflow.domain.DeviceRequest;
+import com.openhis.workflow.service.IDeviceDispenseService;
+import com.openhis.workflow.service.IDeviceRequestService;
+import com.openhis.workflow.service.IServiceRequestService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 住院护士站划价服务实现类
+ * 核心功能：临时耗材/诊疗活动划价签发、关联费用项管理、库存校验、医嘱删除（已收费校验）等
+ */
+@Service
+public class NurseBillingAppService implements INurseBillingAppService {
+
+    // 依赖注入：保留@Resource注解，按原有方式注入依赖
+    @Resource
+    private AdviceUtils adviceUtils;
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+    @Resource
+    private IDeviceRequestService iDeviceRequestService;
+    @Resource
+    private IServiceRequestService iServiceRequestService;
+    @Resource
+    private IChargeItemService iChargeItemService;
+    @Resource
+    private IDeviceDispenseService iDeviceDispenseService;
+
+    // 常量提取：避免魔法值，提高代码可维护性和可读性
+    /** 耗材请求服务表名（关联费用项使用） */
+    private static final String SERVICE_TABLE_DEVICE_REQUEST = CommonConstants.TableName.WOR_DEVICE_REQUEST;
+    private static final String SERVICE_TABLE_SERVICE_REQUEST = CommonConstants.TableName.WOR_SERVICE_REQUEST;
+    /** 费用项业务编号前缀 */
+    private static final String CHARGE_ITEM_BUS_NO_PREFIX = AssignSeqEnum.CHARGE_ITEM_NO.getPrefix();
+    /** 耗材申请单号序列号长度（按日生成） */
+    private static final int DEVICE_RES_NO_SEQ_LENGTH = 4;
+    /** 医嘱签发编码序列号长度 */
+    private static final int ADVICE_SIGN_SEQ_LENGTH = 10;
+
+    /**
+     * 新增住院护士站划价
+     * 完整流程：参数初始化 → 入参校验 → 医嘱分类（耗材/诊疗活动）→ 生成签发编码 → 处理耗材划价 → 处理诊疗活动划价
+     *
+     * @param regAdviceSaveParam 划价请求参数（含患者信息、医嘱列表、科室ID等核心数据）
+     * @return R<?> 划价结果响应（成功/失败信息、状态码）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class) // 事务管理：划价相关操作原子性，任一环节失败整体回滚
+    public R<?> addInNurseBilling(RegAdviceSaveParam regAdviceSaveParam) {
+        // 1. 时间参数初始化：默认使用当前时间，支持入参指定
+        Date curDate = new Date();
+        Date startTime = regAdviceSaveParam.getStartTime() == null ? curDate : regAdviceSaveParam.getStartTime();
+        Date authoredTime = regAdviceSaveParam.getAuthoredTime() == null ? curDate : regAdviceSaveParam.getAuthoredTime();
+
+        // 2. 入参校验：非空校验 + 库存校验，校验失败直接返回错误响应
+        R<?> checkResult = checkNurseBillingParam(regAdviceSaveParam);
+        if (checkResult.getCode() != R.SUCCESS) {
+            return checkResult;
+        }
+
+        // 3. 提取核心业务参数
+        Long organizationId = regAdviceSaveParam.getOrganizationId(); // 患者住院科室ID
+        List<RegAdviceSaveDto> allAdviceList = regAdviceSaveParam.getRegAdviceSaveList(); // 所有待处理医嘱列表
+
+        // 4. 按医嘱类型分类：拆分耗材类和诊疗活动类（分别处理）
+        List<RegAdviceSaveDto> deviceAdviceList = filterDeviceAdvice(allAdviceList); // 耗材类医嘱
+        List<RegAdviceSaveDto> activityAdviceList = filterActivityAdvice(allAdviceList); // 诊疗活动类医嘱
+
+        // 5. 生成全局唯一的医嘱签发编码
+        String signCode = assignSeqUtil.getSeq(AssignSeqEnum.ADVICE_SIGN.getPrefix(), ADVICE_SIGN_SEQ_LENGTH);
+
+        // 6. 处理耗材类医嘱划价（新增/修改/删除逻辑）
+        handleDeviceBilling(deviceAdviceList, null, signCode, organizationId, curDate);
+
+        // 7. 处理诊疗活动类医嘱划价（原代码未实现，保留扩展入口）
+        handleActivityBilling(activityAdviceList, signCode, organizationId, curDate, startTime, authoredTime);
+
+        // 8. 划价成功返回响应
+        return R.ok("住院划价签发成功");
+    }
+
+    /**
+     * 筛选耗材类医嘱
+     * 按医嘱类型枚举（ItemType.DEVICE）过滤，仅保留耗材相关医嘱
+     *
+     * @param allAdviceList 所有待处理医嘱列表
+     * @return List<RegAdviceSaveDto> 耗材类医嘱列表
+     */
+    private List<RegAdviceSaveDto> filterDeviceAdvice(List<RegAdviceSaveDto> allAdviceList) {
+        return allAdviceList.stream()
+                .filter(advice -> ItemType.DEVICE.getValue().equals(advice.getAdviceType()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 筛选诊疗活动类医嘱
+     * 按医嘱类型枚举（ItemType.ACTIVITY）过滤，仅保留诊疗活动相关医嘱
+     *
+     * @param allAdviceList 所有待处理医嘱列表
+     * @return List<RegAdviceSaveDto> 诊疗活动类医嘱列表
+     */
+    private List<RegAdviceSaveDto> filterActivityAdvice(List<RegAdviceSaveDto> allAdviceList) {
+        return allAdviceList.stream()
+                .filter(advice -> ItemType.ACTIVITY.getValue().equals(advice.getAdviceType()))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 处理耗材类医嘱划价
+     * 核心流程：筛选临时耗材 → 处理删除（已收费校验）→ 新增/修改耗材记录 → 同步发放+费用项
+     *
+     * @param deviceAdviceList 耗材类医嘱列表
+     * @param deleteList       待删除的耗材医嘱列表（可为null，暂无删除场景传null）
+     * @param signCode         医嘱签发编码（全局唯一）
+     * @param organizationId   患者住院科室ID
+     * @param curDate          当前操作时间
+     */
+    private void handleDeviceBilling(List<RegAdviceSaveDto> deviceAdviceList, List<AdviceSaveDto> deleteList,
+                                     String signCode, Long organizationId, Date curDate) {
+        // 1. 筛选临时类型耗材：仅处理临时医嘱（TherapyTimeType.TEMPORARY）的新增/修改
+        List<AdviceSaveDto> tempDeviceList = deviceAdviceList.stream()
+                .filter(advice -> TherapyTimeType.TEMPORARY.getValue().equals(advice.getTherapyEnum()))
+                .collect(Collectors.toList());
+
+        // 2. 处理耗材删除：校验已收费状态 + 关联数据删除
+        handleDelRequest(deleteList,SERVICE_TABLE_DEVICE_REQUEST);
+
+        // 3. 处理耗材新增/修改：同步保存耗材请求、发放记录、费用项
+        handleDeviceInsertOrUpdate(tempDeviceList, organizationId, curDate);
+    }
+
+    /**
+     * 处理诊疗活动类医嘱划价
+     * （扩展入口：原代码未实现，可参考耗材处理逻辑，关联服务请求表、费用项等）
+     *
+     * @param activityAdviceList 诊疗活动类医嘱列表
+     * @param signCode           医嘱签发编码
+     * @param organizationId     住院科室ID
+     * @param curDate            当前操作时间
+     * @param startTime          医嘱开始时间
+     * @param authoredTime       医嘱签发时间
+     */
+    private void handleActivityBilling(List<RegAdviceSaveDto> activityAdviceList, String signCode,
+                                       Long organizationId, Date curDate, Date startTime, Date authoredTime) {
+        // 注：诊疗活动划价逻辑待实现，建议流程：
+        // 1. 筛选临时类型诊疗活动
+        // 2. 处理删除（如需）
+        // 3. 新增/修改服务请求记录（IServiceRequestService）
+        // 4. 同步生成/更新费用项（IChargeItemService）
+    }
+
+    /**
+     * 处理耗材删除逻辑
+     * 关键校验：已收费的耗材项目不允许删除
+     * 关联删除：耗材请求表 → 耗材发放记录 → 费用项表（级联删除关联数据）
+     *
+     * @param deleteList 待删除的耗材医嘱列表（可为null）
+     */
+    private void handleDelRequest(List<AdviceSaveDto> deleteList,String serviceTable) {
+        // 空列表直接返回，避免无效循环和查询
+        if (deleteList == null || deleteList.isEmpty()) {
+            return;
+        }
+        // 提取待删除请求ID列表（用于查询费用状态）
+        List<Long> delRequestIds = deleteList.stream()
+                .map(AdviceSaveDto::getRequestId)
+                .collect(Collectors.toList());
+
+        // 校验：待删除项是否已收费，已收费则抛出异常阻止删除
+        checkDeletedDeviceChargeStatus(delRequestIds);
+
+        // 执行级联删除：循环处理每个待删除项的关联数据
+        for (AdviceSaveDto deleteDto : deleteList) {
+            Long requestId = deleteDto.getRequestId();
+            if (serviceTable.equals(SERVICE_TABLE_DEVICE_REQUEST)){
+                iDeviceRequestService.removeById(requestId); // 删除耗材请求主记录
+                iDeviceDispenseService.deleteDeviceDispense(requestId); // 删除关联的耗材发放记录
+            }
+            // 删除关联的费用项（按服务表+服务ID关联）
+            iChargeItemService.deleteByServiceTableAndId(SERVICE_TABLE_DEVICE_REQUEST, requestId);
+        }
+    }
+
+    /**
+     * 校验待删除耗材的费用状态
+     * 查询待删除项对应的费用项，若存在已收费（ChargeItemStatus.BILLED）状态则抛出业务异常
+     *
+     * @param delRequestIds 待删除的耗材请求ID列表
+     */
+    private void checkDeletedDeviceChargeStatus(List<Long> delRequestIds) {
+        if (delRequestIds.isEmpty()) {
+            return;
+        }
+
+        // 查询待删除耗材对应的费用项列表
+        List<ChargeItem> chargeItemList = iChargeItemService.getChargeItemInfoByReqId(delRequestIds);
+        if (chargeItemList == null || chargeItemList.isEmpty()) {
+            return; // 无关联费用项，直接允许删除
+        }
+
+        // 校验是否存在已收费项：使用stream.anyMatch简化循环判断
+        boolean hasBilledItem = chargeItemList.stream()
+                .anyMatch(ci -> ChargeItemStatus.BILLED.getValue().equals(ci.getStatusEnum()));
+        if (hasBilledItem) {
+            throw new ServiceException("删除失败：部分项目已完成收费，不支持直接删除，请联系收费人员处理后重试");
+        }
+    }
+
+    /**
+     * 处理耗材新增/修改
+     * 流程：构建耗材请求对象 → 保存/更新 → 处理耗材发放 → 构建费用项 → 保存/更新费用项
+     *
+     * @param tempDeviceList 临时耗材医嘱列表（新增/修改）
+     * @param organizationId 住院科室ID
+     * @param curDate        当前操作时间
+     */
+    private void handleDeviceInsertOrUpdate(List<AdviceSaveDto> tempDeviceList, Long organizationId, Date curDate) {
+        if (tempDeviceList.isEmpty()) {
+            return; // 无临时耗材需处理，直接返回
+        }
+
+        // 循环处理每个临时耗材医嘱
+        for (AdviceSaveDto adviceDto : tempDeviceList) {
+            // 1. 构建耗材请求对象（DeviceRequest）并执行保存/更新
+            if (adviceDto.getRequestId() == null) {
+                adviceDto.setDbOpType(DbOpType.INSERT.getCode()); // 新增时设置操作类型
+            }else {
+                adviceDto.setDbOpType(DbOpType.UPDATE.getCode()); // 修改时设置操作类型
+            }
+            DeviceRequest deviceRequest = buildDeviceRequest(adviceDto, curDate);
+            iDeviceRequestService.saveOrUpdate(deviceRequest);
+
+            // 2. 同步处理耗材发放：根据操作类型（新增/修改）执行发放逻辑
+            iDeviceDispenseService.handleDeviceDispense(deviceRequest, adviceDto.getDbOpType());
+
+            // 3. 构建费用项对象（ChargeItem）并执行保存/更新
+            ChargeItem chargeItem = buildChargeItem(adviceDto, deviceRequest, curDate);
+            iChargeItemService.saveOrUpdate(chargeItem);
+        }
+    }
+
+    /**
+     * 构建耗材请求对象（DeviceRequest）
+     * 功能：将医嘱DTO（AdviceSaveDto）的属性映射到耗材请求实体，设置默认状态和业务编号
+     *
+     * @param adviceDto 耗材医嘱DTO（含请求参数）
+     * @param curDate   当前操作时间
+     * @return DeviceRequest 构建完成的耗材请求实体
+     */
+    private DeviceRequest buildDeviceRequest(AdviceSaveDto adviceDto, Date curDate) {
+        DeviceRequest deviceRequest = new DeviceRequest();
+
+        // 基础配置：主键、状态、业务编号
+        deviceRequest.setId(adviceDto.getRequestId()); // 主键ID（新增为null，修改为已有ID）
+        deviceRequest.setStatusEnum(RequestStatus.ACTIVE.getValue()); // 划价时直接签发，状态为"激活"
+        // 按日生成业务编号：前缀+4位序列号（确保每日唯一）
+        deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), DEVICE_RES_NO_SEQ_LENGTH));
+        deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源：医生处方
+
+        // 业务属性映射：从DTO映射到实体
+        deviceRequest.setQuantity(adviceDto.getQuantity());          // 请求数量
+        deviceRequest.setUnitCode(adviceDto.getUnitCode());          // 单位编码
+        deviceRequest.setLotNumber(adviceDto.getLotNumber());        // 产品批号
+        deviceRequest.setCategoryEnum(adviceDto.getCategoryEnum());  // 请求类型（枚举）
+        deviceRequest.setDeviceDefId(adviceDto.getAdviceDefinitionId()); // 耗材定义ID
+        deviceRequest.setPatientId(adviceDto.getPatientId());        // 患者ID
+        deviceRequest.setRequesterId(adviceDto.getPractitionerId()); // 开方医生ID
+        deviceRequest.setOrgId(adviceDto.getFounderOrgId());         // 开方人科室ID
+        deviceRequest.setReqAuthoredTime(curDate);                   // 请求开始时间
+        deviceRequest.setPerformLocation(adviceDto.getLocationId()); // 发放耗材房ID
+        deviceRequest.setEncounterId(adviceDto.getEncounterId());    // 就诊ID
+        deviceRequest.setPackageId(adviceDto.getPackageId());        // 组套ID
+        deviceRequest.setContentJson(adviceDto.getContentJson());    // 请求内容JSON（扩展信息）
+        deviceRequest.setYbClassEnum(adviceDto.getYbClassEnum());    // 医保类别编码
+        deviceRequest.setConditionId(adviceDto.getConditionId());    // 诊断ID
+        deviceRequest.setEncounterDiagnosisId(adviceDto.getEncounterDiagnosisId()); // 就诊诊断ID
+
+        return deviceRequest;
+    }
+
+    /**
+     * 构建费用项对象（ChargeItem）
+     * 功能：关联耗材请求实体和医嘱DTO，映射费用相关属性，设置默认状态和业务编号
+     *
+     * @param adviceDto        耗材医嘱DTO（含费用参数）
+     * @param deviceRequest    已保存的耗材请求实体（关联服务ID）
+     * @param curDate          当前操作时间
+     * @return ChargeItem 构建完成的费用项实体
+     */
+    private ChargeItem buildChargeItem(AdviceSaveDto adviceDto, DeviceRequest deviceRequest,Date curDate) {
+        ChargeItem chargeItem = new ChargeItem();
+
+        // 基础配置：主键、状态、业务编号
+        chargeItem.setId(adviceDto.getChargeItemId()); // 费用项ID（新增为null，修改为已有ID）
+        chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 初始状态：草稿（未收费）
+        // 业务编号：费用项前缀+耗材请求编号（确保与耗材请求一一关联）
+        chargeItem.setBusNo(CHARGE_ITEM_BUS_NO_PREFIX.concat(deviceRequest.getBusNo()));
+        chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源：医生处方
+
+        // 业务属性映射：患者、就诊、定价相关信息
+        chargeItem.setPatientId(adviceDto.getPatientId());        // 患者ID
+        chargeItem.setContextEnum(adviceDto.getAdviceType());     // 费用类型（耗材）
+        chargeItem.setEncounterId(adviceDto.getEncounterId());    // 就诊ID
+        chargeItem.setDefinitionId(adviceDto.getDefinitionId());  // 费用定价ID
+        chargeItem.setDefDetailId(adviceDto.getDefinitionDetailId()); // 定价子表主键（明细定价）
+        chargeItem.setEntererId(adviceDto.getPractitionerId());   // 开立人ID（开方医生）
+        chargeItem.setRequestingOrgId(SecurityUtils.getLoginUser().getOrgId());            // 开立科室ID
+        chargeItem.setEnteredDate(curDate);                       // 开立时间
+        chargeItem.setServiceTable(SERVICE_TABLE_DEVICE_REQUEST); // 医疗服务类型（关联耗材请求表）
+        chargeItem.setServiceId(deviceRequest.getId());           // 医疗服务ID（关联耗材请求ID）
+        chargeItem.setProductTable(SERVICE_TABLE_DEVICE_REQUEST);// 产品所在表（耗材表）
+        chargeItem.setProductId(adviceDto.getAdviceDefinitionId());// 产品ID（耗材定义ID）
+        chargeItem.setAccountId(adviceDto.getAccountId());        // 关联账户ID（患者账户）
+        chargeItem.setConditionId(adviceDto.getConditionId());    // 诊断ID
+        chargeItem.setEncounterDiagnosisId(adviceDto.getEncounterDiagnosisId()); // 就诊诊断ID
+
+        // 费用核心属性：数量、单位、单价、总价
+        chargeItem.setQuantityValue(adviceDto.getQuantity()); // 数量（与耗材请求一致）
+        chargeItem.setQuantityUnit(adviceDto.getUnitCode());   // 单位（与耗材请求一致）
+        chargeItem.setUnitPrice(adviceDto.getUnitPrice());     // 单价（从DTO传入，已定价）
+        chargeItem.setTotalPrice(adviceDto.getTotalPrice());   // 总价（数量×单价，DTO已计算）
+
+        return chargeItem;
+    }
+
+    /**
+     * 划价入参校验
+     * 校验规则：1. 参数非空 2. 科室ID非空 3. 医嘱列表非空 4. 临时耗材库存校验
+     *
+     * @param regAdviceSaveParam 划价请求参数
+     * @return R<?> 校验结果（成功返回R.ok()，失败返回R.fail()）
+     */
+    private R<?> checkNurseBillingParam(RegAdviceSaveParam regAdviceSaveParam) {
+        // 1. 整体参数非空校验
+        if (regAdviceSaveParam == null) {
+            return R.fail("划价请求失败：未获取到有效请求数据，请重新提交");
+        }
+
+        // 2. 核心字段非空校验：患者住院科室ID
+        if (regAdviceSaveParam.getOrganizationId() == null) {
+            return R.fail("划价请求失败：患者住院科室信息缺失，请确认患者科室后重试");
+        }
+
+        // 3. 医嘱列表非空校验
+        List<RegAdviceSaveDto> adviceList = regAdviceSaveParam.getRegAdviceSaveList();
+        if (adviceList == null || adviceList.isEmpty()) {
+            return R.fail("划价请求失败：未选择任何待划价项目，请添加医嘱后提交");
+        }
+
+        // 4. 临时耗材库存校验：仅校验非删除、非诊疗活动的临时医嘱
+        List<AdviceSaveDto> needCheckInventoryList = adviceList.stream()
+                .filter(advice -> TherapyTimeType.TEMPORARY.getValue().equals(advice.getTherapyEnum())
+                        && !DbOpType.DELETE.getCode().equals(advice.getDbOpType())
+                        && !ItemType.ACTIVITY.getValue().equals(advice.getAdviceType()))
+                .collect(Collectors.toList());
+
+        // 调用工具类校验库存，返回非null则表示库存不足
+        String inventoryTip = adviceUtils.checkInventory(new ArrayList<>(needCheckInventoryList));
+        if (inventoryTip != null) {
+            // 库存提示已包含具体耗材名称和短缺数量，直接拼接操作建议
+            return R.fail("划价失败：" + inventoryTip + "，请联系库房确认库存或调整申请数量");
+        }
+
+        // 所有校验通过
+        return R.ok();
+    }
+
+    // ======================== 以下方法原代码未实现，保留接口方法签名 ========================
+
+    @Override
+    public R<?> getBillingListByEncounterId() {
+        // 功能：根据就诊ID查询划价列表（待实现）
+        return null;
+    }
+
+    @Override
+    public R<?> deleteInNurseBilling() {
+        // 功能：删除住院划价记录（待实现）
+//        List<AdviceSaveDto> deleteList
+        return null;
+    }
+
+    @Override
+    public R<?> addOrderBilling() {
+        // 功能：新增订单划价（待实现）
+        return null;
+    }
+
+    @Override
+    public R<?> deleteOrderBilling() {
+        // 功能：删除订单划价（待实现）
+        return null;
+    }
+
+    @Override
+    public R<?> updateOrderBilling() {
+        // 功能：修改订单划价（待实现）
+        return null;
+    }
+
+    @Override
+    public R<?> getOrderBillingByRequestId() {
+        // 功能：根据请求ID查询订单划价（待实现）
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
new file mode 100644
index 00000000..f388a7b0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/OrgDeviceStockTakeAppServiceImpl.java
@@ -0,0 +1,248 @@
+package com.openhis.web.inhospitalnursestation.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.exception.ServiceException;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.common.dto.UnitDto;
+import com.openhis.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService;
+import com.openhis.web.inhospitalnursestation.dto.OrgDeviceDto;
+import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryFromDto;
+import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
+import com.openhis.web.inhospitalnursestation.mapper.OrgDeviceStockTakeAppMapper;
+import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.mapper.InventoryItemMapper;
+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 org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 科室耗材盘点 应用实现类
+ *
+ * @author wuyan
+ * @date 2025/11/05
+ */
+@Service
+public class OrgDeviceStockTakeAppServiceImpl implements IOrgDeviceStockTakeAppService {
+
+    @Resource
+    private OrgDeviceStockTakeAppMapper orgDeviceStockTakeAppMapper;
+
+    @Resource
+    private IInventoryItemService inventoryItemService;
+
+    @Resource
+    private ISupplyRequestService supplyRequestService;
+
+    @Resource
+    private ISupplyDeliveryService supplyDeliveryService;
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private IDeviceDispenseService deviceDispenseService;
+
+    @Resource
+    private InventoryItemMapper inventoryItemMapper;
+
+    /**
+     * 查询科室耗材汇总
+     *
+     * @param orgDeviceSummaryParam 查询条件
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求
+     * @return 科室耗材汇总单
+     */
+    @Override
+    public R<?> getOrgDeviceSummaryFromPage(OrgDeviceSummaryParam orgDeviceSummaryParam, String startTime,
+        String endTime, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        pageSize = Integer.MAX_VALUE;
+
+        QueryWrapper<OrgDeviceDto> queryWrapper = HisQueryUtils.buildQueryWrapper(orgDeviceSummaryParam, searchKey,
+            new HashSet<>(List.of(CommonConstants.FieldName.ItemName)), request);
+        if (!(startTime == null || endTime == null)) {
+            queryWrapper.between(CommonConstants.FieldName.ApplyTime, LocalDate.parse(startTime),
+                LocalDate.parse(endTime));
+        }
+
+        Page<OrgDeviceDto> orgDeviceDtoPage =
+            orgDeviceStockTakeAppMapper.selectOrgDeviceInfo(new Page<>(pageNo, pageSize), queryWrapper);
+
+        List<OrgDeviceDto> orgDeviceList =
+            new ArrayList<>(orgDeviceDtoPage.getRecords()).stream().filter(x -> x.getDispenseId() != null).toList();
+
+        // 根据项目id + 批次号 + 库房号分组
+        Map<String, List<OrgDeviceDto>> orgDeviceGroupBy =
+            orgDeviceList.stream().collect(Collectors.groupingBy(item -> item.getItemId() + CommonConstants.Common.DASH
+                + item.getLotNumber() + CommonConstants.Common.DASH + item.getSourceLocationId()));
+
+        ArrayList<OrgDeviceSummaryFromDto> orgDeviceSummaryFromDtoList = new ArrayList<>();
+
+        orgDeviceGroupBy.forEach((k, v) -> {
+            OrgDeviceSummaryFromDto orgDeviceSummaryFromDto = new OrgDeviceSummaryFromDto();
+
+            String itemId = k.split(CommonConstants.Common.DASH)[0];
+            String lotNumber = k.split(CommonConstants.Common.DASH)[1];
+            String sourceLocationId = k.split(CommonConstants.Common.DASH)[2];
+
+            OrgDeviceDto orgDeviceDtoFirst = v.get(0);
+            // 拆零比例
+            BigDecimal partPercent = orgDeviceDtoFirst.getPartPercent();
+            // 最小单位
+            String minUnitCode = orgDeviceDtoFirst.getMinUnitCode();
+            // 常规单位
+            String unitCode = orgDeviceDtoFirst.getMaxUnitCode();
+            if (minUnitCode == null || unitCode == null || partPercent == null) {
+                throw new ServiceException("耗材信息有误,请联系管理员");
+            }
+
+            List<Long> dispenseIdList = new ArrayList<>();
+
+            // 最小单位数量
+            BigDecimal minQuantity = BigDecimal.ZERO;
+            for (OrgDeviceDto orgDeviceDto : v) {
+                BigDecimal quantity = orgDeviceDto.getQuantity();
+                if (unitCode.equals(orgDeviceDto.getUnitCode())) {
+                    // 转换为小单位进行累加
+                    quantity = orgDeviceDto.getQuantity().multiply(partPercent);
+                }
+                minQuantity = minQuantity.add(quantity);
+                dispenseIdList.add(orgDeviceDto.getDispenseId());
+            }
+
+            List<UnitDto> unitList = new ArrayList<>();
+            UnitDto unitDto = new UnitDto();
+            // 单位列表
+            unitDto.setUnitCode(orgDeviceDtoFirst.getUnitCode()).setMinUnitCode(minUnitCode);
+            unitList.add(unitDto);
+
+            orgDeviceSummaryFromDto.setItemId(Long.valueOf(itemId)) // 器材id
+                .setName(orgDeviceDtoFirst.getItemName()) // 器材名称
+                .setTotalVolume(orgDeviceDtoFirst.getTotalVolume()) // 规格
+                .setManufacturer(orgDeviceDtoFirst.getManufacturer()) // 厂家
+                .setLotNumber(lotNumber) // 批号
+                .setUnitPrice(orgDeviceDtoFirst.getUnitPrice()) // 单价
+                .setDispenseQuantity(minQuantity) // 发放数量
+                .setUnitCode(orgDeviceDtoFirst.getUnitCode()) // 单位
+                .setMinUnitCode(minUnitCode) // 最小单位
+                .setPartPercent(partPercent) // 拆零比
+                .setUnitCode_dictText(orgDeviceDtoFirst.getUnitCode_dictText()) // 单位文字
+                .setSourceLocationId(Long.valueOf(sourceLocationId)) // 发放地点
+                .setDispenseIdList(dispenseIdList) // 发放id列表
+                .setUnitList(unitList); // 单位列表
+
+            orgDeviceSummaryFromDtoList.add(orgDeviceSummaryFromDto);
+        });
+
+        List<Long> itemIdList = orgDeviceSummaryFromDtoList.stream().map(OrgDeviceSummaryFromDto::getItemId).toList();
+        List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemIdList(itemIdList, 1);
+        for (InventoryItem inventoryItem : inventoryItemList)
+            for (OrgDeviceSummaryFromDto orgDeviceSummaryFromDto : orgDeviceSummaryFromDtoList)
+                if (orgDeviceSummaryFromDto.getItemId().equals(inventoryItem.getItemId())
+                    && orgDeviceSummaryFromDto.getLotNumber().equals(inventoryItem.getLotNumber())
+                    && orgDeviceSummaryFromDto.getSourceLocationId().equals(inventoryItem.getLocationId())) {
+                    // 库存数量
+                    orgDeviceSummaryFromDto.setQuantity(inventoryItem.getQuantity());
+                    // 库存id
+                    orgDeviceSummaryFromDto.setInventoryItemId(inventoryItem.getId());
+                }
+
+        return R.ok(orgDeviceSummaryFromDtoList);
+    }
+
+    /**
+     * 科室耗材汇总
+     *
+     * @return 科室耗材汇总单
+     */
+    @Override
+    public R<?> orgDeviceSummary(OrgDeviceSummaryParam orgDeviceSummaryParam) {
+        // 申请时间
+        Date now = DateUtils.getNowDate();
+        // 申请人
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 汇总单据号
+        String busNo = assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_SUMMARY_NO.getPrefix(), 4);
+
+        // 数量
+        BigDecimal stockTakeQuantity = orgDeviceSummaryParam.getStockTakeQuantity();
+        // 使用单位
+        String useUnitCode = orgDeviceSummaryParam.getUseUnitCode();
+        // 最小单位
+        String minUnitCode = orgDeviceSummaryParam.getMinUnitCode();
+        // 拆零比
+        BigDecimal partPercent = orgDeviceSummaryParam.getPartPercent();
+        // 发放id列表
+        List<Long> dispenseIdList = orgDeviceSummaryParam.getDispenseIdList();
+
+        if (orgDeviceSummaryParam.getInventoryItemId() == null) {
+            return R.ok("未匹配到库存");
+        }
+        List<InventoryItem> inventoryItemList = new ArrayList<>();
+        // 获取库存信息
+        InventoryItem inventoryItem = inventoryItemMapper.selectById(orgDeviceSummaryParam.getInventoryItemId());
+        if (inventoryItem != null) {
+            if (PublicationStatus.ACTIVE.getValue().equals(inventoryItem.getInventoryStatusEnum())) {
+                // 库存数量判定
+                if (useUnitCode.equals(inventoryItem.getUnitCode())) {
+                    // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                    BigDecimal quantity = inventoryItem.getQuantity().subtract(stockTakeQuantity);
+                    // 库存数量判定
+                    if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                        // 库存数量不足
+                        return R.fail("当前库存数量不足");
+                    } else {
+                        inventoryItem.setQuantity(quantity);
+                    }
+                } else {
+                    // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                    BigDecimal quantity = inventoryItem.getQuantity().subtract(partPercent.multiply(stockTakeQuantity));
+                    // 库存数量判定
+                    if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                        // 库存数量不足
+                        return R.fail("当前库存数量不足");
+                    } else {
+                        inventoryItem.setQuantity(quantity);
+                    }
+                }
+                inventoryItemList.add(inventoryItem);
+            }
+            // 库存更新
+            inventoryItemService.updateBatchById(inventoryItemList);
+            // 添加汇总单
+            Long supplyRequestId = supplyRequestService.createDeviceSummarySupplyRequest(
+                orgDeviceSummaryParam.getItemId(), orgDeviceSummaryParam.getSourceLocationId(),
+                orgDeviceSummaryParam.getLotNumber(), stockTakeQuantity, minUnitCode, practitionerId, now, busNo);
+            supplyDeliveryService.createDeviceSummarySupplyDelivery(orgDeviceSummaryParam.getItemId(),
+                orgDeviceSummaryParam.getLotNumber(), stockTakeQuantity, minUnitCode, supplyRequestId);
+
+            // 耗材发放状态更新
+            deviceDispenseService.updateDispenseStatusSummarized(dispenseIdList, busNo);
+            return R.ok("盘点成功");
+        }
+        return R.fail("未找到对应库存数据");
+    }
+
+}
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
index 013282e2..c62aa97e 100644
--- 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
@@ -85,6 +85,17 @@ public class ATDManageController {
         return atdManageAppService.getAdmissionPatientInfo(encounterId);
     }
 
+    /**
+     * 住院患者待处理信息列表
+     *
+     * @param encounterId 住院id
+     * @return 待处理信息列表
+     */
+    @GetMapping(value = "/patient-pending")
+    public R<?> getInPatientPendingList(Long encounterId) {
+        return atdManageAppService.getInPatientPendingList(encounterId);
+    }
+
     /**
      * 入科床位分配
      *
@@ -95,4 +106,26 @@ public class ATDManageController {
     public R<?> admissionBedAssignment(@RequestBody AdmissionPatientInfoDto admissionPatientInfoDto) {
         return atdManageAppService.admissionBedAssignment(admissionPatientInfoDto);
     }
+
+    /**
+     * 转科
+     *
+     * @param encounterId 住院id
+     * @return 结果
+     */
+    @PutMapping(value = "/transfer-department")
+    public R<?> transferDepartment(Long encounterId) {
+        return atdManageAppService.transferDepartment(encounterId);
+    }
+
+    /**
+     * 出院
+     *
+     * @param encounterId 住院id
+     * @return 结果
+     */
+    @PutMapping(value = "/hospital-discharge")
+    public R<?> hospitalDischarge(Long encounterId) {
+        return atdManageAppService.hospitalDischarge(encounterId);
+    }
 }
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
index c7703b1e..eaec376b 100644
--- 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
@@ -107,7 +107,7 @@ public class AdviceProcessController {
      * @param adviceExecuteParam 取消执行参数
      * @return 操作结果
      */
-    @PostMapping(value = "/advice-cancel")
+    @PutMapping(value = "/advice-cancel")
     public R<?> adviceCancel(@RequestBody AdviceExecuteParam adviceExecuteParam) {
         return adviceProcessAppService.adviceCancel(adviceExecuteParam);
     }
@@ -118,8 +118,8 @@ public class AdviceProcessController {
      * @param adviceExecuteParam 不执行参数
      * @return 操作结果
      */
-    @PostMapping(value = "/advice-void")
-    public R<?> adviceVoid(AdviceExecuteParam adviceExecuteParam) {
+    @PutMapping(value = "/advice-void")
+    public R<?> adviceVoid(@RequestBody AdviceExecuteParam adviceExecuteParam) {
         return adviceProcessAppService.adviceVoid(adviceExecuteParam);
     }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java
index 4d8ccd7f..8b835c8a 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/MedicineSummaryController.java
@@ -5,12 +5,12 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
-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 com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
+import com.openhis.web.inhospitalnursestation.dto.DispenseFormSearchParam;
+import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,64 +28,74 @@ import lombok.extern.slf4j.Slf4j;
 public class MedicineSummaryController {
 
     @Resource
-    public IMedicineSummaryAppService medicineCollectionService;
+    public IMedicineSummaryAppService medicineSummaryAppService;
 
     /**
-     * 分页查询在科病人列表
+     * 查询发药单信息
      *
-     * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
+     * @param dispenseFormSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
-     * @param request 请求数据
-     * @return 发药病人列表
+     * @param request 请求
+     * @return 发药单信息
      */
-    @GetMapping("/encounter-list")
-    public R<?> getEncounterInfoList(InpatientMedicineSearchParam searchParam, String searchKey,
+    @GetMapping(value = "/dispensing-form")
+    public R<?> getMedicineDispenseFormPage(DispenseFormSearchParam dispenseFormSearchParam,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return medicineCollectionService.getEncounterInfoListPage(searchParam, searchKey, pageNo, pageSize, request);
+        return medicineSummaryAppService.getMedicineDispenseFormPage(dispenseFormSearchParam, pageNo, pageSize,
+            request);
     }
 
     /**
-     * 医嘱查询
+     * 查询药品汇总单
      *
-     * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
+     * @param dispenseFormSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
-     * @param request 请求数据
+     * @param searchKey 模糊查询关键字
+     * @param request 请求
+     * @return 药品汇总单
      */
-    @GetMapping("/advice-list")
-    public R<?> getPatientInfoList(InpatientMedicineSearchParam searchParam, String searchKey,
+    @GetMapping(value = "/summary-form")
+    public R<?> getMedicineSummaryFormPage(DispenseFormSearchParam dispenseFormSearchParam,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return medicineCollectionService.getPrescriptionInfo(searchParam, searchKey, pageNo, pageSize, request);
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, String searchKey,
+        HttpServletRequest request) {
+        return medicineSummaryAppService.getMedicineSummaryFormPage(dispenseFormSearchParam, pageNo, pageSize,
+            searchKey, request);
     }
 
     /**
-     * 显示汇总发药单（生成之前的确认，此刻还没生成汇总单）
+     * 查询药品汇总单详情
      *
-     * @param searchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @return 处理结果
+     * @param summaryNo 汇总单号
+     * @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);
+    @GetMapping(value = "/summary-form-detail")
+    public R<?> getMedicineSummaryFormDetail(String summaryNo) {
+        return medicineSummaryAppService.getMedicineSummaryFormDetail(summaryNo);
     }
 
     /**
      * 生成汇总发药单
      *
-     * @param prescriptionInfo 汇总发药单
+     * @param medicineSummaryParamList 汇总发药申请参数
      * @return 处理结果
      */
     @PostMapping("/medicine-summary")
-    public R<?> medicineSummary(@RequestBody List<InpatientMedicinePrescriptionInfoDto> prescriptionInfo) {
-        return medicineCollectionService.medicineSummary(prescriptionInfo);
+    public R<?> medicineSummary(@RequestBody List<MedicineSummaryParam> medicineSummaryParamList) {
+        return medicineSummaryAppService.medicineSummary(medicineSummaryParamList);
+    }
+
+    /**
+     * 取消汇总
+     *
+     * @param summaryNo 汇总单号
+     * @return 处理结果
+     */
+    @PutMapping("/cancel-summary")
+    public R<?> cancelSummary(String summaryNo) {
+        return medicineSummaryAppService.cancelSummary(summaryNo);
     }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java
new file mode 100644
index 00000000..5895906a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/NurseBillingController.java
@@ -0,0 +1,69 @@
+package com.openhis.web.inhospitalnursestation.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.dto.RegAdviceSaveParam;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author whm
+ * @date 2025/11/10 16:00
+ * @description 住院护士 患者划价、医嘱计费
+ */
+
+@RestController
+@RequestMapping("/inhospitalnursestation/innursebilling")
+@Slf4j
+@AllArgsConstructor
+public class NurseBillingController {
+    // TODO: Implement InNurseBillingController
+    /*
+     * 新增住院护士划价
+     * @return
+     */
+    public R<?> addInNurseBilling(RegAdviceSaveParam regAdviceSaveParam) {
+        return R.ok();
+    }
+    /*
+     * 住院护士 划价列表 根据护士encounterId查询
+     * @return
+     */
+    public  R<?> getBillingListByEncounterId() {
+        return R.ok();
+    }
+    /*
+     * 住院护士撤销划价
+     * @return
+     */
+    public  R<?> deleteInNurseBilling() {
+        return R.ok();
+    }
+    /*
+     * 医嘱计费添加 诊疗 耗材
+     */
+    public  R<?> addOrderBilling() {
+        return R.ok();
+    }
+    /*
+     * 医嘱计费删除 诊疗 耗材
+     */
+    public  R<?> deleteOrderBilling() {
+        return R.ok();
+    }
+    /*
+     * 医嘱计费修改 诊疗 耗材
+     */
+    public  R<?> updateOrderBilling() {
+        return R.ok();
+    }
+    /*
+     根据医嘱id查询已计费的 耗材列表
+     * @return
+     */
+    public  R<?> getOrderBillingByRequestId() {
+        return R.ok();
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
new file mode 100644
index 00000000..97f10e2c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/OrgDeviceStockTakeController.java
@@ -0,0 +1,59 @@
+package com.openhis.web.inhospitalnursestation.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inhospitalnursestation.appservice.IOrgDeviceStockTakeAppService;
+import com.openhis.web.inhospitalnursestation.dto.OrgDeviceSummaryParam;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 科室耗材盘点
+ *
+ * @author wuyan
+ * @date 2025/11/05
+ */
+@RestController
+@RequestMapping("/nurse-station/orgdevice-stocktake")
+@Slf4j
+@AllArgsConstructor
+public class OrgDeviceStockTakeController {
+
+    @Resource
+    private IOrgDeviceStockTakeAppService orgDeviceStockTakeService;
+
+    /**
+     * 查询科室耗材汇总
+     *
+     * @param orgDeviceSummaryParam 查询条件
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求
+     * @return 科室耗材汇总单
+     */
+    @GetMapping(value = "/summary-from")
+    public R<?> getOrgDeviceSummaryFromPage(OrgDeviceSummaryParam orgDeviceSummaryParam, String startTime,
+        String endTime, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, String searchKey,
+        HttpServletRequest request) {
+        return orgDeviceStockTakeService.getOrgDeviceSummaryFromPage(orgDeviceSummaryParam, startTime, endTime, pageNo,
+            pageSize, searchKey, request);
+    }
+
+    /**
+     * 科室耗材汇总
+     *
+     * @return 科室耗材汇总单
+     */
+    @PutMapping(value = "/orgdevice-summary")
+    public R<?> orgDeviceSummary(OrgDeviceSummaryParam orgDeviceSummaryParam) {
+        return orgDeviceStockTakeService.orgDeviceSummary(orgDeviceSummaryParam);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
index 9a2456fc..23cac9a2 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
@@ -25,6 +25,12 @@ public class AdviceExecuteDetailParam {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long requestId;
 
+    /** 就诊Id */
+    private Long encounterId;
+
+    /** 患者Id */
+    private Long patientId;
+
     /** 账号id */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long accountId;
@@ -39,6 +45,9 @@ public class AdviceExecuteDetailParam {
     /** 医嘱请求所在表 */
     private String adviceTable;
 
+    /** 组号 */
+    private Long groupId;
+
     /** 执行时间点集合 */
     private List<String> executeTimes;
 
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/DispenseFormSearchParam.java
similarity index 59%
rename from openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineSearchParam.java
rename to openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
index bdf0bd3b..c4406c15 100644
--- 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/DispenseFormSearchParam.java
@@ -5,7 +5,6 @@ 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;
@@ -16,35 +15,34 @@ import lombok.experimental.Accessors;
 /**
  * 患者列表查询条件
  *
- * @author yuxj
+ * @author zwh
  * @date 2025-06-03
  */
 @Data
 @Accessors(chain = true)
-public class InpatientMedicineSearchParam implements Serializable {
+public class DispenseFormSearchParam implements Serializable {
 
-    /** 科室 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long organizationId;
+    /** 汇总状态 */
+    private Integer SummaryStatus;
+
+    /** 中药标识 */
+    private Integer tcmFlag;
 
     /** 医嘱类型 */
-    private Integer  therapyEnum;
+    private Integer therapyEnum;
 
-    /**
-     * 领药至哪天
-     * */
-    private Date plannedDispenseTime;
-
-    /** 就诊id */
+    /** 就诊ids */
     @JsonSerialize(using = ToStringSerializer.class)
-    private List<Long> encounterIdList;
+    private String encounterIds;
 
-    /** 发放id */
+    /** 发放药房id */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long dispenseId;
+    private Long locationId;
 
-    /**
-     * 项目表
-     */
-    private String itemTable;
+    /** 执行时间 */
+    private Date exeTime;
+
+    /** 汇总人id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
 }
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
index 3a363cc2..3b11a4d8 100644
--- 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
@@ -3,8 +3,6 @@
  */
 package com.openhis.web.inhospitalnursestation.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java
deleted file mode 100644
index 7a4f4c91..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineEncounterInfoDto.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 就诊人员列表
- *
- * @author yuxj
- * @date 2025-06-03
- */
-@Data
-@Accessors(chain = true)
-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;
-
-    /** 生日 */
-    private Date birthDate;
-
-    /** 年龄 */
-    private String age;
-
-    /** 床位 */
-    private String inpatientBed;
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java
deleted file mode 100644
index 77586762..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicineInitDto.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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
- *
- * @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;
-
-    @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/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java
deleted file mode 100644
index 634ec378..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientMedicinePrescriptionInfoDto.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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/MedicineDispenseFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
new file mode 100644
index 00000000..be201efb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
@@ -0,0 +1,177 @@
+/*
+ * 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.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 zwh
+ * @date 2025-10-17
+ */
+@Data
+@Accessors(chain = true)
+public class MedicineDispenseFormDto {
+
+    /** 住院患者id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 诊断定义名称
+     */
+    private String conditionDefinitionName;
+
+    /**
+     * 分组id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long groupId;
+
+    /**
+     * 医嘱id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long adviceId;
+
+    /** 医嘱名称 */
+    private String adviceName;
+
+    /**
+     * 项目id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /**
+     * 规格
+     */
+    private String volume;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 请求数量 */
+    private Integer quantity;
+
+    /** 请求单位编码 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 是否皮试 */
+    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 chineseHerbsDoseQuantity;
+
+    /**
+     * 代煎标识 | 0:否 , 1:是
+     */
+    private Integer sufferingFlag;
+
+    /**
+     * 中药标识 | 0:否 , 1:是
+     */
+    private Integer tcmFlag;
+
+    /**
+     * 排序号
+     */
+    private Integer sortNumber;
+
+    /** 医嘱类型 */
+    private Integer therapyEnum;
+    private String therapyEnum_enumText;
+
+    /** 住院号 */
+    private String BusNo;
+
+    /** 患者名称 */
+    private String patientName;
+
+    /** 床位名称 */
+    private String bedName;
+
+    /** 性别 */
+    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;
+
+    /** 汇总参数list */
+    List<MedicineSummaryParam> medicineSummaryParamList;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
new file mode 100644
index 00000000..6ce49de4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
@@ -0,0 +1,56 @@
+/*
+ * 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 lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 汇总单dto
+ *
+ * @author zwh
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class MedicineSummaryFormDto {
+
+    /** 汇总单号 */
+    private String busNo;
+
+    /** 汇总人id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+
+    /** 汇总人 */
+    private String applicantName;
+
+    /** 领药人id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long receiverId;
+
+    /** 领药人 */
+    private String receiverName;
+
+    /** 汇总时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 发放状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 发放药房 */
+    private String locationName;
+
+    /** 发放时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private String dispenseTime;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
new file mode 100644
index 00000000..c08c1c6b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inhospitalnursestation.dto;
+
+import java.math.BigDecimal;
+
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 汇总药品信息dto
+ *
+ * @author zwh
+ * @date 2025-06-03
+ */
+@Data
+@Accessors(chain = true)
+public class MedicineSummaryInfoDto {
+
+    /**
+     * 项目名
+     */
+    private String itemName;
+
+    /**
+     * 请求数量
+     */
+    private Integer itemQuantity;
+
+    /**
+     * 请求单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /**
+     * 批号
+     */
+    private String lotNumber;
+
+    /**
+     * 规格
+     */
+    private String totalVolume;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /**
+     * 包装单位
+     */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java
new file mode 100644
index 00000000..c7da6415
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java
@@ -0,0 +1,53 @@
+/*
+ * 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 lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品汇总参数
+ *
+ * @author zwh
+ * @date 2025-10-21
+ */
+@Data
+@Accessors(chain = true)
+public class MedicineSummaryParam {
+
+    /**
+     * 领药时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dispenseTime;
+
+    /**
+     * 发放id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /**
+     * 执行id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long procedureId;
+
+    /**
+     * 发放状态
+     */
+    private Integer dispenseStatus;
+
+    /**
+     * 领药人id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long receiverId;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java
new file mode 100644
index 00000000..aa041dab
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java
@@ -0,0 +1,95 @@
+package com.openhis.web.inhospitalnursestation.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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 科室耗材dto
+ *
+ * @author wuyan
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class OrgDeviceDto {
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 供应请求id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long requestId;
+
+    /** 供应发放id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dispenseId;
+
+    /** 项目名 */
+    private String itemName;
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 批号 */
+    private String lotNumber;
+
+    /** 请求数 */
+    private BigDecimal quantity;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** 常规单位 */
+    @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 requesterId;
+    private String requesterName;
+
+    /** 厂家 */
+    private String manufacturer;
+
+    /** 申请时间 */
+    private Date applyTime;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
new file mode 100644
index 00000000..1ec942ea
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
@@ -0,0 +1,75 @@
+package com.openhis.web.inhospitalnursestation.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.common.dto.UnitDto;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 科室耗材汇总dto
+ *
+ * @author wuyan
+ * @date 2025-11-05
+ */
+@Data
+@Accessors(chain = true)
+public class OrgDeviceSummaryFromDto {
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 器材名称 */
+    private String name;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 厂家 */
+    private String manufacturer;
+
+    /** 批号 */
+    private String lotNumber;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** 发放数量 */
+    private BigDecimal dispenseQuantity;
+
+    /** 库存数量 */
+    private BigDecimal quantity;
+
+    /** 单位 */
+    @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;
+
+    /** 发放地点 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+
+    /** 库存id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inventoryItemId;
+
+    /** 发放id列表 */
+    private List<Long> dispenseIdList;
+
+    /** 单位列表 */
+    private List<UnitDto> unitList;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
new file mode 100644
index 00000000..67ce3349
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
@@ -0,0 +1,59 @@
+package com.openhis.web.inhospitalnursestation.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.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 科室耗材参数
+ *
+ * @author wuayn
+ * @date 2025-11-07
+ */
+@Data
+@Accessors(chain = true)
+public class OrgDeviceSummaryParam {
+
+    /** 项目id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 库存id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inventoryItemId;
+
+    /** 发放数量 */
+    private BigDecimal dispenseQuantity;
+
+    /** 盈亏数量 */
+    private BigDecimal stockTakeQuantity;
+
+    /** 批号 */
+    private String lotNumber;
+
+    /** 发放地点 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+
+    /** 使用单位 */
+    @Dict(dictCode = "unit_code")
+    private String useUnitCode;
+    private String useUnitCode_dictText;
+
+    /** 最小单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 发放id列表 */
+    private List<Long> dispenseIdList;
+
+}
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
deleted file mode 100644
index ad0bc00e..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/InpatientMedicineCollectionMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
new file mode 100644
index 00000000..e9ff5085
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
@@ -0,0 +1,67 @@
+/*
+ * 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.DispenseFormSearchParam;
+import com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto;
+import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto;
+import com.openhis.web.inhospitalnursestation.dto.MedicineSummaryInfoDto;
+
+@Repository
+public interface MedicineSummaryAppMapper {
+
+    /**
+     * 查询领药列表
+     *
+     * @param page 分页信息
+     * @param queryWrapper 查询条件
+     * @param completed 医嘱状态：已完成
+     * @param active 住院位置状态：使用中
+     * @param bed 位置类型：病床
+     * @param admittingDoctor 住院医生
+     * @param personalCashAccount 个人现金账户
+     * @param billable 收费状态：待结算
+     * @param billed 收费状态：已结算
+     * @param refunded 收费状态：已退费
+     * @param summarized 发药状态：已汇总
+     * @return 领药列表
+     */
+    Page<MedicineDispenseFormDto> selectMedicineDispenseFormPage(@Param("page") Page<MedicineDispenseFormDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<DispenseFormSearchParam> queryWrapper,
+        @Param("completed") Integer completed, @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("summarized") Integer summarized);
+
+    /**
+     * 查询汇总单分页列表
+     *
+     * @param page 分页信息
+     * @param queryWrapper 查询条件
+     * @param completed 发药状态：已完成
+     * @param inProgress 发药状态：待发药
+     * @param summaryDispense 单据类型：汇总发药
+     * @return 汇总单列表
+     */
+    Page<MedicineSummaryFormDto> selectMedicineSummaryFormPage(@Param("page") Page<MedicineSummaryFormDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<DispenseFormSearchParam> queryWrapper,
+        @Param("completed") Integer completed, @Param("inProgress") Integer inProgress,
+        @Param("summaryDispense") Integer summaryDispense);
+
+    /**
+     * 获取汇总单详情
+     *
+     * @param summaryNo 汇总单号
+     * @return 汇总单详情
+     */
+    List<MedicineSummaryInfoDto> selectMedicineSummaryFormDetail(@Param("summaryNo") String summaryNo);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
new file mode 100644
index 00000000..1bef006f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
@@ -0,0 +1,7 @@
+package com.openhis.web.inhospitalnursestation.mapper;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface NurseBillingAppMapper {
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
new file mode 100644
index 00000000..00e8d9a6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/OrgDeviceStockTakeAppMapper.java
@@ -0,0 +1,22 @@
+package com.openhis.web.inhospitalnursestation.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.inhospitalnursestation.dto.OrgDeviceDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OrgDeviceStockTakeAppMapper {
+
+    /**
+     * 科室耗材信息列表查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @return 科室耗材信息
+     */
+    Page<OrgDeviceDto> selectOrgDeviceInfo(@Param("page") Page<OrgDeviceDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<OrgDeviceDto> queryWrapper);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
new file mode 100644
index 00000000..e2d7513a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IInventoryAdjustPriceService.java
@@ -0,0 +1,60 @@
+package com.openhis.web.inventorymanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+
+/**
+ * Desc:
+ * 
+ * @Author raymond
+ * @Date 14:54 2025/10/23
+ * @return
+ **/
+public interface IInventoryAdjustPriceService {
+    /**
+     * Desc: 查询所有 未审核的调价单
+     * 
+     * @param adjustPriceManagerSearchParam
+     * @param pageNo
+     * @param pageSize
+     * @param searchKey
+     * @param request
+     * @Author raymond
+     * @Date 14:20 2025/10/23
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> getPageByExamineList(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * Desc: 根据业务单据号 进行审核通过操作
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 18:10 2025/10/18
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> updateExamineByApproved(String busNo);
+
+    /**
+     * Desc: 根据业务单据号 进行审核拒绝操作
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 19:17 2025/10/18
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> updateExamineByRejected(String busNo);
+
+    /**
+     * Desc: 初始化
+     * 
+     * @param
+     * @Author raymond
+     * @Date 19:22 2025/10/23
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> adjustPriceInit();
+}
diff --git a/openhis-server-new/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
index 2ce43aea..c7bae117 100644
--- a/openhis-server-new/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
@@ -3,14 +3,14 @@
  */
 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.LossReportFormDto;
 import com.openhis.web.inventorymanage.dto.LossReportSearchParam;
 
-import java.util.List;
-
 /**
  * 报损单 appService
  *
@@ -85,6 +85,7 @@ public interface ILossReportFormAppService {
      * @return 操作结果
      */
     R<?> withdrawApproval(String busNo);
+
     /**
      * 报损单据详情
      *
@@ -95,6 +96,6 @@ public interface ILossReportFormAppService {
      * @param pageSize 查询条数
      * @return 单据详情
      */
-    R<?> getMonthlySettlementDetail(Long locationId, String startTime, String endTime,Integer pageNo, Integer pageSize);
-
+    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/IProductDetailAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java
new file mode 100644
index 00000000..af35fcf5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailAppService.java
@@ -0,0 +1,76 @@
+package com.openhis.web.inventorymanage.appservice;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
+
+/**
+ * 库存商品明细 appService
+ *
+ * @author yuanzs
+ * @date 2025-04-24
+ */
+public interface IProductDetailAppService {
+
+    /**
+     * 库存商品明细初始化
+     *
+     * @return 下拉列表值
+     */
+    R<?> getInit();
+
+    /**
+     * 查询库存商品明细分页列表
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 库存商品明细分页列表
+     */
+    R<?> getProductDetailPage(ProductDetailSearchParam productDetailSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request);
+
+    /**
+     * 操作：停供
+     *
+     * @param inventoryId 库存项目管理ID
+     * @return 操作结果
+     */
+    R<?> stopSupplyById(Long inventoryId);
+
+    /**
+     * 操作：取消停供
+     *
+     * @param inventoryId 库存项目管理ID
+     * @return 操作结果
+     */
+    R<?> cancelSupplyById(Long inventoryId);
+
+
+    /**
+     * 库存明细表导出
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param response 响应数据
+     */
+    void makeExcelFile(ProductDetailSearchParam productDetailSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletRequest request, HttpServletResponse response);
+
+    /**
+     * 查询库存商品明细统计数据
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 库存商品明细统计数据
+     */
+    R<?> getProductDetailStatistics(ProductDetailSearchParam productDetailSearchParam, String searchKey, HttpServletRequest request);
+}
diff --git a/openhis-server-new/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
deleted file mode 100644
index 6314a42e..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/IProductDetailsAppService.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.openhis.web.inventorymanage.appservice;
-
-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
- *
- * @author yuanzs
- * @date 2025-04-24
- */
-public interface IProductDetailsAppService {
-
-    /**
-     * 库存商品明细初始化
-     *
-     * @return 下拉列表值
-     */
-    R<?> getInit();
-
-    /**
-     * 查询库存商品明细分页列表
-     *
-     * @param productDetailsSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 库存商品明细分页列表
-     */
-    R<?> getPage(ProductDetailsSearchParam productDetailsSearchParam, Integer pageNo, Integer pageSize,
-        String searchKey, HttpServletRequest request);
-
-    /**
-     * 查询库存商品明细分页列表合计
-     *
-     * @param productDetailsSearchParam 查询条件
-     * @param searchKey 模糊查询关键字
-     * @return 库存商品明细分页列表合计
-     */
-    R<?> getPageTotal(ProductDetailsSearchParam productDetailsSearchParam, String searchKey);
-    /**
-     * 操作：停供
-     *
-     * @param id 库存项目管理ID
-     * @return 操作结果
-     */
-    R<?> stopSupplyById(Long id);
-
-    /**
-     * 操作：取消停供
-     *
-     * @param id 库存项目管理ID
-     * @return 操作结果
-     */
-    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-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
new file mode 100644
index 00000000..a01a0ec4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/IInventoryAdjustPriceServiceImpl.java
@@ -0,0 +1,208 @@
+package com.openhis.web.inventorymanage.appservice.impl;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+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 org.springframework.transaction.annotation.Transactional;
+
+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.ChangePriceRecord;
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.dto.ChangePriceDataDto;
+import com.openhis.administration.service.IChangePriceRecordService;
+import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.administration.service.IChargeItemDefinitionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.ConditionCode;
+import com.openhis.common.enums.DelFlag;
+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.common.utils.RedisKeys;
+import com.openhis.common.utils.RedisUtil;
+import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import com.openhis.web.adjustprice.dto.ChangePricePageDto;
+import com.openhis.web.inventorymanage.appservice.IInventoryAdjustPriceService;
+import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.openhis.web.inventorymanage.dto.ReceiptInitDto;
+import com.openhis.web.inventorymanage.mapper.InventoryAdjustPriceMapper;
+
+/**
+ * @ClassName IInventoryAdjustPriceServiceImpl
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/23 14:57
+ * @Version 1.0
+ **/
+@Service
+public class IInventoryAdjustPriceServiceImpl implements IInventoryAdjustPriceService {
+    @Resource
+    private IChargeItemDefinitionService chargeItemDefinitionService;
+    @Resource
+    private IChargeItemDefDetailService chargeItemDefDetailService;
+    @Resource
+    private InventoryAdjustPriceMapper inventoryAdjustPriceMapper;
+    @Resource
+    private IChangePriceRecordService changePriceRecordService;
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Override
+    public R<?> getPageByExamineList(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 设置模糊查询的字段名
+        HashSet<String> searchFields = new HashSet<>();
+        searchFields.add(CommonConstants.FieldName.SupplyBusNo);
+
+        QueryWrapper<ReceiptApprovalSearchParam> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(adjustPriceManagerSearchParam, searchKey, searchFields, request);
+        // 查询单据分页列表
+        Page<ChangePricePageDto> receiptPage = inventoryAdjustPriceMapper.searchPageByExamine(
+            new Page<>(pageNo, pageSize), queryWrapper, SupplyStatus.APPROVAL.getValue(), SupplyStatus.AGREE.getValue(),
+            SupplyStatus.REJECT.getValue(), SupplyType.REQUEST_MEDICATION_CHANGE_PRICE.getValue(),
+            SupplyType.REQUEST_DEVICE_CHANGE_PRICE.getValue(), SupplyType.REQUEST_ACTIVITY_CHANGE_PRICE.getValue(),
+            SupplyType.REQUEST_HEALTH_CHANGE_PRICE.getValue());
+
+        receiptPage.getRecords().forEach(e -> {
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(SupplyStatus.class, e.getStatusEnum()));
+            // 调价类型
+            e.setCategoryEnum_enumText(EnumUtils.getInfoByValue(SupplyType.class, e.getItemCategoryEnum()));
+        });
+        return R.ok(receiptPage);
+    }
+
+    @Override
+    public R<?> updateExamineByRejected(String busNo) {
+        List<ChangePriceRecord> changePriceRecordList =
+            this.changePriceRecordService.searchChangePriceDataForBusNo(busNo);
+        if (changePriceRecordList.isEmpty()) {
+            return R.fail();
+        }
+        // 循环将数据进行填充
+        for (ChangePriceRecord data : changePriceRecordList) {
+            if (this.redisUtil.hasKey(RedisKeys.getProductsKey(data.getItemId().toString()))) {
+                this.redisUtil.del(RedisKeys.getProductsKey(data.getItemId().toString()));
+            }
+        }
+        this.changePriceRecordService.rejectRequest(busNo);
+
+        return R.ok();
+    }
+
+    @Override
+    public R<?> adjustPriceInit() {
+        ReceiptInitDto initDto = new ReceiptInitDto();
+        // 审批状态
+        List<ReceiptInitDto.supplyStatusOption> supplyStatusOptions = Stream.of(SupplyStatus.values())
+            .map(supplyStatus -> new ReceiptInitDto.supplyStatusOption(supplyStatus.getValue(), supplyStatus.getInfo()))
+            .collect(Collectors.toList());
+        initDto.setSupplyStatusOptions(supplyStatusOptions);
+        return R.ok(initDto);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> updateExamineByApproved(String busNo) {
+        List<ChangePriceRecord> changePriceRecordList =
+            this.changePriceRecordService.searchChangePriceDataForBusNo(busNo);
+        if (changePriceRecordList.isEmpty()) {
+            return R.fail();
+        }
+        // 循环将数据进行填充
+        for (ChangePriceRecord data : changePriceRecordList) {
+            if (this.redisUtil.hasKey(RedisKeys.getProductsKey(data.getItemId().toString()))) {
+                this.redisUtil.del(RedisKeys.getProductsKey(data.getItemId().toString()));
+            }
+        }
+        this.executeBusiness(busNo);
+        this.changePriceRecordService.agreeRequest(busNo, new Date());
+        return R.ok();
+    }
+
+    /**
+     * Desc: 处理审核通过后改价业务
+     *
+     * @Author raymond
+     * @Date 22:16 2025/10/18
+     * @return com.core.common.core.domain.R<?>
+     **/
+    public void executeBusiness(String busNo) {
+        List<ChangePriceDataDto> changePriceDataDtoList =
+            this.changePriceRecordService.searchChangePriceRecordDataByBusNo(busNo, SupplyStatus.APPROVAL.getValue());
+        // 零售价
+        List<ChargeItemDefDetail> itemDefDetailRetailList = new LinkedList<>();
+        // 进货价
+        List<ChargeItemDefDetail> itemDefDetailBuyingList = new LinkedList<>();
+        // 进货价
+        List<ChargeItemDefDetail> itemDefDetailPurchaseList = new LinkedList<>();
+        for (ChangePriceDataDto data : changePriceDataDtoList) {
+            // 更新价格主表信息
+            ChargeItemDefinition chargeItemDefinition = this.chargeItemDefinitionService.getById(data.getChargeId());
+            chargeItemDefinition.setPrice(data.getNewRetailPrice());
+            this.chargeItemDefinitionService.updateById(chargeItemDefinition);
+            // 零售价
+            List<ChargeItemDefDetail> defDetailRetailList =
+                this.chargeItemDefDetailService.searchChargeItemDefDetailByIds(chargeItemDefinition.getId(),
+                    ConditionCode.LOT_NUMBER_PRICE.getCode(), data.getLotNumber());
+            // 进货价
+            List<ChargeItemDefDetail> defDetailBuyingList =
+                this.chargeItemDefDetailService.searchChargeItemDefDetailByIds(chargeItemDefinition.getId(),
+                    ConditionCode.LOT_NUMBER_COST.getCode(), data.getLotNumber());
+            // 采购价
+            List<ChargeItemDefDetail> purchasePriceList = this.chargeItemDefDetailService
+                .searchChargeItemDefDetailByIds(chargeItemDefinition.getId(), ConditionCode.PURCHASE.getCode(), null);
+            if (!defDetailRetailList.isEmpty()) {
+                for (ChargeItemDefDetail detail : defDetailRetailList) {
+                    detail.setDeleteFlag(DelFlag.YES.getCode());
+                    this.chargeItemDefDetailService.deleteChargeItemDefApp(detail.getId());
+                }
+                ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
+                chargeItemDefDetail.setDefinitionId(data.getChargeId());
+                chargeItemDefDetail.setConditionCode(ConditionCode.LOT_NUMBER_PRICE.getCode());
+                chargeItemDefDetail.setConditionValue(data.getLotNumber());
+                chargeItemDefDetail.setAmount(data.getNewRetailPrice());
+                itemDefDetailRetailList.add(chargeItemDefDetail);
+            }
+            if (!defDetailBuyingList.isEmpty()) {
+                for (ChargeItemDefDetail detail : defDetailBuyingList) {
+                    detail.setDeleteFlag(DelFlag.YES.getCode());
+                    this.chargeItemDefDetailService.deleteChargeItemDefApp(detail.getId());
+                }
+                ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
+                chargeItemDefDetail.setDefinitionId(data.getChargeId());
+                chargeItemDefDetail.setConditionCode(ConditionCode.LOT_NUMBER_COST.getCode());
+                chargeItemDefDetail.setConditionValue(data.getLotNumber());
+                chargeItemDefDetail.setAmount(data.getNewBuyingPrice());
+                itemDefDetailBuyingList.add(chargeItemDefDetail);
+            }
+            if (!purchasePriceList.isEmpty()) {
+                for (ChargeItemDefDetail detail : purchasePriceList) {
+                    detail.setDeleteFlag(DelFlag.YES.getCode());
+                    this.chargeItemDefDetailService.deleteChargeItemDefApp(detail.getId());
+                }
+                ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
+                chargeItemDefDetail.setDefinitionId(data.getChargeId());
+                chargeItemDefDetail.setConditionCode(ConditionCode.PURCHASE.getCode());
+                chargeItemDefDetail.setAmount(data.getNewBuyingPrice());
+                itemDefDetailPurchaseList.add(chargeItemDefDetail);
+            }
+        }
+        // 批量插入价格子表
+        this.chargeItemDefDetailService.saveOrUpdateBatch(itemDefDetailRetailList);
+        this.chargeItemDefDetailService.saveOrUpdateBatch(itemDefDetailBuyingList);
+        this.chargeItemDefDetailService.saveOrUpdateBatch(itemDefDetailPurchaseList);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
new file mode 100644
index 00000000..3d411068
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
@@ -0,0 +1,450 @@
+package com.openhis.web.inventorymanage.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.core.common.utils.poi.ExcelUtil;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+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.core.domain.model.LoginUser;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.SecurityUtils;
+import com.core.web.util.TenantOptionUtil;
+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.YbChrgitmLv;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.inventorymanage.appservice.IProductDetailAppService;
+import com.openhis.web.inventorymanage.dto.ProductDetailInitDto;
+import com.openhis.web.inventorymanage.dto.ProductDetailPageDto;
+import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
+import com.openhis.web.inventorymanage.mapper.ProductDetailAppMapper;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.mapper.InventoryItemMapper;
+
+/**
+ * 库存商品明细 impl
+ *
+ * @author yuanzs
+ * @date 2025-04-24
+ */
+@Service
+public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper, InventoryItem>
+    implements IProductDetailAppService {
+
+    @Resource
+    private ProductDetailAppMapper productDetailsMapper;
+
+    @Resource
+    private IChargeItemDefDetailService chargeItemDefDetailService;
+
+    /**
+     * 库存商品明细初始化
+     *
+     * @return 下拉列表值
+     */
+    @Override
+    public R<?> getInit() {
+        ProductDetailInitDto productDetailInitDto = new ProductDetailInitDto();
+        // 医保等级List
+        List<ProductDetailInitDto.statusEnumOption> chrgitmLvOptions = Stream.of(InsuranceLevel.values())
+            .map(status -> new ProductDetailInitDto.statusEnumOption(status.getValue(), status.getInfo()))
+            .collect(Collectors.toList());
+        productDetailInitDto.setChrgitmLvOptions(chrgitmLvOptions);
+        return R.ok(productDetailInitDto);
+    }
+
+    /**
+     * 查询库存商品明细分页列表
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 库存商品明细分页列表
+     */
+    @Override
+    public R<?> getProductDetailPage(ProductDetailSearchParam productDetailSearchParam, Integer pageNo,
+        Integer pageSize, String searchKey, HttpServletRequest request) {
+        // 项目类型
+        Integer categoryCode = productDetailSearchParam.getCategoryCode();
+        // 库存是否为零
+        Integer zeroFlag = productDetailSearchParam.getZeroFlag();
+        // 过期天数
+        Integer remainingDays = productDetailSearchParam.getRemainingDays();
+        // 所在库房
+        List<Long> locationIds = productDetailSearchParam.getLocationIds();
+        // 供应商
+        List<Long> supplierIds = productDetailSearchParam.getSupplierIds();
+        productDetailSearchParam.setCategoryCode(null).setZeroFlag(null).setRemainingDays(null).setLocationIds(null)
+            .setSupplierIds(null);
+        // 构建查询条件
+        QueryWrapper<ProductDetailSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(
+            productDetailSearchParam, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.ItemName,
+                CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
+            request);
+        // 根据不同分类拼接查询条件
+        if (categoryCode != null) {
+            if (categoryCode.equals(ItemCategoryCode.CHINESE_PATENT_DRUG.getValue())
+                || categoryCode.equals(ItemCategoryCode.WESTERN_MEDICINE.getValue())
+                || categoryCode.equals(ItemCategoryCode.EXTERNALLY_PROCURED_DRUGS.getValue())
+                || categoryCode.equals(ItemCategoryCode.CHINESE_HERBAL_MEDICINE.getValue())) {
+                queryWrapper.eq(CommonConstants.FieldName.ItemTable,
+                    CommonConstants.TableName.MED_MEDICATION_DEFINITION);
+                queryWrapper.eq(CommonConstants.FieldName.MedCategoryCode, categoryCode.toString());
+            } else if (categoryCode.equals(ItemCategoryCode.DEVICE.getValue())) {
+                queryWrapper.eq(CommonConstants.FieldName.ItemTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+            }
+        }
+        // 库存是否为零
+        if (zeroFlag != null) {
+            if (Whether.YES.getValue().equals(zeroFlag)) {
+                queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+            } else {
+                queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+            }
+        }
+        // 所在位置
+        if (locationIds != null && !locationIds.isEmpty()) {
+            queryWrapper.in(CommonConstants.FieldName.LocationId, locationIds);
+        }
+        // 供应商
+        if (supplierIds != null && !supplierIds.isEmpty()) {
+            queryWrapper.in(CommonConstants.FieldName.SupplierId, supplierIds);
+        }
+        // 过期天数
+        if (remainingDays != null) {
+            queryWrapper.le(CommonConstants.FieldName.RemainingDays, remainingDays);
+        }
+        // 查询库存商品明细分页列表
+        Page<ProductDetailPageDto> productDetailsPage = productDetailsMapper.selectProductDetailsPage(
+            new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+            CommonConstants.TableName.ADM_DEVICE_DEFINITION, ConditionCode.LOT_NUMBER_COST.getCode());
+        // 库存明细
+        List<ProductDetailPageDto> productDetailList = productDetailsPage.getRecords();
+        if (productDetailList != null && !productDetailList.isEmpty()) {
+            // 医嘱定价来源
+            String orderPricingSource = TenantOptionUtil.getOptionContent(TenantOptionDict.ORDER_PRICING_SOURCE);
+            // 批次售价需查询定价子表
+            if (OrderPricingSource.BATCH_SELLING_PRICE.getCode().equals(orderPricingSource)) {
+                // 收集所有定价ID
+                List<Long> chargeItemDefIdList =
+                    productDetailList.stream().map(ProductDetailPageDto::getChargeItemDefId).filter(Objects::nonNull)
+                        .distinct().collect(Collectors.toList());
+
+                // 查询批次售价信息
+                if (!chargeItemDefIdList.isEmpty()) {
+                    List<ChargeItemDefDetail> lotNumberPriceList =
+                        chargeItemDefDetailService.getLotNumberPriceByDefIds(chargeItemDefIdList);
+                    if (lotNumberPriceList != null && !lotNumberPriceList.isEmpty()) {
+                        // 创建批次号到售价的映射
+                        Map<String, BigDecimal> lotPriceMap =
+                            lotNumberPriceList.stream().collect(Collectors.toMap(ChargeItemDefDetail::getConditionValue,
+                                ChargeItemDefDetail::getAmount, (existing, replacement) -> existing)); // 处理重复键的情况
+
+                        // 更新原始列表中的售价
+                        for (ProductDetailPageDto productDetail : productDetailList) {
+                            BigDecimal price = lotPriceMap.get(productDetail.getLotNumber());
+                            if (price != null) {
+                                productDetail.setTotalSalePrice(price);
+                            }
+                        }
+                    }
+                }
+            }
+
+            for (ProductDetailPageDto productDetailPageDto : productDetailList) {
+                // 医保等级
+                productDetailPageDto.setChrgitmLv_enumText(
+                    EnumUtils.getInfoByValue(YbChrgitmLv.class, productDetailPageDto.getChrgitmLv()));
+                // 停供状态
+                productDetailPageDto.setInventoryStatusEnum_enumText(
+                    EnumUtils.getInfoByValue(PublicationStatus.class, productDetailPageDto.getInventoryStatusEnum()));
+
+                // 计算包装单位数量
+                BigDecimal[] results =
+                    productDetailPageDto.getQuantity().divideAndRemainder(productDetailPageDto.getPartPercent());
+                // 整数
+                productDetailPageDto.setNumber(results[0]);
+                // 余数
+                productDetailPageDto.setRemainder(results[1]);
+
+                // 计算采购总额
+                if (productDetailPageDto.getPurchasePrice() != null) {
+                    productDetailPageDto
+                        .setTotalPurchasePrice(productDetailPageDto.getPurchasePrice().multiply(results[0])
+                            .add(productDetailPageDto.getPurchasePrice()
+                                .divide(productDetailPageDto.getPartPercent(), 6, RoundingMode.HALF_UP)
+                                .multiply(results[1])));
+                }
+
+                // 计算售价总额
+                if (productDetailPageDto.getSalePrice() != null) {
+                    productDetailPageDto.setTotalSalePrice(productDetailPageDto.getSalePrice().multiply(results[0])
+                        .add(productDetailPageDto.getSalePrice()
+                            .divide(productDetailPageDto.getPartPercent(), 6, RoundingMode.HALF_UP)
+                            .multiply(results[1])));
+                }
+            }
+        }
+        return R.ok(productDetailsPage);
+    }
+
+    /**
+     * 查询库存商品明细统计数据
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 库存商品明细统计数据
+     */
+    @Override
+    public R<?> getProductDetailStatistics(ProductDetailSearchParam productDetailSearchParam, String searchKey,
+        HttpServletRequest request) {
+        // 查询库存商品明细分页列表
+        R<?> result = this.getProductDetailPage(productDetailSearchParam, 1, 30000, searchKey, request);
+        ProductDetailPageDto productDetail = new ProductDetailPageDto();
+        if (result != null && result.getData() != null) {
+            Page<ProductDetailPageDto> productDetailPage = (Page<ProductDetailPageDto>)result.getData();
+            List<ProductDetailPageDto> productDetailList = productDetailPage.getRecords();
+            // 统计库房总金额
+            productDetail
+                .setPurchasePriceStatistics(productDetailList.stream().map(ProductDetailPageDto::getTotalPurchasePrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add))
+                .setSalePriceStatistics(productDetailList.stream().map(ProductDetailPageDto::getTotalSalePrice)
+                    .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+        }
+        return R.ok(productDetail);
+    }
+
+    /**
+     * 操作：停供
+     *
+     * @param inventoryId 库存项目管理ID
+     * @return 操作结果
+     */
+    @Override
+    public R<?> stopSupplyById(Long inventoryId) {
+
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 当前登录账号
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        // 停供按钮压下，更新库存项目管理表的库存状态：已停供
+        int updateCount = baseMapper.update(null,
+            new LambdaUpdateWrapper<InventoryItem>().eq(InventoryItem::getId, inventoryId)
+                .set(InventoryItem::getUpdateTime, now).set(InventoryItem::getUpdateBy, loginUser.getUserId())
+                .set(InventoryItem::getInventoryStatusEnum, PublicationStatus.RETIRED.getValue()));
+
+        return updateCount > 0 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 操作：取消停供
+     *
+     * @param inventoryId 库存项目管理ID
+     * @return 操作结果
+     */
+    @Override
+    public R<?> cancelSupplyById(Long inventoryId) {
+
+        // 获取当前时间
+        Date now = DateUtils.getNowDate();
+        // 当前登录账号
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        // 取消停供按钮压下，更新库存项目管理表的库存状态：未停供
+        int updateCount = baseMapper.update(null,
+            new LambdaUpdateWrapper<InventoryItem>().eq(InventoryItem::getId, inventoryId)
+                .set(InventoryItem::getUpdateTime, now).set(InventoryItem::getUpdateBy, loginUser.getUserId())
+                .set(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue()));
+
+        return updateCount > 0 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
+            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 库存明细表导出
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @param response 响应数据
+     */
+    public void makeExcelFile(ProductDetailSearchParam productDetailSearchParam, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request, HttpServletResponse response) {
+        R<?> result = this.getProductDetailPageX(productDetailSearchParam, 1, 10000, searchKey, request);
+        if (result != null && result.getData() != null) {
+            Page<ProductDetailPageDto> pageData = (Page)result.getData();
+            List<ProductDetailPageDto> dataList = pageData.getRecords();
+
+            try {
+                for(ProductDetailPageDto productDetailPageDto : dataList) {
+                    // 获取单位
+                    String unitCode = productDetailPageDto.getUnitCodeDictText();
+                    String minUnitCode = productDetailPageDto.getMinUnitCodeDictText();
+                    //获取数量
+                    BigDecimal number = productDetailPageDto.getNumber();
+                    BigDecimal remainder = productDetailPageDto.getRemainder();
+                    // 拼接
+                    if (remainder.compareTo(BigDecimal.ZERO) > 0) {
+                        productDetailPageDto.setNumber_text(number.setScale(0, RoundingMode.HALF_UP) + unitCode + remainder.setScale(0, RoundingMode.HALF_UP) + minUnitCode);
+                    } else {
+                        productDetailPageDto.setNumber_text(number.setScale(0, RoundingMode.HALF_UP) + unitCode);
+                    }
+                    productDetailPageDto.setQuantity_text(productDetailPageDto.getQuantity().setScale(0, RoundingMode.HALF_UP) + minUnitCode);
+
+                    // 金额字段拼接 ‘元’
+                    BigDecimal purchasePrice = productDetailPageDto.getPurchasePrice();
+                    BigDecimal salePrice = productDetailPageDto.getSalePrice();
+                    BigDecimal totalPurchasePrice = productDetailPageDto.getTotalPurchasePrice();
+                    BigDecimal totalSalePrice = productDetailPageDto.getTotalSalePrice();
+                    if (salePrice != null) {
+                        productDetailPageDto.setExcelSalePrice(salePrice.setScale(2, RoundingMode.HALF_UP) + "元");
+                    }
+
+                    if (purchasePrice != null) {
+                        productDetailPageDto.setExcelPurchasePrice(purchasePrice.setScale(2, RoundingMode.HALF_UP) + "元");
+                    }
+
+                    if (totalPurchasePrice != null) {
+                        productDetailPageDto.setExcelTotalPurchasePrice(totalPurchasePrice.setScale(2, RoundingMode.HALF_UP) + "元");
+                    }
+
+                    if (totalSalePrice != null) {
+                        productDetailPageDto.setExcelTotalSalePrice(totalSalePrice.setScale(2, RoundingMode.HALF_UP) + "元");
+                    }
+
+                    // 判断项目类别
+                    String devCategoryCodeDictText = productDetailPageDto.getDevCategoryCodeDictText();
+                    String medCategoryCodeDictText = productDetailPageDto.getMedCategoryCodeDictText();
+                    String categoryCodeDictText = devCategoryCodeDictText == null ? medCategoryCodeDictText : devCategoryCodeDictText;
+                    productDetailPageDto.setCategoryCodeDictText(categoryCodeDictText);
+                }
+
+                //导出
+                ExcelUtil<ProductDetailPageDto> util = new ExcelUtil(ProductDetailPageDto.class);
+                util.exportExcel(response, dataList, "库存明细记录");
+            } catch (Exception e) {
+                e.printStackTrace();
+                System.out.printf("导出Excel失败：" + e.getMessage());
+            }
+        }
+
+    }
+
+
+    /**
+     * 查询库存商品明细分页列表，联查数据字典
+     *
+     * @param productDetailSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 库存商品明细分页列表
+     */
+    public R<?> getProductDetailPageX(ProductDetailSearchParam productDetailSearchParam, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        Integer categoryCode = productDetailSearchParam.getCategoryCode();
+        Integer zeroFlag = productDetailSearchParam.getZeroFlag();
+        Integer remainingDays = productDetailSearchParam.getRemainingDays();
+        List<Long> locationIds = productDetailSearchParam.getLocationIds();
+        List<Long> supplierIds = productDetailSearchParam.getSupplierIds();
+        productDetailSearchParam.setCategoryCode((Integer)null).setZeroFlag((Integer)null).setRemainingDays((Integer)null).setLocationIds((List)null).setSupplierIds((List)null);
+        QueryWrapper<ProductDetailSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(productDetailSearchParam, searchKey, new HashSet(Arrays.asList("item_name", "bus_no", "py_str", "wb_str")), request);
+        if (categoryCode != null) {
+            if (!categoryCode.equals(ItemCategoryCode.CHINESE_PATENT_DRUG.getValue()) && !categoryCode.equals(ItemCategoryCode.WESTERN_MEDICINE.getValue()) && !categoryCode.equals(ItemCategoryCode.EXTERNALLY_PROCURED_DRUGS.getValue()) && !categoryCode.equals(ItemCategoryCode.CHINESE_HERBAL_MEDICINE.getValue())) {
+                if (categoryCode.equals(ItemCategoryCode.DEVICE.getValue())) {
+                    queryWrapper.eq("item_table", "adm_device_definition");
+                }
+            } else {
+                queryWrapper.eq("item_table", "med_medication_definition");
+                queryWrapper.eq("med_category_code", categoryCode.toString());
+            }
+        }
+
+        if (zeroFlag != null) {
+            if (Whether.YES.getValue().equals(zeroFlag)) {
+                queryWrapper.eq("quantity", BigDecimal.ZERO);
+            } else {
+                queryWrapper.gt("quantity", BigDecimal.ZERO);
+            }
+        }
+
+        if (locationIds != null && !locationIds.isEmpty()) {
+            queryWrapper.in("location_id", locationIds);
+        }
+
+        if (supplierIds != null && !supplierIds.isEmpty()) {
+            queryWrapper.in("supplier_id", supplierIds);
+        }
+
+        if (remainingDays != null) {
+            queryWrapper.le("remaining_days", remainingDays);
+        }
+
+        Page<ProductDetailPageDto> productDetailsPage = this.productDetailsMapper.selectProductDetailsPageX(new Page((long)pageNo, (long)pageSize), queryWrapper, "med_medication_definition", "adm_device_definition", ConditionCode.LOT_NUMBER_COST.getCode());
+        List<ProductDetailPageDto> productDetailList = productDetailsPage.getRecords();
+        if (productDetailList != null && !productDetailList.isEmpty()) {
+            String orderPricingSource = TenantOptionUtil.getOptionContent(TenantOptionDict.ORDER_PRICING_SOURCE);
+            if (OrderPricingSource.BATCH_SELLING_PRICE.getCode().equals(orderPricingSource)) {
+                List<Long> chargeItemDefIdList = (List)productDetailList.stream().map(ProductDetailPageDto::getChargeItemDefId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+                if (!chargeItemDefIdList.isEmpty()) {
+                    List<ChargeItemDefDetail> lotNumberPriceList = this.chargeItemDefDetailService.getLotNumberPriceByDefIds(chargeItemDefIdList);
+                    if (lotNumberPriceList != null && !lotNumberPriceList.isEmpty()) {
+                        Map<String, BigDecimal> lotPriceMap = (Map)lotNumberPriceList.stream().collect(Collectors.toMap(ChargeItemDefDetail::getConditionValue, ChargeItemDefDetail::getAmount, (existing, replacement) -> existing));
+
+                        for(ProductDetailPageDto productDetail : productDetailList) {
+                            BigDecimal price = (BigDecimal)lotPriceMap.get(productDetail.getLotNumber());
+                            if (price != null) {
+                                productDetail.setTotalSalePrice(price);
+                            }
+                        }
+                    }
+                }
+            }
+
+            for(ProductDetailPageDto productDetailPageDto : productDetailList) {
+                productDetailPageDto.setChrgitmLv_enumText(EnumUtils.getInfoByValue(YbChrgitmLv.class, productDetailPageDto.getChrgitmLv()));
+                productDetailPageDto.setInventoryStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, productDetailPageDto.getInventoryStatusEnum()));
+                BigDecimal[] results = productDetailPageDto.getQuantity().divideAndRemainder(productDetailPageDto.getPartPercent());
+                productDetailPageDto.setNumber(results[0]);
+                productDetailPageDto.setRemainder(results[1]);
+                if (productDetailPageDto.getPurchasePrice() != null) {
+                    productDetailPageDto.setTotalPurchasePrice(productDetailPageDto.getPurchasePrice().multiply(results[0]).add(productDetailPageDto.getPurchasePrice().divide(productDetailPageDto.getPartPercent(), 4, RoundingMode.HALF_UP).multiply(results[1])));
+                }
+
+                if (productDetailPageDto.getSalePrice() != null) {
+                    productDetailPageDto.setTotalSalePrice(productDetailPageDto.getSalePrice().multiply(results[0]).add(productDetailPageDto.getSalePrice().divide(productDetailPageDto.getPartPercent(), 4, RoundingMode.HALF_UP).multiply(results[1])));
+                }
+            }
+        }
+
+        return R.ok(productDetailsPage);
+    }
+
+
+}
diff --git a/openhis-server-new/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
deleted file mode 100644
index 70a2a2c8..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailsAppServiceImpl.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package com.openhis.web.inventorymanage.appservice.impl;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-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;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-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.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.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.InsuranceLevel;
-import com.openhis.common.enums.LocationForm;
-import com.openhis.common.enums.PublicationStatus;
-import com.openhis.common.enums.ybenums.YbChrgitmLv;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.common.utils.HisQueryUtils;
-import com.openhis.web.inventorymanage.appservice.IProductDetailsAppService;
-import com.openhis.web.inventorymanage.dto.ProductDetailsInitDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailsPageDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailsSearchParam;
-import com.openhis.web.inventorymanage.mapper.ProductDetailsMapper;
-import com.openhis.workflow.domain.InventoryItem;
-import com.openhis.workflow.mapper.InventoryItemMapper;
-
-/**
- * 库存商品明细 impl
- *
- * @author yuanzs
- * @date 2025-04-24
- */
-@Service
-public class ProductDetailsAppServiceImpl extends ServiceImpl<InventoryItemMapper, InventoryItem>
-    implements IProductDetailsAppService {
-
-    @Autowired
-    private ProductDetailsMapper productDetailsMapper;
-
-    /**
-     * 库存商品明细初始化
-     *
-     * @return 下拉列表值
-     */
-    @Override
-    public R<?> getInit() {
-
-        ProductDetailsInitDto productDetailsInitDto = new ProductDetailsInitDto();
-
-        // 医保等级List
-        List<ProductDetailsInitDto.statusEnumOption> chrgitmLvOptions = Stream.of(InsuranceLevel.values())
-            .map(status -> new ProductDetailsInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
-
-        productDetailsInitDto.setChrgitmLvOptions(chrgitmLvOptions);
-
-        return R.ok(productDetailsInitDto);
-    }
-
-    /**
-     * 查询库存商品明细分页列表
-     *
-     * @param productDetailsSearchParam 查询条件
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param searchKey 模糊查询关键字
-     * @param request 请求数据
-     * @return 库存商品明细分页列表
-     */
-    @Override
-    public R<?> getPage(ProductDetailsSearchParam productDetailsSearchParam, Integer pageNo, Integer pageSize,
-        String searchKey, HttpServletRequest request) {
-
-        // 数据初始化，不使用eq条件拼接
-        // 项目类型
-        Integer categoryCode = productDetailsSearchParam.getCategoryCode();
-        productDetailsSearchParam.setCategoryCode(null);
-        // 库存
-        Integer warehouseScope = productDetailsSearchParam.getWarehouseScope();
-        productDetailsSearchParam.setWarehouseScope(null);
-        // 剩余过期天数
-        Integer remainingDays = productDetailsSearchParam.getRemainingDays();
-        productDetailsSearchParam.setRemainingDays(null);
-
-        // 构建查询条件
-        QueryWrapper<ProductDetailsSearchParam> queryWrapper =
-            HisQueryUtils.buildQueryWrapper(productDetailsSearchParam, searchKey,
-                new HashSet<>(Arrays.asList("medicine_name", "bus_no", "py_str", "supply_name")), 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");
-            }
-        }
-        // 库存范围：无限制（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时
-        if (remainingDays != null) {
-            if (remainingDays.equals(0)) {
-                // 查询 <= 0天的数据
-                queryWrapper.le("remaining_days", 0);
-            } else {
-                // 查询 <= remainingDays天的数据
-                queryWrapper.le("remaining_days", remainingDays);
-            }
-        }
-
-        // 查询库存商品明细分页列表
-        Page<ProductDetailsPageDto> productDetailsPage =
-            productDetailsMapper.selectProductDetailsPage(new Page<>(pageNo, pageSize), queryWrapper);
-
-        productDetailsPage.getRecords().forEach(e -> {
-            // 医保等级
-            e.setChrgitmLv_enumText(EnumUtils.getInfoByValue(YbChrgitmLv.class, e.getChrgitmLv()));
-            // 药品停用
-            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(PublicationStatus.class, e.getStatusEnum()));
-            // 仓库类型
-            e.setFormEnum_enumText(EnumUtils.getInfoByValue(LocationForm.class, e.getFormEnum()));
-            // 停供状态
-            e.setInventoryStatusEnum_enumText(
-                EnumUtils.getInfoByValue(PublicationStatus.class, e.getInventoryStatusEnum()));
-            // 如果剩余天数小于0，显示为0
-            if (e.getRemainingDays() != null && e.getRemainingDays().compareTo(0) <= 0) {
-                e.setRemainingDays(0);
-            }
-        });
-        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);
-    }
-
-    /**
-     * 操作：停供
-     *
-     * @param id 库存项目管理ID
-     * @return 操作结果
-     */
-    @Override
-    public R<?> stopSupplyById(Long id) {
-
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 当前登录账号
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-
-        // 停供按钮压下，更新库存项目管理表的库存状态：已停供
-        int updateCount = baseMapper.update(null,
-            new LambdaUpdateWrapper<InventoryItem>().eq(InventoryItem::getId, id).set(InventoryItem::getUpdateTime, now)
-                .set(InventoryItem::getUpdateBy, loginUser.getUserId())
-                .set(InventoryItem::getInventoryStatusEnum, PublicationStatus.RETIRED.getValue()));
-
-        return updateCount > 0 ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
-            : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-    }
-
-    /**
-     * 操作：取消停供
-     *
-     * @param id 库存项目管理ID
-     * @return 操作结果
-     */
-    @Override
-    public R<?> cancelSupplyById(Long id) {
-
-        // 获取当前时间
-        Date now = DateUtils.getNowDate();
-        // 当前登录账号
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-
-        // 取消停供按钮压下，更新库存项目管理表的库存状态：未停供
-        int updateCount = baseMapper.update(null,
-            new LambdaUpdateWrapper<InventoryItem>().eq(InventoryItem::getId, id).set(InventoryItem::getUpdateTime, now)
-                .set(InventoryItem::getUpdateBy, loginUser.getUserId())
-                .set(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue()));
-
-        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-new/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
index d4cba6c3..134ba64e 100644
--- a/openhis-server-new/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,19 +3,22 @@
  */
 package com.openhis.web.inventorymanage.appservice.impl;
 
-import java.util.*;
+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.core.common.exception.ServiceException;
 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.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.MessageUtils;
diff --git a/openhis-server-new/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
index 260b0305..c02db77c 100644
--- a/openhis-server-new/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
@@ -73,7 +73,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
     @Autowired
     private ReceiptApprovalMapper receiptApprovalMapper;
     @Autowired
-    private YbManager ybService;
+    private YbManager ybManager;
     @Autowired
     private IMedicationDispenseService medicationDispenseService;
     @Autowired
@@ -125,9 +125,13 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         QueryWrapper<ReceiptApprovalSearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(receiptSearchParam, searchKey, searchFields, request);
         // 查询单据分页列表
-        Page<ReceiptPageDto> receiptPage =
-            receiptApprovalMapper.selectReceiptPage(new Page<>(pageNo, pageSize), queryWrapper,
-                SupplyStatus.APPROVAL.getValue(), SupplyStatus.AGREE.getValue(), SupplyStatus.REJECT.getValue());
+        Page<ReceiptPageDto> receiptPage = receiptApprovalMapper.selectReceiptPage(new Page<>(pageNo, pageSize),
+            queryWrapper, SupplyStatus.APPROVAL.getValue(), SupplyStatus.AGREE.getValue(),
+            SupplyStatus.REJECT.getValue(), SupplyType.LOSS_REPORT_FORM.getValue(),
+            SupplyType.ISSUE_INVENTORY.getValue(), SupplyType.PRODUCT_BATCH_STOCKTAKING.getValue(),
+            SupplyType.PRODUCT_STOCKTAKING.getValue(), SupplyType.PRODUCT_RETURN.getValue(),
+            SupplyType.RETURN_ISSUE.getValue(), SupplyType.PRODUCT_TRANSFER.getValue(),
+            SupplyType.PRODUCT_BATCH_TRANSFER.getValue(), SupplyType.PURCHASE_INVENTORY.getValue());
 
         receiptPage.getRecords().forEach(e -> {
             // 单据状态
@@ -417,15 +421,22 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             // 分离出入库列表
             List<SupplyItemDetailDto> inList = new ArrayList<>();
             List<SupplyItemDetailDto> outList = new ArrayList<>();
-
+            // 暂时先取出全部的库存，循环查库存同一会有问题，后续优化
+            List<InventoryItem> inventoryItems = inventoryItemService.selectAllInventory();
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
                 // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
-                List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
-                    supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
-                    supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                // List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                // supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                // supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                List<InventoryItem> filteredInventoryItems = inventoryItems.stream()
+                    .filter(item -> item.getItemId().equals(supplyItemDetailDto.getItemId())
+                        && item.getLotNumber().equals(supplyItemDetailDto.getLotNumber())
+                        && item.getLocationId().equals(supplyItemDetailDto.getSourceLocationId()))
+                    .collect(Collectors.toList());
+
                 InventoryItem inventoryItemSource = new InventoryItem();
-                if (!inventoryItemSourceList.isEmpty()) {
-                    inventoryItemSource = inventoryItemSourceList.get(0);
+                if (!filteredInventoryItems.isEmpty()) {
+                    inventoryItemSource = filteredInventoryItems.get(0);
                     // 最小数量（最小单位库存数量）
                     BigDecimal minQuantity = inventoryItemSource.getQuantity();
 
@@ -475,7 +486,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 if (inventoryItemPurpose == null) {
                     // 供应申请的物品计量单位与最小单位相同
                     if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
-                        //todo:不理解的代码，可能会因为四舍五入影响总价值
+                        // todo:不理解的代码，可能会因为四舍五入影响总价值
                         // 采购单价=单价*拆零比
                         supplyItemDetailDto
                             .setPrice(supplyItemDetailDto.getPrice().multiply(supplyItemDetailDto.getPartPercent()));
@@ -956,7 +967,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             }
             if (!shouldSkip) {
                 // 新增对应项目的价格定义子表
-                resultList.add(this.addChargeItemDefApp(supplyRequest.getLotNumber(), supplyRequest.getPrice(),
+                resultList.addAll(this.addChargeItemDefApp(supplyRequest.getLotNumber(), supplyRequest.getPrice(),
                     details.get(0).getDefinitionId()));
             }
         }
@@ -971,18 +982,20 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
      * @param definitionId 主表id
      * @return 子表信息
      */
-    private ChargeItemDefDetail addChargeItemDefApp(String conditionValue, BigDecimal sellPrice, Long definitionId) {
-        ChargeItemDefDetail chargeItemDefDetail = new ChargeItemDefDetail();
-        chargeItemDefDetail
-            // 命中条件：批号
-            .setConditionCode(ConditionCode.LOT_NUMBER_COST.getCode())
-            // 命中值
-            .setConditionValue(conditionValue)
-            // 主表id
-            .setDefinitionId(definitionId)
-            // 售价
-            .setAmount(sellPrice);
-        return chargeItemDefDetail;
+    private List<ChargeItemDefDetail> addChargeItemDefApp(String conditionValue, BigDecimal sellPrice,
+        Long definitionId) {
+        List<ChargeItemDefDetail> resultList = new ArrayList<>();
+        // 创建成本价记录
+        ChargeItemDefDetail costDetail = new ChargeItemDefDetail();
+        costDetail.setConditionCode(ConditionCode.LOT_NUMBER_COST.getCode()).setConditionValue(conditionValue)
+            .setDefinitionId(definitionId).setAmount(sellPrice);
+        resultList.add(costDetail);
+        // 创建销售价记录
+        ChargeItemDefDetail priceDetail = new ChargeItemDefDetail();
+        priceDetail.setConditionCode(ConditionCode.LOT_NUMBER_PRICE.getCode()).setConditionValue(conditionValue)
+            .setDefinitionId(definitionId).setAmount(sellPrice);
+        resultList.add(priceDetail);
+        return resultList;
     }
 
     /**
@@ -1007,7 +1020,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
 
             // 处理采购入库
             if (ybInvChgType == YbInvChgType.PURCHASE_IN) {
-                R<?> purchaseResult = ybService.procurement(getMedical3503Param(supplyItemDetailDto, now));
+                R<?> purchaseResult = ybManager.procurement(getMedical3503Param(supplyItemDetailDto, now));
                 if (purchaseResult.getCode() != 200) {
                     uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
                     // 采购失败时跳过库存变更
@@ -1015,7 +1028,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                 }
                 // 处理采购退货
             } else if (ybInvChgType == YbInvChgType.RETURN_OUT) {
-                R<?> returnResult = ybService.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
+                R<?> returnResult = ybManager.cancelProcurement(getMedicalPurchase3504Param(supplyItemDetailDto, now));
                 if (returnResult.getCode() != 200) {
                     uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
                     // 退货失败时跳过库存变更
@@ -1025,7 +1038,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
 
             // 所有类型都需要调用库存变更（特殊类型失败时跳过）
             if (!skipInventoryUpdate) {
-                result = ybService.updateInventoryCount(
+                result = ybManager.updateInventoryCount(
                     getMedicalInventory3502Param(supplyItemDetailDto, now, ybInvChgType.getValue()));
                 if (result.getCode() != 200) {
                     uploadFailedNoList.add(supplyItemDetailDto.getItemBusNo());
diff --git a/openhis-server-new/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
index e0830153..7dd32e0f 100644
--- a/openhis-server-new/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
@@ -54,8 +54,6 @@ public class InventoryManageAssembler {
                 .setWbStr(supplyItemDetailDto.getWbStr())
                 // 最小单位
                 .setUnitCode(supplyItemDetailDto.getMinUnitCode())
-                // 采购价格
-                .setPrice(supplyItemDetailDto.getPrice())
                 // 仓库
                 .setLocationId(supplyItemDetailDto.getPurposeLocationId())
                 // 库位
diff --git a/openhis-server-new/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
index 41a0b3b7..4d98917f 100644
--- a/openhis-server-new/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
@@ -3,6 +3,8 @@
  */
 package com.openhis.web.inventorymanage.controller;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +18,6 @@ import com.openhis.web.inventorymanage.dto.LossReportSearchParam;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * 报损单 controller
  *
@@ -125,20 +125,21 @@ 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);
-//    }
+    // /**
+    // * 报损单据详情
+    // *
+    // * @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-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java
new file mode 100644
index 00000000..bb1d5006
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PriceAdjustmentFormController.java
@@ -0,0 +1,145 @@
+package com.openhis.web.inventorymanage.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.core.common.utils.StringUtils;
+import com.openhis.web.adjustprice.appservice.IAdjustPriceService;
+import com.openhis.web.adjustprice.dto.AdjustPriceManagerSearchParam;
+import com.openhis.web.inventorymanage.appservice.IInventoryAdjustPriceService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @ClassName AdjustPriceController
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/23 14:47
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("/inventory-examine-page")
+@Slf4j
+public class PriceAdjustmentFormController {
+
+    @Resource
+    private IInventoryAdjustPriceService inventoryAdjustPriceService;
+    @Resource
+    private IAdjustPriceService adjustPriceService;
+
+    @GetMapping(value = "/init")
+    public R<?> receiptApprovalInit() {
+        return inventoryAdjustPriceService.adjustPriceInit();
+    }
+
+    /**
+     * Desc: 查询所有未提交的调价单集合
+     *
+     * @param
+     * @Author raymond
+     * @Date 16:55 2025/10/15
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @GetMapping(value = "getPageByExamine")
+    public R<?> getPageByExamine(AdjustPriceManagerSearchParam adjustPriceManagerSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return this.inventoryAdjustPriceService.getPageByExamineList(adjustPriceManagerSearchParam, pageNo, pageSize,
+            searchKey, request);
+    }
+
+    /**
+     * Desc: 根据单据号 进行审核通过操作
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 18:09 2025/10/18
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "updateExamineByApproved")
+    public R<?> updateExamineByApproved(@RequestParam String busNo) {
+        return this.inventoryAdjustPriceService.updateExamineByApproved(busNo);
+    }
+
+    /**
+     * Desc: 根据单据号 进行审核驳回操作
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 19:24 2025/10/18
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "updateExamineByRejected")
+    public R<?> updateExamineByRejected(@RequestParam String busNo) {
+        return this.inventoryAdjustPriceService.updateExamineByRejected(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchSupplyRequestByMed")
+    public R<?> searchSupplyRequestByMed(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByMed(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchSupplyRequestByDevice")
+    public R<?> searchSupplyRequestByDevice(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByDevice(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchSupplyRequestByActivity")
+    public R<?> searchSupplyRequestByActivity(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByActivity(busNo);
+    }
+
+    /**
+     * Desc: 根据 单据号 查询详情
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 12:01 2025/10/21
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @PostMapping(value = "searchSupplyRequestByHealth")
+    public R<?> searchSupplyRequestByHealth(@RequestParam String busNo) {
+        if (StringUtils.isEmpty(busNo)) {
+            return R.fail();
+        }
+        return this.adjustPriceService.searchChangePriceDataByHealth(busNo);
+    }
+
+}
diff --git a/openhis-server-new/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/ProductDetailController.java
similarity index 50%
rename from openhis-server-new/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/ProductDetailController.java
index 2e2a0051..7c34286c 100644
--- a/openhis-server-new/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/ProductDetailController.java
@@ -1,13 +1,14 @@
 package com.openhis.web.inventorymanage.controller;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.inventorymanage.appservice.IProductDetailsAppService;
-import com.openhis.web.inventorymanage.dto.ProductDetailsSearchParam;
+import com.openhis.web.inventorymanage.appservice.IProductDetailAppService;
+import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -20,10 +21,10 @@ import lombok.extern.slf4j.Slf4j;
 @RestController
 @RequestMapping("/inventory-manage/product")
 @Slf4j
-public class ProductDetailsController {
+public class ProductDetailController {
 
-    @Autowired
-    private IProductDetailsAppService productDetailsAppService;
+    @Resource
+    private IProductDetailAppService productDetailsAppService;
 
     /**
      * 库存商品明细初始化
@@ -38,7 +39,7 @@ public class ProductDetailsController {
     /**
      * 查询库存商品明细分页列表
      *
-     * @param productDetailsSearchParam 查询条件
+     * @param productDetailSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
      * @param searchKey 模糊查询关键字
@@ -46,64 +47,67 @@ public class ProductDetailsController {
      * @return 库存商品明细分页列表
      */
     @GetMapping(value = "/product-page")
-    public R<?> getPage(ProductDetailsSearchParam productDetailsSearchParam,
+    public R<?> getProductDetailPage(ProductDetailSearchParam productDetailSearchParam,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
-        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(value = "pageSize", defaultValue = "1000") Integer pageSize,
         @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
-        return productDetailsAppService.getPage(productDetailsSearchParam, pageNo, pageSize, searchKey, request);
+        return productDetailsAppService.getProductDetailPage(productDetailSearchParam, pageNo, pageSize, searchKey,
+            request);
     }
+
     /**
-     * 查询库存商品明细分页列表合计
+     * 查询库存商品明细统计数据
      *
-     * @param productDetailsSearchParam 查询条件
+     * @param productDetailSearchParam 查询条件
      * @param searchKey 模糊查询关键字
-     * @return 库存商品明细分页列表合计
+     * @param request 请求数据
+     * @return 库存商品明细统计数据
      */
-    @GetMapping(value = "/product-page-total")
-    public R<?> getPageTotal(ProductDetailsSearchParam productDetailsSearchParam,
-                        @RequestParam(name = "searchKey", required = false) String searchKey) {
-        return productDetailsAppService.getPageTotal(productDetailsSearchParam, searchKey );
+    @GetMapping(value = "/product-statistics")
+    public R<?> getProductDetailStatistics(ProductDetailSearchParam productDetailSearchParam,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return productDetailsAppService.getProductDetailStatistics(productDetailSearchParam, searchKey, request);
     }
 
     /**
      * 操作：停供
      *
-     * @param id 库存项目管理ID
+     * @param inventoryId 库存项目管理ID
      * @return 操作结果
      */
     @PutMapping("/stop-supply")
-    public R<?> stopSupplyById(@RequestBody Long id) {
-        return productDetailsAppService.stopSupplyById(id);
+    public R<?> stopSupplyById(@RequestBody Long inventoryId) {
+        return productDetailsAppService.stopSupplyById(inventoryId);
     }
 
     /**
      * 操作：取消停供
      *
-     * @param id 库存项目管理ID
+     * @param inventoryId 库存项目管理ID
      * @return 操作结果
      */
     @PutMapping("/cancel-supply")
-    public R<?> cancelSupplyById(@RequestBody Long id) {
-        return productDetailsAppService.cancelSupplyById(id);
+    public R<?> cancelSupplyById(@RequestBody Long inventoryId) {
+        return productDetailsAppService.cancelSupplyById(inventoryId);
     }
 
     /**
-     * 操作：效期预警
+     * 库存明细表导出
      *
-     * @param productDetailsSearchParam 查询条件
+     * @param productDetailSearchParam 查询条件
      * @param pageNo 当前页码
      * @param pageSize 查询条数
      * @param searchKey 模糊查询关键字
      * @param request 请求数据
-     * @return 操作结果
+     * @param response 响应数据
      */
-    @GetMapping("/expiration-warning")
-    public R<?> expirationWarning(ProductDetailsSearchParam productDetailsSearchParam,
+    @GetMapping(value = "/excel-out")
+    public void makeExcelFile(ProductDetailSearchParam productDetailSearchParam,
         @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);
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request,
+        HttpServletResponse response) {
+        productDetailsAppService.makeExcelFile(productDetailSearchParam, pageNo, pageSize, searchKey, request,
+            response);
     }
-
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java
new file mode 100644
index 00000000..9e15c7c5
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryAdjustPriceDto.java
@@ -0,0 +1,108 @@
+package com.openhis.web.inventorymanage.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;
+
+/**
+ * @ClassName InventoryAdjustPriceDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/24 17:02
+ * @Version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+public class InventoryAdjustPriceDto {
+    /** 单据号 */
+    private String supplyBusNo;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+    /** 退货状态 */
+    private Integer returnStatus;
+
+    /** 类型 */
+    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;
+
+    /** 目的仓库 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_location")
+    private Long purposeLocationId;
+    private String purposeLocationId_dictText;
+
+    /** 目的仓位 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_location")
+    private Long purposeLocationStoreId;
+    private String purposeLocationStoreId_dictText;
+
+    /** 盈亏金额 */
+    private BigDecimal breakevenPrice;
+
+    /** 经手人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+    private String practitionerId_dictText;
+
+    /** 审批人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批时间 */
+    private Date approvalTime;
+
+    /** 申请人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    private Long applicantId;
+    private String applicantId_dictText;
+
+    /** 申请时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applyTime;
+
+    /** 制单日期 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 备注 */
+    private String remake;
+
+    /** 项目所在表名 */
+    private String itemTable;
+
+    /** 药品类型 */
+    private Integer itemType;
+
+    /** 目的仓库类型 */
+    private Integer purposeTypeEnum;
+    private String purposeTypeEnum_enumText;
+
+    /** 追溯码 */
+    private String traceNo;
+    /**
+     * 24、药品
+     */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+}
diff --git a/openhis-server-new/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/ProductDetailInitDto.java
similarity index 85%
rename from openhis-server-new/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/ProductDetailInitDto.java
index 2852a9a8..52569ecc 100644
--- a/openhis-server-new/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/ProductDetailInitDto.java
@@ -1,6 +1,5 @@
 package com.openhis.web.inventorymanage.dto;
 
-import com.openhis.web.datadictionary.dto.MedicationManageInitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -14,7 +13,7 @@ import java.util.List;
  */
 @Data
 @Accessors(chain = true)
-public class ProductDetailsInitDto {
+public class ProductDetailInitDto {
 
     /** 医保等级 */
     private List<statusEnumOption> chrgitmLvOptions;
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java
new file mode 100644
index 00000000..72cb6671
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailPageDto.java
@@ -0,0 +1,202 @@
+package com.openhis.web.inventorymanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.common.annotation.Excel;
+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
+ *
+ * @author yuanzs
+ * @date 2025-04-24
+ */
+@Data
+
+@Accessors(chain = true)
+public class ProductDetailPageDto {
+
+    /** 库存项目管理ID（停供用） */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inventoryId;
+
+    /** 生产日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @Excel(name = "生产日期", sort = 19, dateFormat = "yyyy-MM-dd")
+    private Date productionDate;
+
+    /** 失效日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期至", sort = 20, dateFormat = "yyyy-MM-dd")
+    private Date expirationDate;
+
+    /** 库存状态 */
+    private Integer inventoryStatusEnum;
+    private String inventoryStatusEnum_enumText;
+
+    /** 仓库 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库", sort = 4)
+    private String locationName;
+
+    /** 货位 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationStoreId;
+
+    /** 货位名称 */
+    @Excel(name = "货位", sort = 22)
+    private String locationStoreName;
+
+    /** 生产批号 */
+    @Excel(name = "生产批号", sort = 7)
+    private String lotNumber;
+
+    /** 库存数量 */
+    private BigDecimal quantity;
+    @Excel(name = "库存（最小单位）", sort = 9)
+    private String quantity_text;
+
+    /** 包装单位数量（整数部分） */
+    private BigDecimal number;
+    @Excel(name = "库存（包装单位）", sort = 8)
+    private String number_text;
+
+    /** 包装单位数量（余数部分） */
+    private BigDecimal remainder;
+
+    /** 供应商 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long supplierId;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商", sort = 17)
+    private String supplierName;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称", sort = 2)
+    private String itemName;
+
+    /** 项目名称 */
+    private String itemTable;
+
+    /** 项目编码 */
+    @Excel(name = "药品编码", sort = 1)
+    private String busNo;
+
+    /** 耗材类型 */
+    @Dict(dictCode = "device_category_code")
+    private String devCategoryCode;
+    private String devCategoryCode_dictText;
+    private String devCategoryCodeDictText;
+
+    /** 药品类型 */
+    @Dict(dictCode = "med_category_code")
+    private String medCategoryCode;
+    private String medCategoryCode_dictText;
+    private String medCategoryCodeDictText;
+
+    /** 项目类别 */
+    @Excel(name = "项目类别", sort = 3)
+    private String CategoryCodeDictText;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+    @Excel(name = "医保等级", sort = 18)
+    private String chrgitmLv_enumText;
+
+    /** 厂家 */
+    @Excel(name = "厂家/产地", sort = 6)
+    private String manufacturerText;
+
+    /** 医保码 */
+    private String ybNo;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 包装单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+    private String unitCodeDictText;
+
+    /** 库存单位 */
+    @Dict(dictCode = "unit_code")
+    private String minUnitCode;
+    private String minUnitCode_dictText;
+    private String minUnitCodeDictText;
+
+    /** 拆零比 */
+    @Excel(name = "拆零比", sort = 10, scale = 0)
+    private BigDecimal partPercent;
+
+    /** 批准文号/国药准字 */
+    @Excel(name = "国药准字", sort = 16)
+    private String approvalNumber;
+
+    /** 剂型 */
+    @Dict(dictCode = "dose_form_code")
+    private String doseFormCode;
+    private String doseFormCode_dictText;
+    @Excel(name = "剂型", sort = 15)
+    private String doseFormCodeDictText;
+
+    /** 规格 */
+    @Excel(name = "规格", sort = 5)
+    private String totalVolume;
+
+    /** 零售价 */
+    private BigDecimal salePrice;
+    @Excel(name = "零售价", sort = 12)
+    private String excelSalePrice = "";
+
+    /** 定价id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeItemDefId;
+
+    /** 进价 */
+    private BigDecimal purchasePrice;
+    @Excel(name = "采购价格", sort = 11)
+    private String excelPurchasePrice = "";
+
+    /** 剩余过期天数 */
+    @Excel(name = "剩余过期天数", sort = 21)
+    private Integer remainingDays;
+
+    /** 总零售价 */
+    private BigDecimal totalSalePrice;
+    @Excel(name = "零售价总额", sort = 14)
+    private String excelTotalSalePrice = "";
+
+    /** 总进价 */
+    private BigDecimal totalPurchasePrice;
+    @Excel(name = "进价总额", sort = 13, scale = 2)
+    private String excelTotalPurchasePrice = "";
+
+    /** 售价统计 */
+    private BigDecimal salePriceStatistics;
+
+    /** 进价统计 */
+    private BigDecimal purchasePriceStatistics;
+
+    // 设置统计金额默认值为零
+    public ProductDetailPageDto() {
+        this.totalSalePrice = BigDecimal.ZERO;
+        this.totalPurchasePrice = BigDecimal.ZERO;
+        this.salePriceStatistics = BigDecimal.ZERO;
+        this.purchasePriceStatistics = BigDecimal.ZERO;
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java
new file mode 100644
index 00000000..9d85f13a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailSearchParam.java
@@ -0,0 +1,41 @@
+package com.openhis.web.inventorymanage.dto;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 库存商品明细分页查询条件
+ *
+ * @author yuanzs
+ * @date 2025-04-24
+ */
+@Data
+@Accessors(chain = true)
+public class ProductDetailSearchParam {
+
+    /** 剩余过期天数 */
+    private Integer remainingDays;
+
+    /** 项目类型 */
+    private Integer categoryCode;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 仓库药房列表 */
+    private List<Long> locationIds;
+
+    /** 供应商列表 */
+    private List<Long> supplierIds;
+
+    /** 是否为零 */
+    private Integer zeroFlag;
+
+    /** 停用状态 */
+    private Integer inventoryStatusEnum;
+
+    /** 项目所在表 */
+    private String itemTable;
+}
diff --git a/openhis-server-new/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
deleted file mode 100644
index 5f76d0e2..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsPageDto.java
+++ /dev/null
@@ -1,150 +0,0 @@
-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 yuanzs
- * @date 2025-04-24
- */
-@Data
-@Accessors(chain = true)
-public class ProductDetailsPageDto {
-
-    /** 库存项目管理ID（停供用） */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    /** 药品编码 */
-    private String busNo;
-
-    /** 药品名称 */
-    private String medicineName;
-
-    /** 药品拼音 */
-    private String pyStr;
-
-    /** 规格 */
-    private String totalVolume;
-
-    /** 医保等级 */
-    private Integer chrgitmLv;
-    private String chrgitmLv_enumText;
-
-    /** 厂家 */
-    private String manufacturerText;
-
-    /** 生产批号 */
-    private String lotNumber;
-
-    /** 药品类型 */
-    @Dict(dictCode = "med_category_code")
-    private String categoryCode;
-    private String categoryCode_dictText;
-
-    /** 药品单位（采购单位） */
-    @Dict(dictCode = "unit_code")
-    private String unitCode;
-    private String unitCode_dictText;
-
-    /** 库存数量 */
-    private BigDecimal quantity;
-
-    /** 规格库存数量 */
-    private BigDecimal  specificationQuantity;
-
-    /** 最小库存警戒数量 */
-    private BigDecimal  itemMinQuantity;
-
-    /** 最大库存警戒数量 */
-    private BigDecimal  itemMaxQuantity;
-
-    /** 拆零比 */
-    private BigDecimal partPercent;
-
-    /** 库存单位 */
-    @Dict(dictCode = "unit_code")
-    private String minUnitCode;
-    private String minUnitCode_dictText;
-
-    /** 采购价格 */
-    private BigDecimal price;
-
-    /** 生产日期 */
-    private Date productionDate;
-
-    /** 失效日期 */
-    private Date expirationDate;
-
-    /** 剩余过期天数 */
-    private Integer remainingDays;
-
-    /** 药品追溯码 */
-    private String traceNo;
-
-    /** 药品停用 */
-    private Integer statusEnum;
-    private String statusEnum_enumText;
-
-    /** 仓库 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long locationId;
-    private String locationName;
-
-    /** 货位 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long locationStoreId;
-    private String locationStoreName;
-
-    /** 仓库类型 */
-    private Integer formEnum;
-    private String formEnum_enumText;
-
-    /** 供应商 */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long supplyId;
-    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-new/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
deleted file mode 100644
index 76d592d2..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsSearchParam.java
+++ /dev/null
@@ -1,47 +0,0 @@
-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;
-
-/**
- * 库存商品明细分页查询条件
- *
- * @author yuanzs
- * @date 2025-04-24
- */
-@Data
-@Accessors(chain = true)
-public class ProductDetailsSearchParam {
-
-    /** 剩余过期天数 */
-    private Integer remainingDays;
-
-    /** 项目类型 */
-    private Integer categoryCode;
-
-    /** 医保等级 */
-    private Integer chrgitmLv;
-
-    /** 仓库药房 */
-    private Long locationId;
-
-    /** 库存范围 */
-    private Integer warehouseScope;
-
-    /** 有效期小于（月） */
-    private Integer remainingMonth;
-
-    /** 供应商 */
-    private String supplyName;
-
-    /** 停用状态 */
-    private Integer inventoryStatusEnum;
-
-    /** 查询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
deleted file mode 100644
index 7678c159..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/ProductDetailsTotalDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-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-new/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
index 0096d5df..a93dc02c 100644
--- a/openhis-server-new/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
@@ -8,6 +8,7 @@ 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;
@@ -15,6 +16,7 @@ import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.poi.hpsf.Decimal;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 单据分页列表 dto
@@ -79,9 +81,13 @@ public class ReceiptPageDto {
     private String applicantId_dictText;
 
     /** 申请时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date applyTime;
 
     /** 制单日期 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 备注 */
@@ -99,5 +105,15 @@ public class ReceiptPageDto {
 
     /** 追溯码 */
     private String traceNo;
+    /**
+     * 24、药品
+     */
+    private Integer categoryEnum;
+    private String categoryEnum_enumText;
+
+    /*
+     * 总金额
+     */
+    private  BigDecimal totalAmount;
 
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
new file mode 100644
index 00000000..a4b7d5e7
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/InventoryAdjustPriceMapper.java
@@ -0,0 +1,37 @@
+package com.openhis.web.inventorymanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+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.adjustprice.dto.ChangePricePageDto;
+import com.openhis.web.inventorymanage.dto.ReceiptApprovalSearchParam;
+import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
+
+/**
+ * @ClassName AdjustPriceMapper
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/23 14:41
+ * @Version 1.0
+ **/
+@Component
+public interface InventoryAdjustPriceMapper {
+    /**
+     * 查询单据审批分页列表
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param approval 单据状态：审核中
+     * @param agree 单据状态：同意
+     * @param reject 单据状态：驳回
+     * @return 单据审批分页列表
+     */
+    Page<ChangePricePageDto> searchPageByExamine(@Param("page") Page<ReceiptPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<ReceiptApprovalSearchParam> queryWrapper,
+        @Param("approval") Integer approval, @Param("agree") Integer agree, @Param("reject") Integer reject,
+        @Param("medCategory") Integer medTypeEnum, @Param("deviceCategory") Integer deviceTypeEnum,
+        @Param("activityCategory") Integer activityTypeEnum, @Param("healthCategory") Integer healthTypeEnum);
+}
diff --git a/openhis-server-new/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
index 8800028f..70cbbaac 100644
--- a/openhis-server-new/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,7 +5,6 @@ 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;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java
new file mode 100644
index 00000000..47e96cd6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailAppMapper.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.inventorymanage.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.inventorymanage.dto.ProductDetailPageDto;
+import com.openhis.web.inventorymanage.dto.ProductDetailSearchParam;
+
+/**
+ * 库存商品明细查询用 mapper
+ *
+ * @author yuanzs
+ * @date 2025-04-25
+ */
+@Repository
+public interface ProductDetailAppMapper {
+
+    /**
+     * 查询库存商品明细分页列表
+     * 
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param medMedicationDefinition 药品
+     * @param admDeviceDefinition 耗材
+     * @param lotNumberCost 批号进价
+     * @return 库存商品明细分页列表
+     */
+    Page<ProductDetailPageDto> selectProductDetailsPage(@Param("page") Page<ProductDetailPageDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<ProductDetailSearchParam> queryWrapper,
+        @Param("medMedicationDefinition") String medMedicationDefinition,
+        @Param("admDeviceDefinition") String admDeviceDefinition, @Param("lotNumberCost") String lotNumberCost);
+    /**
+     * 查询库存商品明细分页列表，联查数据字典
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @param medMedicationDefinition 药品
+     * @param admDeviceDefinition 耗材
+     * @param lotNumberCost 批号进价
+     * @return 库存商品明细分页列表
+     */
+    Page<ProductDetailPageDto> selectProductDetailsPageX(@Param("page") Page<ProductDetailPageDto> page,
+                                                        @Param(Constants.WRAPPER) QueryWrapper<ProductDetailSearchParam> queryWrapper,
+                                                        @Param("medMedicationDefinition") String medMedicationDefinition,
+                                                        @Param("admDeviceDefinition") String admDeviceDefinition, @Param("lotNumberCost") String lotNumberCost);
+}
diff --git a/openhis-server-new/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
deleted file mode 100644
index 382a84a4..00000000
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/mapper/ProductDetailsMapper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.web.inventorymanage.mapper;
-
-import com.openhis.web.inventorymanage.dto.ProductDetailsTotalDto;
-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.inventorymanage.dto.ProductDetailsPageDto;
-import com.openhis.web.inventorymanage.dto.ProductDetailsSearchParam;
-
-import java.util.List;
-
-/**
- * 库存商品明细查询用 mapper
- *
- * @author yuanzs
- * @date 2025-04-25
- */
-@Repository
-public interface ProductDetailsMapper {
-
-    /**
-     * 查询库存商品明细分页列表
-     * 
-     * @param page 分页
-     * @param queryWrapper 查询条件
-     * @return 库存商品明细分页列表
-     */
-    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-new/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
index ac0e065d..f2b538ec 100644
--- a/openhis-server-new/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
@@ -52,9 +52,24 @@ public interface ReceiptApprovalMapper extends BaseMapper<SupplyRequest> {
      * @param approval 单据状态：审核中
      * @param agree 单据状态：同意
      * @param reject 单据状态：驳回
+     * @param lossReportForm 单据类型：报损
+     * @param issueInventory 单据类型：领用
+     * @param productBatchStocktaking 单据类型：批量盘点
+     * @param productStocktaking 单据类型：盘点
+     * @param productReturn 单据类型：退货
+     * @param returnIssue 单据类型：领用退货
+     * @param productTransfer 单据类型：调拨
+     * @param productBatchTransfer 单据类型：批量调拨
+     * @param purchaseInventory 单据类型：采购入库
      * @return 单据审批分页列表
      */
     Page<ReceiptPageDto> selectReceiptPage(@Param("page") Page<ReceiptPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<ReceiptApprovalSearchParam> queryWrapper,
-        @Param("approval") Integer approval, @Param("agree") Integer agree, @Param("reject") Integer reject);
+        @Param("approval") Integer approval, @Param("agree") Integer agree, @Param("reject") Integer reject,
+        @Param("lossReportForm") Integer lossReportForm, @Param("issueInventory") Integer issueInventory,
+        @Param("productBatchStocktaking") Integer productBatchStocktaking,
+        @Param("productStocktaking") Integer productStocktaking, @Param("productReturn") Integer productReturn,
+        @Param("returnIssue") Integer returnIssue, @Param("productTransfer") Integer productTransfer,
+        @Param("productBatchTransfer") Integer productBatchTransfer,
+        @Param("purchaseInventory") Integer purchaseInventory);
 }
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
index 458ea3a5..70bad1e6 100644
--- 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
@@ -60,10 +60,10 @@ public class MaterialProfitLossOrderServiceImpl implements IMaterialProfitLossOr
 
         // 单据分类
         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()));
+//        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);
 
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
index 29923db2..cdd738aa 100644
--- 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
@@ -58,10 +58,10 @@ public class MaterialPurchaseOrderServiceImpl implements IMaterialPurchaseOrderS
 
         // 单据分类
         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()));
+//        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);
 
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
index 5c328002..5ca69579 100644
--- 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
@@ -25,7 +25,6 @@ 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;
 
@@ -59,8 +58,8 @@ public class MaterialReturnOrderServiceImpl implements IMaterialReturnOrderServi
 
         // 单据分类
         List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -134,10 +133,11 @@ public class MaterialReturnOrderServiceImpl implements IMaterialReturnOrderServi
             // 单据信息删除
             supplyRequestService.removeByIds(requestIdList);
         }
-        //添加原始单据号
-        if(returnOrderDtoList.get(0).getOriginalBusNo()!=null){
+        // 添加原始单据号
+        if (returnOrderDtoList.get(0).getOriginalBusNo() != null) {
             // 审批单据并返回单据详情
-            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnOrderDtoList.get(0).getOriginalBusNo(), returnOrderDtoList.get(0).getBusNo());
+            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));
             }
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
index 31e21df5..c38b6629 100644
--- 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
@@ -25,7 +25,6 @@ import com.openhis.web.materialmanage.appservice.IMaterialReturnToWarehouseOrder
 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;
 
@@ -36,8 +35,7 @@ import com.openhis.workflow.service.ISupplyRequestService;
  * @date 2025-07-22
  */
 @Service
-public class MaterialReturnToWarehouseOrderServiceImpl implements
-    IMaterialReturnToWarehouseOrderService {
+public class MaterialReturnToWarehouseOrderServiceImpl implements IMaterialReturnToWarehouseOrderService {
 
     @Resource
     private AssignSeqUtil assignSeqUtil;
@@ -49,6 +47,7 @@ public class MaterialReturnToWarehouseOrderServiceImpl implements
     private IMaterialCommonService materialCommonService;
     @Autowired
     private MaterialCommonMapper materialCommonMapper;
+
     /**
      * 初始化
      *
@@ -61,8 +60,8 @@ public class MaterialReturnToWarehouseOrderServiceImpl implements
 
         // 单据分类
         List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -95,16 +94,14 @@ public class MaterialReturnToWarehouseOrderServiceImpl implements
         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()
-            ));
+            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);
     }
 
-
     /**
      * 获取单据号
      *
@@ -130,17 +127,20 @@ public class MaterialReturnToWarehouseOrderServiceImpl implements
     @Override
     public R<?> addOrEditReturnToWarehouseOrder(List<MaterialDetailDto> returnToWarehouseOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToWarehouseOrderDtoList.get(0).getBusNo());
+        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){
+        // 添加原始单据号
+        if (returnToWarehouseOrderDtoList.get(0).getOriginalBusNo() != null) {
             // 审批单据并返回单据详情
-            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnToWarehouseOrderDtoList.get(0).getOriginalBusNo(), returnToWarehouseOrderDtoList.get(0).getBusNo());
+            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));
             }
@@ -162,8 +162,8 @@ public class MaterialReturnToWarehouseOrderServiceImpl implements
                 .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());
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index 136dc888..6fedf641 100644
--- 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
@@ -61,11 +61,11 @@ public class MaterialStockInOrderServiceImpl implements IMaterialStockInOrderSer
 
         // 单据分类
         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()));
+//        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);
 
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
index 2925a3c2..6fa2d1db 100644
--- 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
@@ -25,7 +25,6 @@ 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;
 
@@ -47,6 +46,7 @@ public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderS
     private IMaterialCommonService materialCommonService;
     @Autowired
     private MaterialCommonMapper materialCommonMapper;
+
     /**
      * 初始化
      *
@@ -59,12 +59,13 @@ public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderS
 
         // 单据分类
         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()));
+        // 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);
 
@@ -97,9 +98,8 @@ public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderS
         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()
-            ));
+            unitList.add(new MaterialDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new MaterialDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
 
             item.setUnitList(unitList);
         }
@@ -107,7 +107,6 @@ public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderS
         return R.ok(stockOutOrderDtoDetailPage);
     }
 
-
     /**
      * 获取单据号
      *
@@ -140,10 +139,11 @@ public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderS
             // 单据信息删除
             supplyRequestService.removeByIds(requestIdList);
         }
-        //添加原始单据号
-        if(stockOutOrderDtoList.get(0).getOriginalBusNo()!=null){
+        // 添加原始单据号
+        if (stockOutOrderDtoList.get(0).getOriginalBusNo() != null) {
             // 审批单据并返回单据详情
-            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockOutOrderDtoList.get(0).getOriginalBusNo(), stockOutOrderDtoList.get(0).getBusNo());
+            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));
             }
@@ -165,8 +165,8 @@ public class MaterialStockOutOrderServiceImpl implements IMaterialStockOutOrderS
                 .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());
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index 134a5ce8..b9c0814b 100644
--- 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
@@ -60,10 +60,10 @@ public class MaterialStocktakingOrderServiceImpl implements IMaterialStocktaking
 
         // 单据分类
         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()));
+//        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);
 
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
index 459a4851..879fa62b 100644
--- 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
@@ -25,7 +25,6 @@ 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;
 
@@ -59,8 +58,8 @@ public class MaterialTransferInOrderServiceImpl implements IMaterialTransferInOr
 
         // 单据分类
         List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -127,7 +126,8 @@ public class MaterialTransferInOrderServiceImpl implements IMaterialTransferInOr
     @Override
     public R<?> addOrEditTransferInOrder(List<MaterialDetailDto> transferInOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
@@ -149,8 +149,8 @@ public class MaterialTransferInOrderServiceImpl implements IMaterialTransferInOr
                 .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());
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index c09ccd81..81eb728b 100644
--- 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
@@ -59,8 +59,8 @@ public class MaterialTransferOutOrderServiceImpl implements IMaterialTransferOut
 
         // 单据分类
         List<MaterialInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+//        supplyCategoryOption.add(new MaterialInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+//            SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
new file mode 100644
index 00000000..1bb55ecf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioApplicationRecordAppService.java
@@ -0,0 +1,86 @@
+package com.openhis.web.nenu.appservice;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+
+/**
+ * 公费医疗-比例调整申请记录 AppService
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+public interface IGfRatioApplicationRecordAppService {
+
+    /**
+     * 查询比例调整申请记录分页
+     *
+     * @param searchParam 查询参数
+     * @param printable 申请单是否可打印
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 比例调整申请记录分页
+     */
+    R<IPage<GfRatioApplicationRecordDto>> getPage(GfRatioApplicationRecordDto searchParam, String printable,
+        String searchKey, Integer pageNo, Integer pageSize);
+
+    /**
+     * 查询比例调整申请记录详情
+     *
+     * @param id ID
+     * @return 比例调整申请记录详情
+     */
+    R<GfRatioApplicationRecordDto> getDetail(Long id);
+
+    /**
+     * 创建比例调整申请
+     *
+     * @param gfRatioApplicationRecordDto 比例调整申请记录Dto
+     * @return 结果
+     */
+    R<?> add(GfRatioApplicationRecordDto gfRatioApplicationRecordDto);
+
+    /**
+     * 取消比例调整申请
+     *
+     * @param id ID
+     * @return 结果
+     */
+    R<?> cancel(Long id);
+
+    /**
+     * 处理比例调整申请
+     *
+     * @param gfRatioApplicationProcessDto 比例调整申请处理Dto
+     * @return 结果
+     */
+    R<?> process(GfRatioApplicationProcessDto gfRatioApplicationProcessDto);
+
+    /**
+     * 查询申请项目选择弹窗分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param itemType 项目分类
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 申请项目选择弹窗分页
+     */
+    R<IPage<GfRatioApplicationDefinitionSelectDto>> getDefinitionSelectPage(
+        GfRatioApplicationDefinitionSelectDto searchParam, String searchKey, Integer itemType, Integer pageNo,
+        Integer pageSize);
+
+    /**
+     * 查询申请单打印列表
+     * 
+     * @param ids 多个ID逗号拼接
+     * @return 申请单打印列表
+     */
+    R<List<GfRatioApplicationPrintDto>> getPrintList(String ids);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java
new file mode 100644
index 00000000..38746631
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfRatioManageAppService.java
@@ -0,0 +1,45 @@
+package com.openhis.web.nenu.appservice;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.openhis.web.nenu.dto.GfIndividualRatioDto;
+
+/**
+ * 公费医疗-自付比例管理 AppService
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+public interface IGfRatioManageAppService {
+
+    /**
+     * 查询大项比例列表
+     * 
+     * @return 大项比例列表
+     */
+    R<List<GfTypeRatioDto>> getTypeRatioList();
+
+    /**
+     * 保存大项比例列表
+     * 
+     * @param typeRatioList 大项比例列表
+     * @return 结果
+     */
+    R<?> saveTypeRatioList(List<GfTypeRatioDto> typeRatioList);
+
+    /**
+     * 查询单项比例分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 单项比例分页
+     */
+    R<IPage<GfIndividualRatioDto>> getIndividualRatioPage(GfIndividualRatioDto searchParam, String searchKey,
+        Integer pageNo, Integer pageSize);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java
new file mode 100644
index 00000000..c9a91294
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/IGfStudentListAppService.java
@@ -0,0 +1,77 @@
+package com.openhis.web.nenu.appservice;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.nenu.dto.GfStudentListDto;
+
+/**
+ * 公费医疗-学生名单管理 AppService
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+public interface IGfStudentListAppService {
+
+    /**
+     * 查询学生名单分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 学生名单分页
+     */
+    R<IPage<GfStudentListDto>> getPage(GfStudentListDto searchParam, String searchKey, Integer pageNo,
+        Integer pageSize);
+
+    /**
+     * 查询学生名单详情
+     *
+     * @param id ID
+     * @return 学生名单详情
+     */
+    R<GfStudentListDto> getDetail(Long id);
+
+    /**
+     * 添加学生名单
+     * 
+     * @param gfStudentListDto 学生名单Dto
+     * @return 结果
+     */
+    R<?> add(GfStudentListDto gfStudentListDto);
+
+    /**
+     * 编辑学生名单
+     *
+     * @param gfStudentListDto 学生名单Dto
+     * @return 结果
+     */
+    R<?> edit(GfStudentListDto gfStudentListDto);
+
+    /**
+     * 删除学生名单
+     *
+     * @param id ID
+     * @return 结果
+     */
+    R<?> delete(Long id);
+
+    /**
+     * 导入学生名单
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    R<?> importData(MultipartFile file);
+
+    /**
+     * 获取导入模板
+     *
+     * @param response 响应
+     */
+    void importTemplate(HttpServletResponse response);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
new file mode 100644
index 00000000..f3950b49
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioApplicationRecordAppServiceImpl.java
@@ -0,0 +1,572 @@
+package com.openhis.web.nenu.appservice.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.tuple.Pair;
+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.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.enums.DeleteFlag;
+import com.core.common.utils.AssignSeqUtil;
+import com.core.common.utils.DateUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.service.IChargeItemDefinitionService;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.*;
+import com.openhis.common.enums.ybenums.YbChrgitmLv;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.medication.service.IMedicationDefinitionService;
+import com.openhis.nenu.domain.GfRatio;
+import com.openhis.nenu.domain.GfRatioApplication;
+import com.openhis.nenu.service.IGfRatioApplicationService;
+import com.openhis.nenu.service.IGfRatioService;
+import com.openhis.web.nenu.appservice.IGfRatioApplicationRecordAppService;
+import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+import com.openhis.web.nenu.mapper.GfRatioApplicationRecordAppMapper;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.service.IActivityDefinitionService;
+
+/**
+ * 公费医疗-比例调整申请记录 AppServiceImpl
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Service
+public class GfRatioApplicationRecordAppServiceImpl implements IGfRatioApplicationRecordAppService {
+
+    @Autowired
+    private IGfRatioService gfRatioService;
+    @Autowired
+    private IGfRatioApplicationService gfRatioApplicationService;
+    @Autowired
+    private IMedicationDefinitionService medicationDefinitionService;
+    @Autowired
+    private IActivityDefinitionService activityDefinitionService;
+    @Autowired
+    private IChargeItemDefinitionService chargeItemDefinitionService;
+    @Autowired
+    private GfRatioApplicationRecordAppMapper gfRatioApplicationRecordAppMapper;
+    @Autowired
+    private AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 查询比例调整申请记录分页
+     *
+     * @param searchParam 查询参数
+     * @param printable 申请单是否可打印
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 比例调整申请记录分页
+     */
+    @Override
+    public R<IPage<GfRatioApplicationRecordDto>> getPage(GfRatioApplicationRecordDto searchParam, String printable,
+        String searchKey, Integer pageNo, Integer pageSize) {
+        // 构造查询条件
+        QueryWrapper<GfRatioApplicationRecordDto> queryWrapper = HisQueryUtils.buildQueryWrapper(searchParam, searchKey,
+            new HashSet<>(Set.of("application_no", "bus_no", "name", "py_str", "wb_str", "yb_no")), null);
+        // 可打印筛选
+        if (Whether.YES.getCode().equals(printable)) {
+            queryWrapper.eq("application_status", GfApplicationStatus.PROCESSING.getValue()).eq("final_approval_result",
+                GfApplicationStatus.PROCESSING.getValue());
+        }
+        // 查询比例调整申请记录分页
+        IPage<GfRatioApplicationRecordDto> page = gfRatioApplicationRecordAppMapper
+            .selectGfRatioApplicationRecordPage(new Page<>(pageNo, pageSize), queryWrapper);
+        for (GfRatioApplicationRecordDto r : page.getRecords()) {
+            // 翻译非字典枚举
+            GfItemType gfItemType = GfItemType.getByValue(r.getItemType());
+            if (gfItemType != null) {
+                r.setItemTypeName(gfItemType.getInfo());
+            }
+        }
+        return R.ok(page);
+    }
+
+    /**
+     * 查询比例调整申请记录详情
+     *
+     * @param id ID
+     * @return 比例调整申请记录详情
+     */
+    @Override
+    public R<GfRatioApplicationRecordDto> getDetail(Long id) {
+        // 查询比例调整申请记录详情
+        GfRatioApplication gfRatioApplication = gfRatioApplicationService.getById(id);
+        if (gfRatioApplication == null) {
+            return R.fail();
+        }
+        // 定义返回Dto
+        GfRatioApplicationRecordDto gfRatioApplicationRecordDto = new GfRatioApplicationRecordDto();
+        String defTableName = CommonConstants.TableName.MED_MEDICATION_DEFINITION;
+        String chrgitmLv = YbChrgitmLv.SELF_PAY.getCode();
+        String ybNo = null;
+        if (GfItemType.MEDICATION.getValue().equals(gfRatioApplication.getItemType())) {
+            // 如果是药品，获取并设置药品定义信息
+            MedicationDefinition medicationDefinition =
+                medicationDefinitionService.getById(gfRatioApplication.getDefinitionId());
+            if (medicationDefinition != null) {
+                gfRatioApplicationRecordDto.setBusNo(medicationDefinition.getBusNo())
+                    .setName(medicationDefinition.getName()).setYbNo(medicationDefinition.getYbNo())
+                    // 公费项目分类：药品
+                    .setItemTypeName(GfItemType.MEDICATION.getInfo());
+                chrgitmLv =
+                    Optional.of(medicationDefinition.getChrgitmLv()).orElse(YbChrgitmLv.SELF_PAY.getValue()).toString();
+                ybNo = medicationDefinition.getYbNo();
+            }
+        } else if (GfItemType.ACTIVITY.getValue().equals(gfRatioApplication.getItemType())) {
+            // 如果是诊疗，获取并设置诊疗定义信息
+            ActivityDefinition activityDefinition =
+                activityDefinitionService.getById(gfRatioApplication.getDefinitionId());
+            if (activityDefinition != null) {
+                gfRatioApplicationRecordDto.setBusNo(activityDefinition.getBusNo())
+                    .setName(activityDefinition.getName()).setYbNo(activityDefinition.getYbNo())
+                    // 公费项目分类：诊疗
+                    .setItemTypeName(GfItemType.ACTIVITY.getInfo());
+                chrgitmLv =
+                    Optional.of(activityDefinition.getChrgitmLv()).orElse(YbChrgitmLv.SELF_PAY.getValue()).toString();
+                ybNo = activityDefinition.getYbNo();
+            }
+            defTableName = CommonConstants.TableName.WOR_ACTIVITY_DEFINITION;
+        }
+        YbChrgitmLv ybChrgitmLv = YbChrgitmLv.getByCode(chrgitmLv);
+        // 查询原支付比例
+        Pair<Pair<BigDecimal, BigDecimal>, BigDecimal> oldRatiosAndPrice =
+            this.getOldRatiosAndPrice(gfRatioApplication.getDefinitionId(), defTableName, chrgitmLv);
+        // Dto赋值返回
+        gfRatioApplicationRecordDto.setId(gfRatioApplication.getId()).setApplicationNo(gfRatioApplication.getBusNo())
+            .setItemType(gfRatioApplication.getItemType())
+            // 医保编号
+            .setYbNo(ybNo)
+            // 医保等级名称
+            .setChrgitmLvName(ybChrgitmLv == null ? null : ybChrgitmLv.getInfo())
+            .setApplicationRatio(gfRatioApplication.getApplicationRatio())
+            .setOldRatio(oldRatiosAndPrice.getLeft().getLeft()).setTotalPrice(oldRatiosAndPrice.getRight())
+            // 价格差：计算得出
+            .setPriceDiff(oldRatiosAndPrice.getLeft().getLeft() != null
+                && gfRatioApplication.getApplicationRatio() != null && oldRatiosAndPrice.getRight() != null
+                    ? gfRatioApplication.getApplicationRatio().subtract(oldRatiosAndPrice.getLeft().getLeft())
+                        .multiply(oldRatiosAndPrice.getRight()).divide(new BigDecimal(100), RoundingMode.UNNECESSARY)
+                    : null)
+            .setTwiceRatio(gfRatioApplication.getTwiceRatio()).setOldTwiceRatio(oldRatiosAndPrice.getLeft().getRight())
+            .setStartDate(gfRatioApplication.getStartDate()).setEndDate(gfRatioApplication.getEndDate())
+            .setApplicationStatus(gfRatioApplication.getApplicationStatus())
+            .setApplicant(gfRatioApplication.getApplicant()).setApplicationTime(gfRatioApplication.getApplicationTime())
+            .setApplicationReason(gfRatioApplication.getApplicationReason())
+            .setInitialApprover(gfRatioApplication.getInitialApprover())
+            .setInitialApprovalResult(gfRatioApplication.getInitialApprovalResult())
+            .setInitialApprovalTime(gfRatioApplication.getInitialApprovalTime())
+            .setInitialApprovalOpinion(gfRatioApplication.getInitialApprovalOpinion())
+            .setFinanceApprover(gfRatioApplication.getFinanceApprover())
+            .setFinanceApprovalResult(gfRatioApplication.getFinanceApprovalResult())
+            .setFinanceApprovalTime(gfRatioApplication.getFinanceApprovalTime())
+            .setFinanceApprovalOpinion(gfRatioApplication.getFinanceApprovalOpinion())
+            .setFinalRecorder(gfRatioApplication.getFinalRecorder())
+            .setFinalApprovalResult(gfRatioApplication.getFinalApprovalResult())
+            .setFinalRecordTime(gfRatioApplication.getFinalRecordTime())
+            .setFinalApprovalOpinion(gfRatioApplication.getFinalApprovalOpinion());
+        return R.ok(gfRatioApplicationRecordDto);
+    }
+
+    /**
+     * 创建比例调整申请
+     *
+     * @param gfRatioApplicationRecordDto 比例调整申请记录Dto
+     * @return 结果
+     */
+    @Override
+    public R<?> add(GfRatioApplicationRecordDto gfRatioApplicationRecordDto) {
+        // 查询指定项目现行比例
+        List<GfRatio> gfRatioList = gfRatioService.list(new LambdaQueryWrapper<GfRatio>()
+            .eq(GfRatio::getDefinitionId, gfRatioApplicationRecordDto.getDefinitionId())
+            .eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+        // 验证时间是否重叠
+        if (!gfRatioList.isEmpty()) {
+            for (GfRatio r : gfRatioList) {
+                if (!r.getStartDate().after(gfRatioApplicationRecordDto.getEndDate())
+                    && !r.getEndDate().before(gfRatioApplicationRecordDto.getStartDate())) {
+                    return R.fail("该项目此次申请的开始结束时间与现行比例开始结束时间有重叠，请确认");
+                }
+            }
+        }
+        // 创建申请
+        GfRatioApplication gfRatioApplication = new GfRatioApplication()
+            .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.GF_RATIO_APPLICATION.getPrefix(), 4))
+            .setItemType(gfRatioApplicationRecordDto.getItemType())
+            .setApplicationRatio(gfRatioApplicationRecordDto.getApplicationRatio())
+            .setTwiceRatio(gfRatioApplicationRecordDto.getTwiceRatio())
+            .setStartDate(gfRatioApplicationRecordDto.getStartDate())
+            // 结束时间：调整为当天23点59分59秒
+            .setEndDate(DateUtils.addSeconds(DateUtils.addDays(gfRatioApplicationRecordDto.getEndDate(), 1), -1))
+            // 申请状态：处理中
+            .setApplicationStatus(GfApplicationStatus.PROCESSING.getValue()).setApplicant(SecurityUtils.getNickName())
+            .setApplicationTime(DateUtils.getNowDate())
+            .setApplicationReason(gfRatioApplicationRecordDto.getApplicationReason())
+            // 测算通过or驳回：处理中
+            .setInitialApprovalResult(GfApplicationStatus.PROCESSING.getValue())
+            .setDefinitionId(gfRatioApplicationRecordDto.getDefinitionId());
+        gfRatioApplicationService.save(gfRatioApplication);
+        return R.ok();
+    }
+
+    /**
+     * 取消比例调整申请
+     *
+     * @param id ID
+     * @return 结果
+     */
+    @Override
+    public R<?> cancel(Long id) {
+        // 存在验证
+        GfRatioApplication gfRatioApplication = gfRatioApplicationService.getById(id);
+        if (gfRatioApplication == null) {
+            return R.fail("申请不存在");
+        }
+        // 状态验证
+        if (!GfApplicationStatus.PROCESSING.getValue().equals(gfRatioApplication.getApplicationStatus())
+            && !GfApplicationStatus.PROCESSING.getValue().equals(gfRatioApplication.getInitialApprovalResult())) {
+            return R.fail("该申请已不可取消");
+        }
+        // 更新申请记录
+        gfRatioApplicationService.update(new GfRatioApplication(), new LambdaUpdateWrapper<GfRatioApplication>()
+            // 申请状态：取消
+            .set(GfRatioApplication::getApplicationStatus, GfApplicationStatus.CANCELLED.getValue())
+            // 测算通过or驳回：NULL
+            .set(GfRatioApplication::getInitialApprovalResult, null).eq(GfRatioApplication::getId, id));
+
+        return null;
+    }
+
+    /**
+     * 处理比例调整申请
+     *
+     * @param gfRatioApplicationProcessDto 比例调整申请处理Dto
+     * @return 结果
+     */
+    @Override
+    public R<?> process(GfRatioApplicationProcessDto gfRatioApplicationProcessDto) {
+        // 存在验证
+        GfRatioApplication gfRatioApplication = gfRatioApplicationService.getById(gfRatioApplicationProcessDto.getId());
+        if (gfRatioApplication == null) {
+            return R.fail("申请不存在");
+        }
+        // 状态验证
+        if (GfApplicationStatus.APPROVED.getValue().equals(gfRatioApplication.getApplicationStatus())) {
+            return R.fail("该申请已被通过，无需处理");
+        }
+        if (GfApplicationStatus.REJECTED.getValue().equals(gfRatioApplication.getApplicationStatus())) {
+            return R.fail("该申请已被驳回，不可处理");
+        }
+        if (GfApplicationStatus.CANCELLED.getValue().equals(gfRatioApplication.getApplicationStatus())) {
+            return R.fail("该申请已被取消，不可处理");
+        }
+        // 根据执行操作的角色分别处理
+        String loginUserName = SecurityUtils.getNickName();
+        Date now = DateUtils.getNowDate();
+
+        // 【测算盈亏】
+        if (GfApprovalRole.INITIAL_APPROVER.getValue().equals(gfRatioApplicationProcessDto.getApprovalRole())) {
+            if (!GfApplicationStatus.PROCESSING.getValue().equals(gfRatioApplication.getInitialApprovalResult())) {
+                return R.fail("该节点已被处理，不可再处理");
+            }
+
+            // 申请通过
+            if (GfApplicationStatus.APPROVED.getValue().equals(gfRatioApplicationProcessDto.getApprovalResult())) {
+                // 更新申请记录
+                gfRatioApplicationService.update(new GfRatioApplication(),
+                    new LambdaUpdateWrapper<GfRatioApplication>()
+                        .set(GfRatioApplication::getInitialApprover, loginUserName)
+                        // 测算通过or驳回：通过
+                        .set(GfRatioApplication::getInitialApprovalResult, GfApplicationStatus.APPROVED.getValue())
+                        .set(GfRatioApplication::getInitialApprovalTime, now)
+                        .set(GfRatioApplication::getInitialApprovalOpinion,
+                            gfRatioApplicationProcessDto.getApprovalOpinion())
+                        // 财务科通过or驳回：处理中
+                        .set(GfRatioApplication::getFinanceApprovalResult, GfApplicationStatus.PROCESSING.getValue())
+                        .eq(GfRatioApplication::getId, gfRatioApplicationProcessDto.getId()));
+
+                // 申请驳回
+            } else if (GfApplicationStatus.REJECTED.getValue()
+                .equals(gfRatioApplicationProcessDto.getApprovalResult())) {
+                // 更新申请记录
+                gfRatioApplicationService.update(new GfRatioApplication(),
+                    new LambdaUpdateWrapper<GfRatioApplication>()
+                        .set(GfRatioApplication::getInitialApprover, loginUserName)
+                        // 测算通过or驳回：驳回
+                        .set(GfRatioApplication::getInitialApprovalResult, GfApplicationStatus.REJECTED.getValue())
+                        .set(GfRatioApplication::getInitialApprovalTime, now)
+                        .set(GfRatioApplication::getInitialApprovalOpinion,
+                            gfRatioApplicationProcessDto.getApprovalOpinion())
+                        // 申请状态：驳回
+                        .set(GfRatioApplication::getApplicationStatus, GfApplicationStatus.REJECTED.getValue())
+                        .eq(GfRatioApplication::getId, gfRatioApplicationProcessDto.getId()));
+            } else {
+                return R.fail("通过or驳回指定错误");
+            }
+
+            // 【财务科报批】
+        } else if (GfApprovalRole.FINANCE_APPROVER.getValue().equals(gfRatioApplicationProcessDto.getApprovalRole())) {
+            if (!GfApplicationStatus.PROCESSING.getValue().equals(gfRatioApplication.getFinanceApprovalResult())) {
+                return R.fail("该节点已被处理，不可再处理");
+            }
+
+            // 申请通过
+            if (GfApplicationStatus.APPROVED.getValue().equals(gfRatioApplicationProcessDto.getApprovalResult())) {
+                // 更新申请记录
+                gfRatioApplicationService.update(new GfRatioApplication(),
+                    new LambdaUpdateWrapper<GfRatioApplication>()
+                        .set(GfRatioApplication::getFinanceApprover, loginUserName)
+                        // 财务科通过or驳回：通过
+                        .set(GfRatioApplication::getFinanceApprovalResult, GfApplicationStatus.APPROVED.getValue())
+                        .set(GfRatioApplication::getFinanceApprovalTime, now)
+                        .set(GfRatioApplication::getFinanceApprovalOpinion,
+                            gfRatioApplicationProcessDto.getApprovalOpinion())
+                        // 会议通过or驳回：处理中
+                        .set(GfRatioApplication::getFinalApprovalResult, GfApplicationStatus.PROCESSING.getValue())
+                        .eq(GfRatioApplication::getId, gfRatioApplicationProcessDto.getId()));
+
+                // 申请驳回
+            } else if (GfApplicationStatus.REJECTED.getValue()
+                .equals(gfRatioApplicationProcessDto.getApprovalResult())) {
+                // 更新申请记录
+                gfRatioApplicationService.update(new GfRatioApplication(),
+                    new LambdaUpdateWrapper<GfRatioApplication>()
+                        .set(GfRatioApplication::getFinanceApprover, loginUserName)
+                        // 财务科通过or驳回：驳回
+                        .set(GfRatioApplication::getFinanceApprovalResult, GfApplicationStatus.REJECTED.getValue())
+                        .set(GfRatioApplication::getFinanceApprovalTime, now)
+                        .set(GfRatioApplication::getFinanceApprovalOpinion,
+                            gfRatioApplicationProcessDto.getApprovalOpinion())
+                        // 申请状态：驳回
+                        .set(GfRatioApplication::getApplicationStatus, GfApplicationStatus.REJECTED.getValue())
+                        .eq(GfRatioApplication::getId, gfRatioApplicationProcessDto.getId()));
+            } else {
+                return R.fail("通过or驳回指定错误");
+            }
+
+            // 【会议结果录入】
+        } else if (GfApprovalRole.FINAL_RECORDER.getValue().equals(gfRatioApplicationProcessDto.getApprovalRole())) {
+            if (!GfApplicationStatus.PROCESSING.getValue().equals(gfRatioApplication.getFinalApprovalResult())) {
+                return R.fail("该节点已被处理，不可再处理");
+            }
+
+            // 申请通过
+            if (GfApplicationStatus.APPROVED.getValue().equals(gfRatioApplicationProcessDto.getApprovalResult())) {
+                // 更新申请记录
+                gfRatioApplicationService.update(new GfRatioApplication(), new LambdaUpdateWrapper<GfRatioApplication>()
+                    .set(GfRatioApplication::getFinalRecorder, loginUserName)
+                    // 会议通过or驳回：通过
+                    .set(GfRatioApplication::getFinalApprovalResult, GfApplicationStatus.APPROVED.getValue())
+                    .set(GfRatioApplication::getFinalRecordTime, now)
+                    .set(GfRatioApplication::getFinalApprovalOpinion, gfRatioApplicationProcessDto.getApprovalOpinion())
+                    // 申请状态：通过
+                    .set(GfRatioApplication::getApplicationStatus, GfApplicationStatus.APPROVED.getValue())
+                    .eq(GfRatioApplication::getId, gfRatioApplicationProcessDto.getId()));
+                // 创建现行自付比例
+                GfRatio gfRatio = new GfRatio()
+                    // 比例类型：单项比例
+                    .setRatioType(GfRatioType.INDIVIDUAL_RATIO.getValue()).setItemType(gfRatioApplication.getItemType())
+                    .setSelfRatio(gfRatioApplication.getApplicationRatio())
+                    .setTwiceRatio(gfRatioApplication.getTwiceRatio()).setStartDate(gfRatioApplication.getStartDate())
+                    .setEndDate(gfRatioApplication.getEndDate()).setDefinitionId(gfRatioApplication.getDefinitionId());
+                gfRatioService.save(gfRatio);
+
+                // 申请驳回
+            } else if (GfApplicationStatus.REJECTED.getValue()
+                .equals(gfRatioApplicationProcessDto.getApprovalResult())) {
+                // 申请驳回，更新申请记录
+                gfRatioApplicationService.update(new GfRatioApplication(), new LambdaUpdateWrapper<GfRatioApplication>()
+                    .set(GfRatioApplication::getFinalRecorder, loginUserName)
+                    // 财务科通过or驳回：驳回
+                    .set(GfRatioApplication::getFinalApprovalResult, GfApplicationStatus.REJECTED.getValue())
+                    .set(GfRatioApplication::getFinalRecordTime, now)
+                    .set(GfRatioApplication::getFinalApprovalOpinion, gfRatioApplicationProcessDto.getApprovalOpinion())
+                    // 申请状态：驳回
+                    .set(GfRatioApplication::getApplicationStatus, GfApplicationStatus.REJECTED.getValue())
+                    .eq(GfRatioApplication::getId, gfRatioApplicationProcessDto.getId()));
+            } else {
+                return R.fail("通过or驳回指定错误");
+            }
+        } else {
+            return R.fail("角色指定错误");
+        }
+        return R.ok();
+    }
+
+    /**
+     * 查询申请项目选择弹窗分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param itemType 项目分类
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 申请项目选择弹窗分页
+     */
+    @Override
+    public R<IPage<GfRatioApplicationDefinitionSelectDto>> getDefinitionSelectPage(
+        GfRatioApplicationDefinitionSelectDto searchParam, String searchKey, Integer itemType, Integer pageNo,
+        Integer pageSize) {
+        // 构造查询条件
+        QueryWrapper<GfRatioApplicationDefinitionSelectDto> queryWrapper = HisQueryUtils.buildQueryWrapper(searchParam,
+            searchKey, new HashSet<>(Set.of("bus_no", "name", "py_str", "wb_str", "yb_no")), null);
+        // 查询比例调整申请记录分页
+        IPage<GfRatioApplicationDefinitionSelectDto> page = gfRatioApplicationRecordAppMapper
+            .selectGfRatioApplicationDefinitionSelectPage(itemType, new Page<>(pageNo, pageSize), queryWrapper);
+        // 翻译非字典枚举
+        for (GfRatioApplicationDefinitionSelectDto dto : page.getRecords()) {
+            YbChrgitmLv ybChrgitmLv = YbChrgitmLv.getByValue(dto.getChrgitmLv());
+            if (ybChrgitmLv != null) {
+                dto.setChrgitmLvName(ybChrgitmLv.getInfo());
+            }
+        }
+        return R.ok(page);
+    }
+
+    /**
+     * 查询申请单打印列表
+     *
+     * @param ids 多个ID逗号拼接
+     * @return 申请单打印列表
+     */
+    @Override
+    public R<List<GfRatioApplicationPrintDto>> getPrintList(String ids) {
+        // 切割读取多个ID
+        List<Long> idList;
+        try {
+            idList = Arrays.stream(ids.split(",")).map(String::trim).filter(s -> !s.isEmpty()).map(Long::valueOf)
+                .collect(Collectors.toList());
+        } catch (NumberFormatException e) {
+            return R.fail("传参有误");
+        }
+        if (idList.isEmpty()) {
+            return R.ok(Collections.emptyList());
+        }
+        // 查询要打印的申请单
+        List<GfRatioApplication> applicationList =
+            gfRatioApplicationService.list(new LambdaQueryWrapper<GfRatioApplication>()
+                .in(GfRatioApplication::getId, idList).orderByDesc(GfRatioApplication::getId));
+        if (applicationList.isEmpty()) {
+            return R.ok(Collections.emptyList());
+        }
+        // 循环做出打印信息列表
+        List<GfRatioApplicationPrintDto> printDtoList = new ArrayList<>();
+        GfRatioApplicationPrintDto printDto;
+        for (GfRatioApplication application : applicationList) {
+            printDto = new GfRatioApplicationPrintDto();
+            String itemName = "";
+            String ybLv = YbChrgitmLv.SELF_PAY.getCode();
+            String defTableName = CommonConstants.TableName.MED_MEDICATION_DEFINITION;
+            if (GfItemType.MEDICATION.getValue().equals(application.getItemType())) {
+                // 获取药品名称和医保等级
+                MedicationDefinition medicationDefinition =
+                    medicationDefinitionService.getById(application.getDefinitionId());
+                if (medicationDefinition != null) {
+                    itemName = medicationDefinition.getName();
+                    ybLv = Optional.of(medicationDefinition.getChrgitmLv()).orElse(YbChrgitmLv.SELF_PAY.getValue())
+                        .toString();
+                }
+            } else if (GfItemType.ACTIVITY.getValue().equals(application.getItemType())) {
+                // 获取诊疗名称和医保等级
+                ActivityDefinition activityDefinition =
+                    activityDefinitionService.getById(application.getDefinitionId());
+                if (activityDefinition != null) {
+                    itemName = activityDefinition.getName();
+                    ybLv = Optional.of(activityDefinition.getChrgitmLv()).orElse(YbChrgitmLv.SELF_PAY.getValue())
+                        .toString();
+                }
+                defTableName = CommonConstants.TableName.WOR_ACTIVITY_DEFINITION;
+            }
+            YbChrgitmLv ybChrgitmLv = YbChrgitmLv.getByCode(ybLv);
+            // 查询原支付比例和价格（包括二次比例）
+            Pair<Pair<BigDecimal, BigDecimal>, BigDecimal> oldRatiosAndPrice =
+                this.getOldRatiosAndPrice(application.getDefinitionId(), defTableName, ybLv);
+            BigDecimal oldRatio = oldRatiosAndPrice.getLeft().getLeft();
+            BigDecimal oldTwiceRatio = oldRatiosAndPrice.getLeft().getRight();
+            BigDecimal totalPrice = oldRatiosAndPrice.getRight();
+            // 作成返回Dto
+            printDto.setItemName(itemName)
+                // 全价
+                .setTotalPrice(totalPrice == null ? "" : totalPrice.stripTrailingZeros().toPlainString())
+                // 医保等级
+                .setChrgitmLv(ybChrgitmLv == null ? "" : ybChrgitmLv.getInfo())
+                // 原支付比例
+                .setOldRatio(oldRatio == null ? "" : oldRatio.stripTrailingZeros().toPlainString())
+                // 新支付比例
+                .setNewRatio(application.getApplicationRatio() == null ? ""
+                    : application.getApplicationRatio().stripTrailingZeros().toPlainString())
+                // 价格差
+                .setPriceDiff(oldRatio != null && application.getApplicationRatio() != null && totalPrice != null
+                    ? application.getApplicationRatio().subtract(oldRatio).multiply(totalPrice)
+                        .divide(new BigDecimal(100), RoundingMode.UNNECESSARY).stripTrailingZeros().toPlainString()
+                    : "")
+                // 原二次支付比例
+                .setOldTwiceRatio(oldTwiceRatio == null ? "" : oldTwiceRatio.stripTrailingZeros().toPlainString())
+                // 新二次支付比例
+                .setNewTwiceRatio(application.getTwiceRatio() == null ? ""
+                    : application.getTwiceRatio().stripTrailingZeros().toPlainString());
+            printDtoList.add(printDto);
+        }
+        return R.ok(printDtoList);
+    }
+
+    /**
+     * 查询原支付比例和价格（包括二次比例）
+     * 
+     * @param definitionId 定义ID
+     * @param definitionTableName 定义表名
+     * @param ybLv 医保等级
+     * @return 原支付比例和价格（包括二次比例）
+     */
+    private Pair<Pair<BigDecimal, BigDecimal>, BigDecimal> getOldRatiosAndPrice(Long definitionId,
+        String definitionTableName, String ybLv) {
+        BigDecimal oldRatio = null;
+        BigDecimal price = null;
+        // 查询费用定价
+        List<ChargeItemDefinition> chargeItemDefinitionList = chargeItemDefinitionService
+            .list(new LambdaQueryWrapper<ChargeItemDefinition>().eq(ChargeItemDefinition::getInstanceId, definitionId)
+                .eq(ChargeItemDefinition::getInstanceTable, definitionTableName)
+                .orderByDesc(ChargeItemDefinition::getId));
+        if (!chargeItemDefinitionList.isEmpty()) {
+            price = chargeItemDefinitionList.get(0).getPrice();
+            // 查询现行大类比例
+            List<GfRatio> typeRatioList = gfRatioService
+                .list(new LambdaQueryWrapper<GfRatio>().eq(GfRatio::getRatioType, GfRatioType.TYPE_RATIO.getValue())
+                    .eq(GfRatio::getYbClass, chargeItemDefinitionList.get(0).getYbType()).eq(GfRatio::getYbLv, ybLv)
+                    .eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+            if (!typeRatioList.isEmpty()) {
+                oldRatio = typeRatioList.get(0).getSelfRatio();
+            }
+        }
+        // 查询历史小项比例
+        List<GfRatio> historicalRatioList =
+            gfRatioService.list(new LambdaQueryWrapper<GfRatio>().eq(GfRatio::getDefinitionId, definitionId)
+                .eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()).orderByDesc(GfRatio::getId));
+        BigDecimal oldTwiceRatio = null;
+        if (!historicalRatioList.isEmpty()) {
+            GfRatio latestRatio = historicalRatioList.get(0);
+            Date now = DateUtils.getNowDate();
+            // 只获取还在生效中的历史小项比例
+            if (latestRatio.getStartDate().before(now) && latestRatio.getEndDate().after(now)) {
+                oldRatio = latestRatio.getSelfRatio();
+                oldTwiceRatio = latestRatio.getTwiceRatio();
+            }
+        }
+        return Pair.of(Pair.of(oldRatio, oldTwiceRatio), price);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
new file mode 100644
index 00000000..52823703
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfRatioManageAppServiceImpl.java
@@ -0,0 +1,123 @@
+package com.openhis.web.nenu.appservice.impl;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+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.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.enums.DeleteFlag;
+import com.openhis.common.enums.GfItemType;
+import com.openhis.common.enums.GfRatioType;
+import com.openhis.common.enums.ybenums.YbChrgitmLv;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.nenu.domain.GfRatio;
+import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.openhis.nenu.service.IGfRatioService;
+import com.openhis.web.nenu.appservice.IGfRatioManageAppService;
+import com.openhis.web.nenu.dto.GfIndividualRatioDto;
+import com.openhis.web.nenu.mapper.GfRatioManageAppMapper;
+
+/**
+ * 公费医疗-自付比例管理 AppServiceImpl
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Service
+public class GfRatioManageAppServiceImpl implements IGfRatioManageAppService {
+
+    @Autowired
+    private IGfRatioService gfRatioService;
+    @Autowired
+    private GfRatioManageAppMapper gfRatioManageAppMapper;
+
+    /**
+     * 查询大项比例列表
+     *
+     * @return 大项比例列表
+     */
+    @Override
+    public R<List<GfTypeRatioDto>> getTypeRatioList() {
+        return R.ok(gfRatioService.getTypeRatioList());
+    }
+
+    /**
+     * 保存大项比例列表
+     *
+     * @param typeRatioList 大项比例列表
+     * @return 结果
+     */
+    @Override
+    public R<?> saveTypeRatioList(List<GfTypeRatioDto> typeRatioList) {
+        // 查询DB中的所有大项比例
+        List<GfRatio> gfRatioList = gfRatioService
+            .list(new LambdaQueryWrapper<GfRatio>().eq(GfRatio::getRatioType, GfRatioType.TYPE_RATIO.getValue())
+                .eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+        // 做成医保分项+医保等级拼接的Map
+        Map<String, GfRatio> gfRatioMap =
+            gfRatioList.stream().collect(Collectors.toMap(e -> e.getYbClass() + e.getYbLv(), Function.identity()));
+        // 遍历输入项
+        List<GfRatio> addGfRatioList = new ArrayList<>();
+        List<GfRatio> editGfRatioList = new ArrayList<>();
+        for (GfTypeRatioDto dto : typeRatioList) {
+            if (dto.getSelfRatio() == null) {
+                continue;
+            }
+            GfRatio editGfRatio = gfRatioMap.get(dto.getYbClass() + dto.getYbLv());
+            if (editGfRatio == null) {
+                // DB不存在时新增
+                GfRatio addGfRatio = new GfRatio().setRatioType(GfRatioType.TYPE_RATIO.getValue())
+                    .setYbClass(dto.getYbClass()).setYbLv(dto.getYbLv()).setSelfRatio(dto.getSelfRatio());
+                addGfRatioList.add(addGfRatio);
+            } else {
+                // DB存在时修改
+                editGfRatio.setSelfRatio(dto.getSelfRatio());
+                editGfRatioList.add(editGfRatio);
+            }
+        }
+        // 批量DB处理
+        if (!addGfRatioList.isEmpty()) {
+            gfRatioService.saveBatch(addGfRatioList);
+        }
+        if (!editGfRatioList.isEmpty()) {
+            gfRatioService.updateBatchById(editGfRatioList);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 查询单项比例分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 单项比例分页
+     */
+    @Override
+    public R<IPage<GfIndividualRatioDto>> getIndividualRatioPage(GfIndividualRatioDto searchParam, String searchKey,
+        Integer pageNo, Integer pageSize) {
+        // 构造查询条件
+        QueryWrapper<GfIndividualRatioDto> queryWrapper = HisQueryUtils.buildQueryWrapper(searchParam, searchKey,
+            new HashSet<>(Set.of("bus_no", "name", "py_str", "wb_str", "yb_no")), null);
+        // 查询单项比例分页
+        IPage<GfIndividualRatioDto> page =
+            gfRatioManageAppMapper.selectGfIndividualRatioPage(new Page<>(pageNo, pageSize), queryWrapper);
+        // 设置公费项目分类名称
+        for (GfIndividualRatioDto dto : page.getRecords()) {
+            dto.setItemTypeName(GfItemType.getByValue(dto.getItemType()).getInfo());
+            YbChrgitmLv ybChrgitmLv = YbChrgitmLv.getByValue(dto.getChrgitmLv());
+            if (ybChrgitmLv != null) {
+                dto.setChrgitmLvName(ybChrgitmLv.getInfo());
+            }
+        }
+        return R.ok(page);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
new file mode 100644
index 00000000..f05345a8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/appservice/impl/GfStudentListAppServiceImpl.java
@@ -0,0 +1,443 @@
+package com.openhis.web.nenu.appservice.impl;
+
+import java.time.format.DateTimeParseException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+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.enums.DeleteFlag;
+import com.core.common.utils.*;
+import com.core.common.utils.poi.ExcelUtil;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.domain.PatientStudent;
+import com.openhis.administration.service.IPatientService;
+import com.openhis.administration.service.IPatientStudentService;
+import com.openhis.common.enums.AssignSeqEnum;
+import com.openhis.common.enums.PhysicalExamResult;
+import com.openhis.common.enums.StudentStatus;
+import com.openhis.common.utils.CommonUtil;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.common.utils.IdCardUtil;
+import com.openhis.web.nenu.appservice.IGfStudentListAppService;
+import com.openhis.web.nenu.dto.GfStudentListDto;
+import com.openhis.web.nenu.dto.GfStudentListImportDto;
+import com.openhis.web.nenu.mapper.GfStudentListAppMapper;
+
+/**
+ * 公费医疗-学生名单管理 AppServiceImpl
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Service
+public class GfStudentListAppServiceImpl implements IGfStudentListAppService {
+
+    @Autowired
+    private IPatientStudentService patientStudentService;
+    @Autowired
+    private IPatientService patientService;
+    @Autowired
+    private GfStudentListAppMapper gfStudentListAppMapper;
+    @Autowired
+    private AssignSeqUtil assignSeqUtil;
+
+    /**
+     * 查询学生名单分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 学生名单分页
+     */
+    @Override
+    public R<IPage<GfStudentListDto>> getPage(GfStudentListDto searchParam, String searchKey, Integer pageNo,
+        Integer pageSize) {
+        // 构造查询条件
+        QueryWrapper<GfStudentListDto> queryWrapper = HisQueryUtils.buildQueryWrapper(searchParam, searchKey,
+            new HashSet<>(Set.of("name", "py_str", "wb_str", "student_id", "id_number")), null);
+        // 查询学生名单分页
+        IPage<GfStudentListDto> page =
+            gfStudentListAppMapper.selectGfStudentListPage(new Page<>(pageNo, pageSize), queryWrapper);
+        return R.ok(page);
+    }
+
+    /**
+     * 查询学生名单详情
+     *
+     * @param id ID
+     * @return 学生名单详情
+     */
+    @Override
+    public R<GfStudentListDto> getDetail(Long id) {
+        // 查询学生名单详情
+        PatientStudent patientStudent = patientStudentService.getById(id);
+        if (patientStudent == null) {
+            return R.fail();
+        }
+        // 返回Dto赋值
+        GfStudentListDto gfStudentListDto = new GfStudentListDto().setId(patientStudent.getId())
+            .setName(patientStudent.getName()).setGender(patientStudent.getGender()).setAge(patientStudent.getAge())
+            .setStudentId(patientStudent.getStudentId()).setIdNumber(patientStudent.getIdNumber())
+            .setPhone(patientStudent.getPhone()).setCollege(patientStudent.getCollege())
+            .setMajor(patientStudent.getMajor()).setEducationLevel(patientStudent.getEducationLevel())
+            .setEnrollmentDate(patientStudent.getEnrollmentDate()).setGraduationDate(patientStudent.getGraduationDate())
+            .setGrade(patientStudent.getGrade()).setStudyMode(patientStudent.getStudyMode())
+            .setStudentStatus(patientStudent.getStudentStatus())
+            .setPhysicalExamResult(patientStudent.getPhysicalExamResult()).setCounselor(patientStudent.getCounselor())
+            .setCounselorPhone(patientStudent.getCounselorPhone()).setPatientId(patientStudent.getPatientId());
+        return R.ok(gfStudentListDto);
+    }
+
+    /**
+     * 添加学生名单
+     *
+     * @param gfStudentListDto 学生名单Dto
+     * @return 结果
+     */
+    @Override
+    public R<?> add(GfStudentListDto gfStudentListDto) {
+        // 学号重复验证
+        List<PatientStudent> sameStudentIdStudents = patientStudentService.list(
+            new LambdaQueryWrapper<PatientStudent>().eq(PatientStudent::getStudentId, gfStudentListDto.getStudentId())
+                .eq(PatientStudent::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+        if (!sameStudentIdStudents.isEmpty()) {
+            return R.fail("学号" + gfStudentListDto.getStudentId() + "在系统中已存在");
+        }
+        // 学生信息重复校验
+        List<PatientStudent> sameIdNumberStudents = patientStudentService.list(
+            new LambdaQueryWrapper<PatientStudent>().eq(PatientStudent::getIdNumber, gfStudentListDto.getIdNumber())
+                .eq(PatientStudent::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+        Long existingPatientId = null;
+        if (!sameIdNumberStudents.isEmpty()) {
+            for (PatientStudent ps : sameIdNumberStudents) {
+                if (!ps.getEnrollmentDate().after(gfStudentListDto.getGraduationDate())
+                    && !ps.getGraduationDate().before(gfStudentListDto.getEnrollmentDate())) {
+                    return R.fail("该身份证在系统中已录入过学生信息，此次录入的入校离校时间与既存数据有重叠，请确认");
+                }
+            }
+            existingPatientId = sameIdNumberStudents.get(0).getPatientId();
+        }
+        // 从身份证中获取生日和年龄
+        Date birthDate = null;
+        Integer age = null;
+        try {
+            birthDate = IdCardUtil.extractBirthdayFromIdCard(gfStudentListDto.getIdNumber());
+            age = IdCardUtil.calculateAgeFromIdCard(gfStudentListDto.getIdNumber());
+        } catch (Exception ignored) {
+        }
+        // 生成姓名的拼音码和五笔码
+        String pyStr = ChineseConvertUtils.toPinyinFirstLetter(gfStudentListDto.getName());
+        String wbStr = ChineseConvertUtils.toWBFirstLetter(gfStudentListDto.getName());
+        // 系统中不存在历史学生信息时
+        if (existingPatientId == null) {
+            // 判断患者信息是否有重复
+            List<Patient> sameIdNumberPatients = patientService
+                .list(new LambdaQueryWrapper<Patient>().eq(Patient::getIdCard, gfStudentListDto.getIdNumber())
+                    .eq(Patient::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+            if (!sameIdNumberPatients.isEmpty()) {
+                // 已存在则取存在的
+                existingPatientId = sameIdNumberPatients.get(0).getId();
+            } else {
+                // 不存在则新建患者
+                Patient patient =
+                    new Patient().setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.PATIENT_NUM.getPrefix(), 10))
+                        .setName(gfStudentListDto.getName()).setGenderEnum(gfStudentListDto.getGender())
+                        .setBirthDate(birthDate).setPhone(gfStudentListDto.getPhone())
+                        .setIdCard(gfStudentListDto.getIdNumber()).setPyStr(pyStr).setWbStr(wbStr)
+                        .setOrganizationId(SecurityUtils.getLoginUser().getOrgId());
+                patientService.save(patient);
+                existingPatientId = patient.getId();
+            }
+        }
+        // 创建学生信息
+        PatientStudent patientStudent = new PatientStudent().setName(gfStudentListDto.getName()).setPyStr(pyStr)
+            .setWbStr(wbStr).setGender(gfStudentListDto.getGender()).setAge(age)
+            .setStudentId(gfStudentListDto.getStudentId()).setIdNumber(gfStudentListDto.getIdNumber())
+            .setPhone(gfStudentListDto.getPhone()).setCollege(gfStudentListDto.getCollege())
+            .setMajor(gfStudentListDto.getMajor()).setEducationLevel(gfStudentListDto.getEducationLevel())
+            .setEnrollmentDate(gfStudentListDto.getEnrollmentDate())
+            .setGraduationDate(gfStudentListDto.getGraduationDate()).setGrade(gfStudentListDto.getGrade())
+            .setStudyMode(gfStudentListDto.getStudyMode()).setStudentStatus(gfStudentListDto.getStudentStatus())
+            .setPhysicalExamResult(gfStudentListDto.getPhysicalExamResult())
+            .setCounselor(gfStudentListDto.getCounselor()).setCounselorPhone(gfStudentListDto.getCounselorPhone())
+            .setPatientId(existingPatientId);
+        patientStudentService.save(patientStudent);
+        return R.ok();
+    }
+
+    /**
+     * 编辑学生名单
+     *
+     * @param gfStudentListDto 学生名单Dto
+     * @return 结果
+     */
+    @Override
+    public R<?> edit(GfStudentListDto gfStudentListDto) {
+        // 查询学生信息
+        PatientStudent patientStudent = patientStudentService.getById(gfStudentListDto.getId());
+        if (patientStudent == null) {
+            return R.fail("学生信息不存在");
+        }
+        // 从身份证中获取生日和年龄
+        Date birthDate = null;
+        Integer age = null;
+        try {
+            birthDate = IdCardUtil.extractBirthdayFromIdCard(gfStudentListDto.getIdNumber());
+            age = IdCardUtil.calculateAgeFromIdCard(gfStudentListDto.getIdNumber());
+        } catch (Exception ignored) {
+        }
+        // 生成姓名的拼音码和五笔码
+        String pyStr = ChineseConvertUtils.toPinyinFirstLetter(gfStudentListDto.getName());
+        String wbStr = ChineseConvertUtils.toWBFirstLetter(gfStudentListDto.getName());
+        // 更新学生信息
+        patientStudentService.update(new LambdaUpdateWrapper<PatientStudent>()
+            .set(PatientStudent::getName, gfStudentListDto.getName()).set(PatientStudent::getPyStr, pyStr)
+            .set(PatientStudent::getWbStr, wbStr).set(PatientStudent::getGender, gfStudentListDto.getGender())
+            .set(PatientStudent::getAge, age).set(PatientStudent::getStudentId, gfStudentListDto.getStudentId())
+            .set(PatientStudent::getIdNumber, gfStudentListDto.getIdNumber())
+            .set(PatientStudent::getPhone, gfStudentListDto.getPhone())
+            .set(PatientStudent::getCollege, gfStudentListDto.getCollege())
+            .set(PatientStudent::getMajor, gfStudentListDto.getMajor())
+            .set(PatientStudent::getEducationLevel, gfStudentListDto.getEducationLevel())
+            .set(PatientStudent::getEnrollmentDate, gfStudentListDto.getEnrollmentDate())
+            .set(PatientStudent::getGraduationDate, gfStudentListDto.getGraduationDate())
+            .set(PatientStudent::getGrade, gfStudentListDto.getGrade())
+            .set(PatientStudent::getStudyMode, gfStudentListDto.getStudyMode())
+            .set(PatientStudent::getStudentStatus, gfStudentListDto.getStudentStatus())
+            .set(PatientStudent::getPhysicalExamResult, gfStudentListDto.getPhysicalExamResult())
+            .set(PatientStudent::getCounselor, gfStudentListDto.getCounselor())
+            .set(PatientStudent::getCounselorPhone, gfStudentListDto.getCounselorPhone())
+            .eq(PatientStudent::getId, gfStudentListDto.getId()));
+        // 同步更新患者信息
+        patientService.update(new Patient(), new LambdaUpdateWrapper<Patient>()
+            .set(Patient::getName, gfStudentListDto.getName()).set(Patient::getPyStr, pyStr)
+            .set(Patient::getWbStr, wbStr).set(Patient::getGenderEnum, gfStudentListDto.getGender())
+            .set(Patient::getBirthDate, birthDate).set(Patient::getPhone, gfStudentListDto.getPhone())
+            .set(Patient::getIdCard, gfStudentListDto.getIdNumber()).eq(Patient::getId, patientStudent.getPatientId()));
+        return R.ok();
+    }
+
+    /**
+     * 删除学生名单
+     *
+     * @param id ID
+     * @return 结果
+     */
+    @Override
+    public R<?> delete(Long id) {
+        patientStudentService.update(new LambdaUpdateWrapper<PatientStudent>()
+            .set(PatientStudent::getDeleteFlag, DeleteFlag.DELETED.getCode()).eq(PatientStudent::getId, id));
+        return R.ok();
+    }
+
+    /**
+     * 导入学生名单
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    @Override
+    public R<?> importData(MultipartFile file) {
+        // 读取文件
+        R<List<GfStudentListImportDto>> readResult =
+            CommonUtil.readImportedExcelFile(file, GfStudentListImportDto.class);
+        if (R.SUCCESS != readResult.getCode()) {
+            return readResult;
+        }
+        List<GfStudentListImportDto> importDtoList = readResult.getData();
+        // 导入信息校验
+        R<?> validateResult = validateImportDtoList(importDtoList);
+        if (R.SUCCESS != validateResult.getCode()) {
+            return validateResult;
+        }
+        // 查询机构ID
+        Long orgId = SecurityUtils.getLoginUser().getOrgId();
+        for (GfStudentListImportDto importDto : importDtoList) {
+            // 从身份证中获取生日和年龄
+            Date birthDate = null;
+            Integer age = null;
+            try {
+                birthDate = IdCardUtil.extractBirthdayFromIdCard(importDto.getIdNumber());
+                age = IdCardUtil.calculateAgeFromIdCard(importDto.getIdNumber());
+            } catch (Exception ignored) {
+            }
+            // 生成姓名的拼音码和五笔码
+            String pyStr = ChineseConvertUtils.toPinyinFirstLetter(importDto.getName());
+            String wbStr = ChineseConvertUtils.toWBFirstLetter(importDto.getName());
+            // 患者未创建时，创建患者
+            if (importDto.getPatientId() == null) {
+                Patient patient =
+                    new Patient().setBusNo(assignSeqUtil.getSeq(AssignSeqEnum.PATIENT_NUM.getPrefix(), 10))
+                        .setName(importDto.getName()).setGenderEnum(CommonUtil.tryParseInt(importDto.getGender()))
+                        .setBirthDate(birthDate).setPhone(importDto.getPhone()).setIdCard(importDto.getIdNumber())
+                        .setPyStr(pyStr).setWbStr(wbStr).setOrganizationId(orgId);
+                patientService.save(patient);
+                importDto.setPatientId(patient.getId());
+            }
+            // 创建学生信息
+            PatientStudent patientStudent = new PatientStudent().setName(importDto.getName()).setPyStr(pyStr)
+                .setWbStr(wbStr).setGender(CommonUtil.tryParseInt(importDto.getGender())).setAge(age)
+                .setStudentId(importDto.getStudentId()).setIdNumber(importDto.getIdNumber())
+                .setPhone(importDto.getPhone()).setCollege(importDto.getCollege()).setMajor(importDto.getMajor())
+                .setEducationLevel(CommonUtil.tryParseInt(importDto.getEducationLevel()))
+                .setEnrollmentDate(importDto.getEnrollmentDate()).setGraduationDate(importDto.getGraduationDate())
+                .setGrade(importDto.getGrade()).setStudyMode(CommonUtil.tryParseInt(importDto.getStudyMode()))
+                // 在校状态：在校
+                .setStudentStatus(StudentStatus.IN_SCHOOL.getValue())
+                // 体检结果：体检合格
+                .setPhysicalExamResult(PhysicalExamResult.EXAMINATION_PASSED.getValue())
+                .setCounselor(importDto.getCounselor()).setCounselorPhone(importDto.getCounselorPhone())
+                .setPatientId(importDto.getPatientId());
+            patientStudentService.save(patientStudent);
+        }
+        return R.ok();
+    }
+
+    /**
+     * 获取导入模板
+     *
+     * @param response 响应
+     */
+    @Override
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<GfStudentListImportDto> util = new ExcelUtil<>(GfStudentListImportDto.class);
+        util.importTemplateExcel(response, "学生名单");
+    }
+
+    /**
+     * 导入信息校验
+     *
+     * @param importDtoList 学生名单导入数据列表
+     */
+    private R<?> validateImportDtoList(List<GfStudentListImportDto> importDtoList) {
+        // 字段校验（必填及数值类型）
+        List<String> fieldValidateMsgList = new ArrayList<>();
+        for (int i = 0; i < importDtoList.size(); i++) {
+            GfStudentListImportDto importDto = importDtoList.get(i);
+            importDto.setLineNumber(i + 2);
+            List<String> lineValidateMsgList = new ArrayList<>();
+            if (StringUtils.isEmpty(importDto.getName())) {
+                lineValidateMsgList.add("姓名必填");
+            }
+            if (StringUtils.isEmpty(importDto.getGender())) {
+                lineValidateMsgList.add("性别必填");
+            }
+            if (StringUtils.isEmpty(importDto.getStudentId())) {
+                lineValidateMsgList.add("学号必填");
+            }
+            if (StringUtils.isEmpty(importDto.getIdNumber())) {
+                lineValidateMsgList.add("身份证号必填");
+            }
+            if (StringUtils.isEmpty(importDto.getPhone())) {
+                lineValidateMsgList.add("电话必填");
+            }
+            if (StringUtils.isEmpty(importDto.getCollege())) {
+                lineValidateMsgList.add("学院必填");
+            }
+            if (StringUtils.isEmpty(importDto.getMajor())) {
+                lineValidateMsgList.add("专业必填");
+            }
+            if (StringUtils.isEmpty(importDto.getEducationLevel())) {
+                lineValidateMsgList.add("学历层次必填");
+            }
+            if (StringUtils.isEmpty(importDto.getEnrollmentDateStr())) {
+                lineValidateMsgList.add("入校时间必填");
+            }
+            try {
+                importDto.setEnrollmentDate(DateUtils.parseDate(importDto.getEnrollmentDateStr()));
+            } catch (Exception e) {
+                lineValidateMsgList.add("入校时间格式错误");
+            }
+            if (StringUtils.isEmpty(importDto.getGraduationDateStr())) {
+                lineValidateMsgList.add("离校时间必填");
+            }
+            try {
+                importDto.setGraduationDate(DateUtils.parseDate(importDto.getGraduationDateStr()));
+            } catch (DateTimeParseException e) {
+                lineValidateMsgList.add("离校时间格式错误");
+            }
+            if (StringUtils.isEmpty(importDto.getGrade())) {
+                lineValidateMsgList.add("年级必填");
+            }
+            if (StringUtils.isEmpty(importDto.getStudyMode())) {
+                lineValidateMsgList.add("学习形式必填");
+            }
+            if (StringUtils.isEmpty(importDto.getCounselor())) {
+                lineValidateMsgList.add("辅导员必填");
+            }
+            if (StringUtils.isEmpty(importDto.getCounselorPhone())) {
+                lineValidateMsgList.add("辅导员电话必填");
+            }
+            if (!lineValidateMsgList.isEmpty()) {
+                fieldValidateMsgList
+                    .add("■ 第" + importDto.getLineNumber() + "行：" + String.join("，", lineValidateMsgList) + "；");
+            }
+        }
+        if (!fieldValidateMsgList.isEmpty()) {
+            return R.fail("导入失败！学生名单填写有误：" + String.join(" ", fieldValidateMsgList) + " ■ ※如遇到模板中不存在的字段，请重新下载模板");
+        }
+        // 重复校验（文件行重复）
+        List<String> lineRepeatedValidateMsgList = new ArrayList<>();
+        Map<String, List<GfStudentListImportDto>> fileSameStudentIdMap =
+            importDtoList.stream().collect(Collectors.groupingBy(GfStudentListImportDto::getStudentId));
+        for (Map.Entry<String, List<GfStudentListImportDto>> entry : fileSameStudentIdMap.entrySet()) {
+            if (entry.getValue().size() > 1) {
+                lineRepeatedValidateMsgList
+                    .add("■ 第" + entry.getValue().stream().map(GfStudentListImportDto::getLineNumber).sorted()
+                        .map(Object::toString).collect(Collectors.joining(",")) + "行的学号重复；");
+            }
+        }
+        Map<String, List<GfStudentListImportDto>> fileSameIdNumberMap =
+            importDtoList.stream().collect(Collectors.groupingBy(GfStudentListImportDto::getIdNumber));
+        for (Map.Entry<String, List<GfStudentListImportDto>> entry : fileSameIdNumberMap.entrySet()) {
+            if (entry.getValue().size() > 1) {
+                lineRepeatedValidateMsgList
+                    .add("■ 第" + entry.getValue().stream().map(GfStudentListImportDto::getLineNumber).sorted()
+                        .map(Object::toString).collect(Collectors.joining(",")) + "行的身份证号重复；");
+            }
+        }
+        if (!lineRepeatedValidateMsgList.isEmpty()) {
+            return R.fail("导入失败！文件中存在重复数据：" + String.join(" ", lineRepeatedValidateMsgList));
+        }
+        // 重复校验（文件与数据库重复）
+        List<String> dbRepeatedValidateMsgList = new ArrayList<>();
+        for (GfStudentListImportDto importDto : importDtoList) {
+            List<PatientStudent> sameStudentIdStudents = patientStudentService.list(
+                new LambdaQueryWrapper<PatientStudent>().eq(PatientStudent::getStudentId, importDto.getStudentId())
+                    .eq(PatientStudent::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+            if (!sameStudentIdStudents.isEmpty()) {
+                dbRepeatedValidateMsgList.add("■ 第" + importDto.getLineNumber() + "行的学号在系统中已存在；");
+            }
+            List<PatientStudent> sameIdNumberStudents = patientStudentService
+                .list(new LambdaQueryWrapper<PatientStudent>().eq(PatientStudent::getIdNumber, importDto.getIdNumber())
+                    .eq(PatientStudent::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+            if (!sameIdNumberStudents.isEmpty()) {
+                for (PatientStudent ps : sameIdNumberStudents) {
+                    if (!ps.getEnrollmentDate().after(importDto.getGraduationDate())
+                        && !ps.getGraduationDate().before(importDto.getEnrollmentDate())) {
+                        dbRepeatedValidateMsgList
+                            .add("■ 第" + importDto.getLineNumber() + "行的身份证在系统中已录入过学生信息，此次录入的入校离校时间与既存数据有重叠，请确认；");
+                    }
+                }
+                importDto.setPatientId(sameIdNumberStudents.get(0).getPatientId());
+            }
+        }
+        if (!dbRepeatedValidateMsgList.isEmpty()) {
+            return R.fail("导入失败！系统中存在重复数据：" + String.join(" ", dbRepeatedValidateMsgList));
+        }
+        return R.ok();
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java
new file mode 100644
index 00000000..ea5b76f9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioApplicationRecordController.java
@@ -0,0 +1,124 @@
+package com.openhis.web.nenu.controller;
+
+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.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.nenu.appservice.IGfRatioApplicationRecordAppService;
+import com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationPrintDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationProcessDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+
+/**
+ * 公费医疗-比例调整申请记录 Controller
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@RestController
+@RequestMapping("/nenu/gf-ratio-application-record")
+public class GfRatioApplicationRecordController {
+
+    @Autowired
+    private IGfRatioApplicationRecordAppService gfRatioApplicationRecordAppService;
+
+    /**
+     * 查询比例调整申请记录分页
+     *
+     * @param searchParam 查询参数
+     * @param printable 申请单是否可打印
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 比例调整申请记录分页
+     */
+    @GetMapping("/page")
+    public R<IPage<GfRatioApplicationRecordDto>> getPage(GfRatioApplicationRecordDto searchParam,
+        @RequestParam(value = "printable", defaultValue = "") String printable,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return gfRatioApplicationRecordAppService.getPage(searchParam, printable, searchKey, pageNo, pageSize);
+    }
+
+    /**
+     * 查询比例调整申请记录详情
+     *
+     * @param id ID
+     * @return 比例调整申请记录详情
+     */
+    @GetMapping("/{id}")
+    public R<GfRatioApplicationRecordDto> getDetail(@PathVariable(value = "id") Long id) {
+        return gfRatioApplicationRecordAppService.getDetail(id);
+    }
+
+    /**
+     * 创建比例调整申请
+     *
+     * @param gfRatioApplicationRecordDto 比例调整申请记录Dto
+     * @return 结果
+     */
+    @PostMapping
+    public R<?> add(@Validated @RequestBody GfRatioApplicationRecordDto gfRatioApplicationRecordDto) {
+        return gfRatioApplicationRecordAppService.add(gfRatioApplicationRecordDto);
+    }
+
+    /**
+     * 取消比例调整申请
+     *
+     * @param id ID
+     * @return 结果
+     */
+    @DeleteMapping("/{id}")
+    public R<?> cancel(@PathVariable(value = "id") Long id) {
+        return gfRatioApplicationRecordAppService.cancel(id);
+    }
+
+    /**
+     * 处理比例调整申请
+     *
+     * @param gfRatioApplicationProcessDto 比例调整申请处理Dto
+     * @return 结果
+     */
+    @PutMapping
+    public R<?> process(@Validated @RequestBody GfRatioApplicationProcessDto gfRatioApplicationProcessDto) {
+        return gfRatioApplicationRecordAppService.process(gfRatioApplicationProcessDto);
+    }
+
+    /**
+     * 查询申请项目选择弹窗分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param itemType 项目分类
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 申请项目选择弹窗分页
+     */
+    @GetMapping("/definition-select-page")
+    public R<IPage<GfRatioApplicationDefinitionSelectDto>> getDefinitionSelectPage(
+        GfRatioApplicationDefinitionSelectDto searchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "itemType") Integer itemType,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return gfRatioApplicationRecordAppService.getDefinitionSelectPage(searchParam, searchKey, itemType, pageNo,
+            pageSize);
+    }
+
+    /**
+     * 查询申请单打印列表
+     *
+     * @param ids 多个ID逗号拼接
+     * @return 申请单打印列表
+     */
+    @GetMapping("/print-list")
+    public R<List<GfRatioApplicationPrintDto>> getPrintList(@RequestParam(value = "ids") String ids) {
+        return gfRatioApplicationRecordAppService.getPrintList(ids);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java
new file mode 100644
index 00000000..fd49c15e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfRatioManageController.java
@@ -0,0 +1,65 @@
+package com.openhis.web.nenu.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.openhis.web.nenu.appservice.IGfRatioManageAppService;
+import com.openhis.web.nenu.dto.GfIndividualRatioDto;
+import com.openhis.web.nenu.dto.GfTypeRatioSaveDto;
+
+/**
+ * 公费医疗-自付比例管理 Controller
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@RestController
+@RequestMapping("/nenu/gf-ratio-manage")
+public class GfRatioManageController {
+
+    @Autowired
+    private IGfRatioManageAppService gfRatioManageAppService;
+
+    /**
+     * 查询大项比例列表
+     *
+     * @return 大项比例列表
+     */
+    @GetMapping("/type-ratio-list")
+    public R<List<GfTypeRatioDto>> getTypeRatioList() {
+        return gfRatioManageAppService.getTypeRatioList();
+    }
+
+    /**
+     * 保存大项比例列表
+     *
+     * @param gfTypeRatioSaveDto 大项比例保存Dto
+     * @return 结果
+     */
+    @PutMapping("/type-ratio-list")
+    public R<?> saveTypeRatioList(@RequestBody GfTypeRatioSaveDto gfTypeRatioSaveDto) {
+        return gfRatioManageAppService.saveTypeRatioList(gfTypeRatioSaveDto.getTypeRatioList());
+    }
+
+    /**
+     * 查询单项比例分页
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 单项比例分页
+     */
+    @GetMapping("/individual-ratio-page")
+    public R<IPage<GfIndividualRatioDto>> getIndividualRatioPage(GfIndividualRatioDto searchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return gfRatioManageAppService.getIndividualRatioPage(searchParam, searchKey, pageNo, pageSize);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java
new file mode 100644
index 00000000..069e3ed4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/controller/GfStudentListController.java
@@ -0,0 +1,108 @@
+package com.openhis.web.nenu.controller;
+
+import javax.servlet.http.HttpServletResponse;
+
+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.baomidou.mybatisplus.core.metadata.IPage;
+import com.core.common.core.domain.R;
+import com.openhis.web.nenu.appservice.IGfStudentListAppService;
+import com.openhis.web.nenu.dto.GfStudentListDto;
+
+/**
+ * 公费医疗-学生名单管理 Controller
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@RestController
+@RequestMapping("/nenu/gf-student-list")
+public class GfStudentListController {
+
+    @Autowired
+    private IGfStudentListAppService gfStudentListAppService;
+
+    /**
+     * 查询学生名单分页
+     *
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 页码
+     * @param pageSize 行数
+     * @return 学生名单分页
+     */
+    @GetMapping("/page")
+    public R<IPage<GfStudentListDto>> getPage(GfStudentListDto searchParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return gfStudentListAppService.getPage(searchParam, searchKey, pageNo, pageSize);
+    }
+
+    /**
+     * 查询学生名单详情
+     *
+     * @param id ID
+     * @return 学生名单详情
+     */
+    @GetMapping("/{id}")
+    public R<GfStudentListDto> getDetail(@PathVariable(value = "id") Long id) {
+        return gfStudentListAppService.getDetail(id);
+    }
+
+    /**
+     * 添加学生名单
+     *
+     * @param gfStudentListDto 学生名单Dto
+     * @return 结果
+     */
+    @PostMapping
+    public R<?> add(@Validated @RequestBody GfStudentListDto gfStudentListDto) {
+        return gfStudentListAppService.add(gfStudentListDto);
+    }
+
+    /**
+     * 编辑学生名单
+     *
+     * @param gfStudentListDto 学生名单Dto
+     * @return 结果
+     */
+    @PutMapping
+    public R<?> edit(@Validated @RequestBody GfStudentListDto gfStudentListDto) {
+        return gfStudentListAppService.edit(gfStudentListDto);
+    }
+
+    /**
+     * 删除学生名单
+     *
+     * @param id ID
+     * @return 结果
+     */
+    @DeleteMapping("/{id}")
+    public R<?> delete(@PathVariable(value = "id") Long id) {
+        return gfStudentListAppService.delete(id);
+    }
+
+    /**
+     * 导入学生名单
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    @PostMapping("/import-data")
+    public R<?> importData(MultipartFile file) {
+        return gfStudentListAppService.importData(file);
+    }
+
+    /**
+     * 获取导入模板
+     *
+     * @param response 响应
+     */
+    @PostMapping("/import-template")
+    public void importTemplate(HttpServletResponse response) {
+        gfStudentListAppService.importTemplate(response);
+    }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java
new file mode 100644
index 00000000..ed3b38e8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfIndividualRatioDto.java
@@ -0,0 +1,73 @@
+package com.openhis.web.nenu.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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-单项比例Dto
+ *
+ * @author Thanking
+ * @date 2025-10-24
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfIndividualRatioDto {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 公费项目分类（1药品2诊疗） */
+    private Integer itemType;
+
+    /** 公费项目分类名称（1药品2诊疗） */
+    private String itemTypeName;
+
+    /** 自付比例 */
+    private BigDecimal selfRatio;
+
+    /** 二次报销的自付比例 */
+    private BigDecimal twiceRatio;
+
+    /** 开始时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 项目编号 */
+    private String busNo;
+
+    /** 项目名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 医保编码 */
+    private String ybNo;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 医保等级名称 */
+    private String chrgitmLvName;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
new file mode 100644
index 00000000..0733c31c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationDefinitionSelectDto.java
@@ -0,0 +1,51 @@
+package com.openhis.web.nenu.dto;
+
+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;
+
+/**
+ * 公费医疗-比例调整申请项目定义选择Dto
+ *
+ * @author Thanking
+ * @date 2025-10-29
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfRatioApplicationDefinitionSelectDto {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 项目编号 */
+    private String busNo;
+
+    /** 项目名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 医保编码 */
+    private String ybNo;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 医保等级名称 */
+    private String chrgitmLvName;
+
+    /** 生产厂家 */
+    private String manufacturerText;
+
+    /** 规格 */
+    private String totalVolume;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationPrintDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationPrintDto.java
new file mode 100644
index 00000000..6e167ccd
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationPrintDto.java
@@ -0,0 +1,42 @@
+package com.openhis.web.nenu.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-比例调整申请打印Dto
+ *
+ * @author Thanking
+ * @date 2025-10-30
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfRatioApplicationPrintDto {
+
+    /** 项目名称 */
+    private String itemName;
+
+    /** 全价 */
+    private String totalPrice;
+
+    /** 医保等级 */
+    private String chrgitmLv;
+
+    /** 原支付比例 */
+    private String oldRatio;
+
+    /** 新支付比例 */
+    private String newRatio;
+
+    /** 价格差 */
+    private String priceDiff;
+
+    /** 原二次支付比例 */
+    private String oldTwiceRatio;
+
+    /** 新二次支付比例 */
+    private String newTwiceRatio;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java
new file mode 100644
index 00000000..1bbb9caa
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationProcessDto.java
@@ -0,0 +1,40 @@
+package com.openhis.web.nenu.dto;
+
+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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-比例调整申请处理Dto
+ *
+ * @author Thanking
+ * @date 2025-10-28
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfRatioApplicationProcessDto {
+
+    /** ID */
+    @NotNull(message = "ID不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 角色 */
+    @NotNull(message = "角色不能为空")
+    private Integer approvalRole;
+
+    /** 通过or驳回（1通过2驳回） */
+    @NotNull(message = "通过or驳回不能为空")
+    private Integer approvalResult;
+
+    /** 意见 */
+    @NotNull(message = "意见不能为空")
+    private String approvalOpinion;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java
new file mode 100644
index 00000000..82ea42dc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfRatioApplicationRecordDto.java
@@ -0,0 +1,167 @@
+package com.openhis.web.nenu.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-比例调整申请记录Dto
+ *
+ * @author Thanking
+ * @date 2025-10-27
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfRatioApplicationRecordDto {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 申请编号 */
+    private String applicationNo;
+
+    /** 公费项目分类（1药品2诊疗） */
+    @NotNull(message = "项目分类不能为空")
+    private Integer itemType;
+    private String itemTypeName;
+
+    /** 医保等级名称 */
+    private String chrgitmLvName;
+
+    /** 医保分项 */
+    private String ybClass;
+
+    /** 医保等级 */
+    private String ybLv;
+
+    /** 申请比例 */
+    @NotNull(message = "申请比例不能为空")
+    private BigDecimal applicationRatio;
+
+    /** 原自付比例 */
+    private BigDecimal oldRatio;
+
+    /** 全价 */
+    private BigDecimal totalPrice;
+
+    /** 价格差 */
+    private BigDecimal priceDiff;
+
+    /** 二次报销的自付比例 */
+    private BigDecimal twiceRatio;
+
+    /** 原二次自付比例 */
+    private BigDecimal oldTwiceRatio;
+
+    /** 开始时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @NotNull(message = "开始时间不能为空")
+    private Date startDate;
+
+    /** 结束时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @NotNull(message = "结束时间不能为空")
+    private Date endDate;
+
+    /** 申请状态（0处理中1通过2驳回3取消） */
+    @Dict(dictCode = "application_status")
+    private Integer applicationStatus;
+    private String applicationStatus_dictText;
+
+    /** 申请人 */
+    private String applicant;
+
+    /** 申请时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date applicationTime;
+
+    /** 申请原因 */
+    @NotBlank(message = "申请原因不能为空")
+    private String applicationReason;
+
+    /** 测算盈亏负责人 */
+    private String initialApprover;
+
+    /** 测算通过or驳回（0处理中1通过2驳回） */
+    @Dict(dictCode = "application_status")
+    private Integer initialApprovalResult;
+    private String initialApprovalResult_dictText;
+
+    /** 测算时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date initialApprovalTime;
+
+    /** 测算意见 */
+    private String initialApprovalOpinion;
+
+    /** 财务科负责人 */
+    private String financeApprover;
+
+    /** 财务科通过or驳回（0处理中1通过2驳回） */
+    @Dict(dictCode = "application_status")
+    private Integer financeApprovalResult;
+    private String financeApprovalResult_dictText;
+
+    /** 报批时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date financeApprovalTime;
+
+    /** 报批意见 */
+    private String financeApprovalOpinion;
+
+    /** 会议结果录入人 */
+    private String finalRecorder;
+
+    /** 会议通过or驳回（0处理中1通过2驳回） */
+    @Dict(dictCode = "application_status")
+    private Integer finalApprovalResult;
+    private String finalApprovalResult_dictText;
+
+    /** 录入时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date finalRecordTime;
+
+    /** 录入意见 */
+    private String finalApprovalOpinion;
+
+    /** 表id */
+    @NotNull(message = "定义ID不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long definitionId;
+
+    /** 项目编号 */
+    private String busNo;
+
+    /** 项目名称 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 医保编码 */
+    private String ybNo;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java
new file mode 100644
index 00000000..1f5fff87
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListDto.java
@@ -0,0 +1,120 @@
+package com.openhis.web.nenu.dto;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-学生名单Dto
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfStudentListDto {
+
+    /** ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 姓名 */
+    @NotBlank(message = "姓名不能为空")
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 性别 */
+    @Dict(dictCode = "sys_user_sex")
+    @NotNull(message = "性别不能为空")
+    private Integer gender;
+    private String gender_dictText;
+
+    /** 年龄 */
+    private Integer age;
+
+    /** 学号 */
+    @NotBlank(message = "学号不能为空")
+    private String studentId;
+
+    /** 身份证号 */
+    @NotBlank(message = "身份证号不能为空")
+    private String idNumber;
+
+    /** 电话 */
+    @NotBlank(message = "电话不能为空")
+    private String phone;
+
+    /** 学院 */
+    @NotBlank(message = "学院不能为空")
+    private String college;
+
+    /** 专业 */
+    @NotBlank(message = "专业不能为空")
+    private String major;
+
+    /** 学历层次（0预科生1本科生2硕士研究生3博士研究生） */
+    @Dict(dictCode = "education_level")
+    @NotNull(message = "学历层次不能为空")
+    private Integer educationLevel;
+    private String educationLevel_dictText;
+
+    /** 入校时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @NotNull(message = "入校时间不能为空")
+    private Date enrollmentDate;
+
+    /** 离校时间 */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @NotNull(message = "离校时间不能为空")
+    private Date graduationDate;
+
+    /** 年级 */
+    @NotBlank(message = "年级不能为空")
+    private String grade;
+
+    /** 学习形式（1全日制2非全日制） */
+    @Dict(dictCode = "study_mode")
+    @NotNull(message = "学习形式不能为空")
+    private Integer studyMode;
+    private String studyMode_dictText;
+
+    /** 在校状态（0在校1休学2离校） */
+    @Dict(dictCode = "student_status")
+    private Integer studentStatus;
+    private String studentStatus_dictText;
+
+    /** 体检结果（0未体检1体检不合格2体检合格） */
+    @Dict(dictCode = "physical_exam_result")
+    private Integer physicalExamResult;
+    private String physicalExamResult_dictText;
+
+    /** 辅导员 */
+    private String counselor;
+
+    /** 辅导员电话 */
+    private String counselorPhone;
+
+    /** 患者ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
new file mode 100644
index 00000000..e23a24e6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfStudentListImportDto.java
@@ -0,0 +1,81 @@
+package com.openhis.web.nenu.dto;
+
+import java.util.Date;
+
+import com.core.common.annotation.Excel;
+
+import lombok.Data;
+
+/**
+ * 公费医疗-学生名单导入Dto
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Data
+public class GfStudentListImportDto {
+
+    /** 行号 */
+    private Integer lineNumber;
+
+    /** 患者ID */
+    private Long patientId;
+
+    /** 姓名 */
+    @Excel(name = "姓名", prompt = "必填")
+    private String name;
+
+    /** 性别 */
+    @Excel(name = "性别", prompt = "必填", readConverterExp = "0=男性,1=女性,2=未知", combo = "男性,女性,未知")
+    private String gender;
+
+    /** 学号 */
+    @Excel(name = "学号", prompt = "必填")
+    private String studentId;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号", prompt = "必填")
+    private String idNumber;
+
+    /** 电话 */
+    @Excel(name = "电话", prompt = "必填")
+    private String phone;
+
+    /** 学院 */
+    @Excel(name = "学院", prompt = "必填")
+    private String college;
+
+    /** 专业 */
+    @Excel(name = "专业", prompt = "必填")
+    private String major;
+
+    /** 学历层次（0预科生1本科生2硕士研究生3博士研究生） */
+    @Excel(name = "学历层次", prompt = "必填", dictType = "education_level", comboReadDict = true)
+    private String educationLevel;
+
+    /** 入校时间 */
+    @Excel(name = "入校时间", prompt = "必填，格式：yyyy-MM-dd", dateFormat = "yyyy-MM-dd")
+    private String enrollmentDateStr;
+    private Date enrollmentDate;
+
+    /** 离校时间 */
+    @Excel(name = "离校时间", prompt = "必填，格式：yyyy-MM-dd", dateFormat = "yyyy-MM-dd")
+    private String graduationDateStr;
+    private Date graduationDate;
+
+    /** 年级 */
+    @Excel(name = "年级", prompt = "必填")
+    private String grade;
+
+    /** 学习形式（1全日制2非全日制） */
+    @Excel(name = "学习形式", prompt = "必填", dictType = "study_mode", comboReadDict = true)
+    private String studyMode;
+
+    /** 辅导员 */
+    @Excel(name = "辅导员")
+    private String counselor;
+
+    /** 辅导员电话 */
+    @Excel(name = "辅导员电话")
+    private String counselorPhone;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java
new file mode 100644
index 00000000..e3faa7e2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/dto/GfTypeRatioSaveDto.java
@@ -0,0 +1,24 @@
+package com.openhis.web.nenu.dto;
+
+import java.util.List;
+
+import com.openhis.nenu.dto.GfTypeRatioDto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-大项比例保存Dto
+ *
+ * @author Thanking
+ * @date 2025-10-24
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfTypeRatioSaveDto {
+
+    /** 大项比例列表 */
+    private List<GfTypeRatioDto> typeRatioList;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
new file mode 100644
index 00000000..fb579831
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioApplicationRecordAppMapper.java
@@ -0,0 +1,45 @@
+package com.openhis.web.nenu.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.nenu.dto.GfRatioApplicationDefinitionSelectDto;
+import com.openhis.web.nenu.dto.GfRatioApplicationRecordDto;
+
+/**
+ * 公费医疗-比例调整申请记录 Mapper
+ *
+ * @author Thanking
+ * @date 2025-10-27
+ */
+@Repository
+public interface GfRatioApplicationRecordAppMapper {
+
+    /**
+     * 查询比例调整申请记录分页
+     *
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 比例调整申请记录分页
+     */
+    IPage<GfRatioApplicationRecordDto> selectGfRatioApplicationRecordPage(
+        @Param("page") Page<GfRatioApplicationRecordDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<GfRatioApplicationRecordDto> queryWrapper);
+
+    /**
+     * 查询申请项目选择弹窗分页
+     *
+     * @param itemType 项目分类
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 申请项目选择弹窗分页
+     */
+    IPage<GfRatioApplicationDefinitionSelectDto> selectGfRatioApplicationDefinitionSelectPage(
+        @Param("itemType") Integer itemType, @Param("page") Page<GfRatioApplicationDefinitionSelectDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<GfRatioApplicationDefinitionSelectDto> queryWrapper);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java
new file mode 100644
index 00000000..31a5beca
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfRatioManageAppMapper.java
@@ -0,0 +1,31 @@
+package com.openhis.web.nenu.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.nenu.dto.GfIndividualRatioDto;
+
+/**
+ * 公费医疗-自付比例管理 Mapper
+ *
+ * @author Thanking
+ * @date 2025-10-24
+ */
+@Repository
+public interface GfRatioManageAppMapper {
+
+    /**
+     * 查询单项比例分页
+     *
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 单项比例分页
+     */
+    IPage<GfIndividualRatioDto> selectGfIndividualRatioPage(@Param("page") Page<GfIndividualRatioDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<GfIndividualRatioDto> queryWrapper);
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java
new file mode 100644
index 00000000..bcd98746
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/nenu/mapper/GfStudentListAppMapper.java
@@ -0,0 +1,31 @@
+package com.openhis.web.nenu.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.nenu.dto.GfStudentListDto;
+
+/**
+ * 公费医疗-学生名单管理 Mapper
+ *
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Repository
+public interface GfStudentListAppMapper {
+
+    /**
+     * 查询学生名单分页
+     *
+     * @param page 分页参数
+     * @param queryWrapper 查询条件
+     * @return 学生名单分页
+     */
+    IPage<GfStudentListDto> selectGfStudentListPage(@Param("page") Page<GfStudentListDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<GfStudentListDto> queryWrapper);
+
+}
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
index 6cc2c89b..6fef096e 100644
--- 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
@@ -16,6 +16,8 @@ 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.administration.domain.ChargeItem;
+import com.openhis.administration.service.IChargeItemService;
 import com.openhis.clinical.domain.Procedure;
 import com.openhis.clinical.service.IProcedureService;
 import com.openhis.common.constant.CommonConstants;
@@ -35,7 +37,7 @@ import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;
 import com.openhis.web.outpatientmanage.mapper.OutpatientTreatmentAppMapper;
 import com.openhis.web.pharmacymanage.appservice.impl.ReturnMedicineAppServiceImpl;
 import com.openhis.web.pharmacymanage.appservice.impl.WesternMedicineDispenseAppServiceImpl;
-import com.openhis.web.pharmacymanage.dto.InventoryDto;
+import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
 import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.DeviceRequest;
@@ -87,6 +89,9 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
     @Resource
     private ReturnMedicineAppServiceImpl returnedMedicineAppServiceImpl;
 
+    @Resource
+    private IChargeItemService chargeItemService;
+
     @Resource
     private AssignSeqUtil assignSeqUtil;
 
@@ -134,8 +139,9 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
             HisQueryUtils.buildQueryWrapper(outpatientTreatmentEncounterDto, searchKey, searchFields, request);
 
         // 查询就诊病人列表
-        Page<OutpatientTreatmentEncounterDto> encounterInfoPageDto = outpatientTreatmentAppMapper
-            .selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, EncounterClass.AMB.getValue());
+        Page<OutpatientTreatmentEncounterDto> encounterInfoPageDto =
+            outpatientTreatmentAppMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper,
+                EncounterClass.AMB.getValue(), RequestStatus.COMPLETED.getValue(), RequestStatus.CANCELLED.getValue());
         encounterInfoPageDto.getRecords().forEach(prescriptionPatientInfoDto -> {
             // 性别
             prescriptionPatientInfoDto.setGenderEnum_enumText(
@@ -253,16 +259,28 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
         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())
-                || CommonConstants.TableName.WOR_DEVICE_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);
             }
-            // else if (CommonConstants.TableName.WOR_DEVICE_REQUEST.equals(item.getRequestTable())) {
-            // devicePerformList.add(item);
-            // }
         }
         // 分别处理诊疗/药品执行和耗材发放
         if (!serviceMedPerformList.isEmpty()) {
+            List<ChargeItem> chargeItemList = chargeItemService.getChargeItemInfoByReqId(
+                serviceMedPerformList.stream().map(PerformInfoDto::getRequestId).collect(Collectors.toList()));
+            if (chargeItemList == null || chargeItemList.isEmpty()) {
+                throw new ServiceException("未找到对应的收费项,请联系管理员");
+            }
+            // 按requestId分组收费项
+            Map<Long, List<ChargeItem>> chargeItemMap =
+                chargeItemList.stream().collect(Collectors.groupingBy(ChargeItem::getServiceId));
+            // 过滤出已收费的执行项目
+            serviceMedPerformList = serviceMedPerformList.stream().filter(performInfo -> {
+                List<ChargeItem> chargeItems = chargeItemMap.get(performInfo.getRequestId());
+                return chargeItems != null && chargeItems.stream()
+                    .anyMatch(chargeItem -> ChargeItemStatus.BILLED.getValue().equals(chargeItem.getStatusEnum()));
+            }).toList();
             // 处理诊疗执行
             for (PerformInfoDto performInfoDto : serviceMedPerformList) {
                 Long groupId = performInfoDto.getGroupId();
@@ -323,107 +341,110 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
                     }
                 }
             }
-        } else {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
         }
-        // todo：因长大农大在执行的时候都不发耗材，暂时注释掉
-        // // 返回信息
-        // 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().intValue(), 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商品销售上传成功";
-        // }
-        // }
-        // }
+        // 返回信息
+        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<DeviceDispense> dispenseList = deviceDispenseService
+                .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getId, devDispenseIdList));
+            // 获取耗材待发放id列表
+            List<Long> devUnDispenseIdList = new ArrayList<>();
+            if (dispenseList != null) {
+                List<DeviceDispense> unDispenseList = dispenseList.stream()
+                    .filter(x -> DispenseStatus.PREPARATION.getValue().equals(x.getStatusEnum())).toList();
+                for (DeviceDispense deviceDispense : unDispenseList) {
+                    // 耗材发放状态
+                    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().intValue(), CommonConstants.Common.DEV_TRACE_NO)));
+                    devUnDispenseIdList.add(deviceDispense.getId());
+                }
+                // 药品发放更新
+                deviceDispenseService.updateBatchById(dispenseList);
+            } else {
+                return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+            }
+            // 获取库存信息
+            List<UnDispenseInventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(
+                devUnDispenseIdList, null, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+            // 按每个耗材分组
+            Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+                inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
+            // 遍历每个分组校验库存状态
+            for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+                List<UnDispenseInventoryDto> groupItems = entry.getValue();
+                if (groupItems.stream().map(UnDispenseInventoryDto::getInventoryStatusEnum)
+                    .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
+                    // 库存停供校验
+                    return R.fail(groupItems.get(0).getItemName() + "库存已停供");
+                }
+            }
+            List<InventoryItem> inventoryItemList = new ArrayList<>();
+            if (!inventoryList.isEmpty()) {
+                for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                    if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
+                        InventoryItem inventoryItem = new InventoryItem();
+                        // 库存数量判定
+                        if (unDispenseInventoryDto.getDispenseUnit()
+                            .equals(unDispenseInventoryDto.getInventoryUnitCode())) {
+                            // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                            BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                                .subtract(unDispenseInventoryDto.getQuantity());
+                            // 库存数量判定
+                            if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                                // 库存数量不足
+                                return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
+                            } else {
+                                inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
+                            }
+                        } else {
+                            // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                            BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(
+                                unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
+                            // 库存数量判定
+                            if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                                // 库存数量不足
+                                return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
+                            } else {
+                                inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
+                            }
+                        }
+                        inventoryItemList.add(inventoryItem);
+                    }
+                }
+            }
+            // 库存更新
+            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("执行成功");
     }
 
@@ -479,8 +500,6 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
                     }
                 }
             }
-        } else {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
         }
 
         // 返回信息
@@ -501,7 +520,7 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
                     .eq(DeviceRequest::getRefundDeviceId, performInfoDto.getRequestId())
                     .eq(DeviceRequest::getDeleteFlag, DelFlag.NO.getCode()));
                 if (deviceRefundRequest != null) {
-                    if (deviceRefundRequest.getStatusEnum().equals(EventStatus.CANCEL.getValue())) {
+                    if (deviceRefundRequest.getStatusEnum().equals(RequestStatus.CANCELLED.getValue())) {
                         // 获取待退的耗材请求id
                         devRefundRequestIdList.add(deviceRefundRequest.getId());
                         devRequestIdPairList.add(new Pair<>(requestId, deviceRefundRequest.getId()));
@@ -550,11 +569,12 @@ public class OutpatientTreatmentAppServiceImpl implements IOutpatientTreatmentAp
 
             List<InventoryItem> inventoryItemList = new ArrayList<>();
             // 获取库存信息
-            List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
-                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+            List<UnDispenseInventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList,
+                null, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
             if (inventoryList != null && !inventoryList.isEmpty()) {
                 // 设置库存数量
-                for (InventoryDto inventory : inventoryList) {
+                for (UnDispenseInventoryDto inventory : inventoryList) {
                     // 库存表项目设定
                     InventoryItem inventoryItem = new InventoryItem();
                     // id
diff --git a/openhis-server-new/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
index 2d049693..83e1a658 100644
--- a/openhis-server-new/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
@@ -66,10 +66,10 @@ public class OutpatientInfusionController {
      * @return 门诊输液待执行记录列表
      */
     @GetMapping(value = "/infusion-pending-record")
-    public R<?> getInfusionPendingRecord(@RequestParam Long encounterId,@RequestParam Integer serviceStatus,
+    public R<?> getInfusionPendingRecord(@RequestParam Long encounterId, @RequestParam Integer serviceStatus,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return outpatientInfusionAppService.getInfusionPendingRecord(encounterId, serviceStatus,pageNo, pageSize);
+        return outpatientInfusionAppService.getInfusionPendingRecord(encounterId, serviceStatus, pageNo, pageSize);
     }
 
     /**
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
index 6d2a0980..c8df7a0c 100644
--- 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
@@ -5,16 +5,16 @@ package com.openhis.web.outpatientmanage.mapper;
 
 import java.util.List;
 
-import com.openhis.web.outpatientmanage.dto.BloodTransfusionPatchDto;
 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.common.dto.PerformRecordDto;
+import com.openhis.web.outpatientmanage.dto.BloodTransfusionPatchDto;
 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 {
@@ -25,12 +25,14 @@ public interface OutpatientTreatmentAppMapper {
      * @param page 分页
      * @param queryWrapper 查询条件
      * @param amb 就诊类型：门诊
+     * @param completed 请求状态：已完成
+     * @param cancelled 请求状态：取消
      * @return 就诊病人列表
      */
     Page<OutpatientTreatmentEncounterDto> selectEncounterInfoListPage(
         @Param("page") Page<OutpatientTreatmentEncounterDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<OutpatientTreatmentEncounterDto> queryWrapper,
-        @Param("amb") Integer amb);
+        @Param(Constants.WRAPPER) QueryWrapper<OutpatientTreatmentEncounterDto> queryWrapper, @Param("amb") Integer amb,
+        @Param("completed") Integer completed, @Param("cancelled") Integer cancelled);
 
     /**
      * 处置项目查询
diff --git a/openhis-server-new/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
index dcf55f25..a24f1392 100644
--- a/openhis-server-new/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
@@ -50,7 +50,7 @@ public class OutpatientRecordServiceImpl implements IOutpatientRecordService {
         // 构建查询条件
         QueryWrapper<OutpatientRecordDto> queryWrapper =
             HisQueryUtils.buildQueryWrapper(outpatientRecordSearchParam, searchKey,
-                new HashSet<>(Arrays.asList(CommonConstants.FieldName.idCard, CommonConstants.FieldName.Name,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.IdCard, CommonConstants.FieldName.Name,
                     CommonConstants.FieldName.PatientBusNo, CommonConstants.FieldName.EncounterBusNo)),
                 request);
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
new file mode 100644
index 00000000..a12f03e2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
@@ -0,0 +1,17 @@
+package com.openhis.web.paymentmanage.appservice;
+
+import com.github.pagehelper.PageInfo;
+import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
+
+import java.util.List;
+
+/**
+ * Desc:
+ * @Author raymond
+ * @Date 16:09 2025/10/15
+ * @return
+ **/
+public interface IChangePriceService {
+
+    PageInfo<ChangePriceListDto> searchMedicationList(Integer pageNo, Integer pageSize);
+}
diff --git a/openhis-server-new/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
index 93964438..d811d900 100644
--- a/openhis-server-new/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
@@ -13,6 +13,7 @@ import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
 import com.openhis.web.paymentmanage.dto.InpatientPreSettleResultDto;
+import com.openhis.web.paymentmanage.dto.NenuBpcPayDto;
 import com.openhis.web.paymentmanage.dto.PaymentVO;
 import com.openhis.yb.dto.PaymentDetailDto;
 import com.openhis.yb.dto.PaymentDto;
@@ -59,7 +60,7 @@ public interface IPaymentRecService {
      * @param request 请求参数
      * @return 结果
      */
-    IPage<PaymentVO> getPage(String searchKey, Integer kingEnum,String invoiceNo, Integer pageNo, Integer pageSize,
+    IPage<PaymentVO> getPage(String searchKey, Integer kingEnum, String invoiceNo, Integer pageNo, Integer pageSize,
         HttpServletRequest request);
 
     /**
@@ -126,4 +127,12 @@ public interface IPaymentRecService {
      * @return 操作结果
      */
     R<?> inpatientUnPay(Long paymentId);
+
+    /**
+     * BPC支付
+     * 
+     * @param nenuBpcPayDto bpc支付参数
+     * @return 结果
+     */
+    String nenuBpcPay(NenuBpcPayDto nenuBpcPayDto);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java
new file mode 100644
index 00000000..c4c58e30
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java
@@ -0,0 +1,14 @@
+package com.openhis.web.paymentmanage.appservice;
+
+import com.core.common.core.domain.R;
+import com.openhis.yb.dto.ThreePartPayDto;
+
+/**
+ * 第三方支付应用层Service
+ *
+ * @author SunJQ
+ * @date 2025-03-29
+ */
+public interface ThreePartPayService {
+    R<?> payFor(ThreePartPayDto threePartPayDto);
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
new file mode 100644
index 00000000..ede44f32
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
@@ -0,0 +1,33 @@
+package com.openhis.web.paymentmanage.appservice.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.web.paymentmanage.appservice.IChangePriceService;
+import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
+import com.openhis.web.paymentmanage.mapper.ChangePriceMapper;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName ChangePriceImpl
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/15 16:10
+ * @Version 1.0
+ **/
+@Component
+public class ChangePriceImpl implements IChangePriceService {
+
+    @Resource
+    private ChangePriceMapper changePriceMapper;
+    @Override
+    public PageInfo<ChangePriceListDto> searchMedicationList(Integer pageNo, Integer pageSize) {
+//        PageHelper.startPage(pageNo,pageSize);
+        List<MedicationDefinition> medicationDefinitions = this.changePriceMapper.searchMedicationList();
+//        PageInfo<ChangePriceListDto> pageInfo = new PageInfo<>(list);
+        return null;
+    }
+}
diff --git a/openhis-server-new/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
index 72782595..fb343598 100644
--- a/openhis-server-new/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
@@ -11,31 +11,49 @@ import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
 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.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpResponse;
 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.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
+import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.domain.Encounter;
+import com.openhis.administration.domain.Invoice;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.IInvoiceService;
+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.enums.ybenums.YbEncounterClass;
 import com.openhis.common.enums.ybenums.YbPayment;
 import com.openhis.config.HttpConfig;
 import com.openhis.financial.domain.PaymentRecDetail;
@@ -48,24 +66,8 @@ import com.openhis.web.paymentmanage.mapper.EleInvoiceMapper;
 import com.openhis.yb.domain.ClinicReg;
 import com.openhis.yb.service.IClinicSettleService;
 import com.openhis.yb.service.IRegService;
-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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.core.common.core.domain.R;
-import com.openhis.common.constant.PromptMsgConstant;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 电子发票接口Service
@@ -76,6 +78,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Component
 @Slf4j
 public class EleInvoiceServiceImpl implements IEleInvoiceService {
+    private static final BigDecimal ZERO = new BigDecimal("0.00");
     Logger logger = LoggerFactory.getLogger(EleInvoiceServiceImpl.class);
     @Resource
     EleInvoiceMapper eleInvoiceMapper;
@@ -83,9 +86,6 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
     IInvoiceService invoiceService;
     @Resource
     IPractitionerService practitionerService;
-
-    @Resource
-    private AssignSeqUtil assignSeqUtil;
     @Resource
     IRegService regService;
     @Resource
@@ -98,10 +98,155 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
     IChargeItemService chargeItemService;
     @Resource
     IEncounterService encounterService;
-
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
     @Autowired
     private HttpConfig httpConfig;
-    private static final BigDecimal ZERO = new BigDecimal("0.00");
+
+    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);
+    }
+
+    /**
+     * 发送请求
+     *
+     * @param bill 请求参数
+     * @param endpoint 请求后缀url
+     * @return 返回值
+     */
+    public static JSONObject PreInvoicePost(JSONObject bill, String endpoint) {
+
+        JSONObject result = new JSONObject();
+        // 获取当前租户的option信息
+        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
+
+        String baseUrl = optionJson.getString(CommonConstants.Option.URL);
+        // 拼接成完整 URL（作为路径）
+        String cleanUrl = baseUrl + "/" + endpoint; // 确保用 "/" 分隔
+        String url = cleanUrl.trim().replaceAll("^\"|\"$", "") // 去除首尾引号
+            .replaceAll("\\s+", "")// 去除首尾引号
+            .replaceAll("\"", ""); // 去除中间引号
+
+        String appID = optionJson.getString(CommonConstants.Option.APP_ID);
+        String appKey = optionJson.getString(CommonConstants.Option.KEY);
+        String data = bill.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;
+
+    }
 
     /**
      * 电子票据补开接口
@@ -247,7 +392,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                 chargeDetail.put("unit", "项");
                 // std 收费标准 Number 14,2 是
                 BigDecimal std =
-                    detail.getAmt().divide(new BigDecimal(detail.getNumber().toString()), 2, RoundingMode.HALF_UP);
+                    detail.getAmt().divide(new BigDecimal(detail.getNumber().toString()), 6, RoundingMode.HALF_UP);
                 // 精确表示，避免科学计数法
                 chargeDetail.put("std", df.format(std));
                 // number 数量 Number 14,2 是
@@ -308,9 +453,9 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
 
             System.out.println(JSON.toJSONString(bill));
             JSONObject resobj;
-            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/invEBillRegistration");
-            }else{
+            } else {
                 resobj = PreInvoicePost(bill, "api/medical/invEBillRegistration");
             }
             if (resobj.getBooleanValue("success")) {
@@ -321,7 +466,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));
+                    logger.info("挂号信息：" + JSON.toJSONString(redata));
                     // 获取发票管理表信息
                     Invoice invoice = invoiceService.getById(paymentInfo.getInvoiceId());
                     // 状态
@@ -498,13 +643,22 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             otherInfo.put("infoValue", clinicSettle.getHospPartAmt() == null ? ZERO : clinicSettle.getHospPartAmt());
             otherInfos.add(otherInfo);
 
+            // 师大公费医疗
+            BigDecimal otherPay = clinicSettle.getOthPay() == null ? ZERO : clinicSettle.getOthPay();
+            BigDecimal gfRatio = clinicSettle.getGfRatio() == null ? ZERO : clinicSettle.getGfRatio();
+
             otherInfo = new JSONObject();
             otherInfo.put("infoNo", "1");
             otherInfo.put("infoName", "其他支出");
-            otherInfo.put("infoValue", clinicSettle.getOthPay() == null ? ZERO : clinicSettle.getOthPay());
+            otherInfo.put("infoValue", otherPay.add(gfRatio));
             otherInfos.add(otherInfo);
             bill.put("otherInfo", otherInfos);
 
+            // 师大remark记录
+            if (gfRatio.compareTo(BigDecimal.ZERO) > 0) {
+                bill.put("remark", "学校垫支金额：" + gfRatio);
+            }
+
             // ------项目------
             // 医疗收费项目类别
             // 01 床位费,02 诊察费,03 检查费,04 化验费,05 治疗费,06 手术费,07 护理费,08 卫生材料费,09 西药费,10 中药饮片费,11 中成药费,12 一般诊疗费,13 挂号费,14 其他费
@@ -536,7 +690,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                 chargeDetail.put("unit", "项");
                 // std 收费标准 Number 14,2 是
                 BigDecimal std =
-                    detail.getAmt().divide(new BigDecimal(detail.getNumber().toString()), 2, RoundingMode.HALF_UP);
+                    detail.getAmt().divide(new BigDecimal(detail.getNumber().toString()), 6, RoundingMode.HALF_UP);
                 chargeDetail.put("std", df.format(std));
                 // number 数量 Number 14,2 是
                 chargeDetail.put("number", detail.getNumber());
@@ -595,9 +749,9 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String srcmsg;
             System.out.println(JSON.toJSONString(bill));
             JSONObject resobj;
-            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/invoiceEBillOutpatient");
-            }else{
+            } else {
                 resobj = PreInvoicePost(bill, "api/medical/invoiceEBillOutpatient");
             }
             if (resobj.getBooleanValue("success")) {
@@ -607,7 +761,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));
+                    logger.info("门诊信息：" + JSON.toJSONString(redata));
                     // 获取发票管理表信息
                     Invoice invoice = invoiceService.getById(paymentInfo.getInvoiceId());
                     // 状态
@@ -874,7 +1028,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
                 chargeDetail.put("unit", "项");
                 // std 收费标准 Number 14,2 是
                 BigDecimal std =
-                    detail.getAmt().divide(new BigDecimal(detail.getNumber().toString()), 2, RoundingMode.HALF_UP);
+                    detail.getAmt().divide(new BigDecimal(detail.getNumber().toString()), 6, RoundingMode.HALF_UP);
                 // 精确表示，避免科学计数法
                 chargeDetail.put("std", df.format(std));
                 // number 数量 Number 14,2 是
@@ -894,11 +1048,11 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String redata64;
             String srcdata;
             String srcmsg;
-            //JSONObject resobj = PreInvoicePostForward(bill, "api/medical/invEBillHospitalized");
+            // JSONObject resobj = PreInvoicePostForward(bill, "api/medical/invEBillHospitalized");
             JSONObject resobj;
-            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))){
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/invEBillHospitalized");
-            }else{
+            } else {
                 resobj = PreInvoicePost(bill, "api/medical/invEBillHospitalized");
             }
             if (resobj.getBooleanValue("success")) {
@@ -908,7 +1062,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));
+                    logger.info("住院信息：" + JSON.toJSONString(redata));
                     // 获取发票管理表信息
                     Invoice invoice = invoiceService.getById(paymentInfo.getInvoiceId());
                     // 状态
@@ -1222,10 +1376,13 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             }
         } else {
             // 医保
+            // 2025/10/20 长大异常情况 24.24+29.05+4.15》53.29，猜测实际医保段otherpay是包含在fundpay或者zhpay的某一个
             payChannelDetail = new JSONObject();
             payChannelDetail.put("payChannelCode", "11");
-            payChannelDetail.put("payChannelValue", df.format(paymentInfo.getYbFundPayAmount().add(paymentInfo
-                .getOtherPayAmount().add(paymentInfo.getZhPayAmount()).add(paymentInfo.getAelfYbZhGjValue()))));
+            // payChannelDetail.put("payChannelValue", df.format(paymentInfo.getYbFundPayAmount().add(paymentInfo
+            // .getOtherPayAmount().add(paymentInfo.getZhPayAmount()).add(paymentInfo.getAelfYbZhGjValue()))));
+            payChannelDetail.put("payChannelValue", df.format(paymentInfo.getYbFundPayAmount()
+                .add(paymentInfo.getZhPayAmount()).add(paymentInfo.getAelfYbZhGjValue())));
             payChannelDetails.add(payChannelDetail);
 
             // 现金
@@ -1328,12 +1485,12 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             String srcdata;
             String srcmsg;
 
-            //JSONObject resobj = PreInvoicePostForward(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"))){
+            logger.info("冲红信息入参：" + JSON.toJSONString(bill));
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/writeOffEBill");
-            }else{
+            } else {
                 resobj = PreInvoicePost(bill, "api/medical/writeOffEBill");
             }
             if (resobj.getBooleanValue("success")) {
@@ -1343,7 +1500,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));
+                    logger.info("冲红信息：" + JSON.toJSONString(redata));
                     // 修改发票管理表数据
                     // 状态
                     invoice.setStatusEnum(InvoiceStatus.CANCELLED);
@@ -1431,151 +1588,6 @@ 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);
-    }
-
-    /**
-     * 发送请求
-     *
-     * @param bill 请求参数
-     * @param endpoint 请求后缀url
-     * @return 返回值
-     */
-    public static JSONObject PreInvoicePost(JSONObject bill, String endpoint) {
-
-        JSONObject result = new JSONObject();
-        // 获取当前租户的option信息
-        JSONObject optionJson = SecurityUtils.getLoginUser().getOptionJson();
-
-        String baseUrl = optionJson.getString(CommonConstants.Option.URL);
-        // 拼接成完整 URL（作为路径）
-        String cleanUrl = baseUrl + "/" + endpoint; // 确保用 "/" 分隔
-        String url = cleanUrl.trim().replaceAll("^\"|\"$", "") // 去除首尾引号
-            .replaceAll("\\s+", "")// 去除首尾引号
-            .replaceAll("\"", ""); // 去除中间引号
-
-        String appID = optionJson.getString(CommonConstants.Option.APP_ID);
-        String appKey = optionJson.getString(CommonConstants.Option.KEY);
-        String data = bill.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;
-
-    }
-
     /**
      * 通过paymentId获取医保结算实体
      *
@@ -1631,6 +1643,10 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             if (YbPayment.OVERLMT_SELFPAY.getValue().equals(detail.getPayEnum())) {
                 invoiceBaseInfoDto.setOverlmtSelfpay(detail.getAmount());
             }
+            // 学校垫支
+            if (YbPayment.SCHOOL_GF_PAY.getValue().equals(detail.getPayEnum())) {
+                invoiceBaseInfoDto.setGfRatio(detail.getAmount());
+            }
         }
         return invoiceBaseInfoDto;
     }
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
index 4dc66cc6..9f9e7c1b 100644
--- 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
@@ -182,6 +182,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
             if (Objects.equals(paymentRecDetail.getPayEnum(), YbPayment.SELF_CASH_ALI_VALUE.getValue())) {
                 map.put("aliCash", paymentRecDetail.getAmount());// 现金（支付宝）
             }
+            if (Objects.equals(paymentRecDetail.getPayEnum(), YbPayment.INSCP_SCP_AMT.getValue())) {
+                map.put("FHZCAmount", paymentRecDetail.getAmount());// 符合政策金额
+            }
         }
 
         Invoice invoice = iInvoiceService.getOne(new LambdaQueryWrapper<Invoice>()
@@ -1440,6 +1443,7 @@ public class IChargeBillServiceImpl implements IChargeBillService {
         BigDecimal uniSum = BigDecimal.ZERO;// 银行卡总数
         BigDecimal SelfCashSum = BigDecimal.ZERO;// 自费现金总额
         BigDecimal YbCashSum = BigDecimal.ZERO;// 医保现金总额
+        BigDecimal discountSum = BigDecimal.ZERO;// 优惠金额
         // 长大版本要显示出来省市医保的区别
         List<Contract> redisContractList = iContractService.getRedisContractList();
         Map<String, List<Contract>> contractMapByBusNo =
@@ -1480,6 +1484,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
                 if (YbPayment.SELF_YB_ZH_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
                     zhSum = zhSum.add(paymentRecDetailAccountResult.getAmount());
                 }
+                if (YbPayment.DISCOUNT_PAY.getValue().equals(paymentRecDetailAccountResult.getPayEnum())) {
+                    discountSum = discountSum.add(paymentRecDetailAccountResult.getAmount());
+                }
                 // 其他的大病支付或者慢病特病支付往下接if
                 map.put(
                     contractMapByBusNo.get(key) == null ? key : contractMapByBusNo.get(key).get(0).getBusNo() + "cash",
@@ -1500,6 +1507,7 @@ public class IChargeBillServiceImpl implements IChargeBillService {
         map.put("vxCashSum", vxCashSum);// 自费现金vx
         map.put("uniCashSum", uniCashSum);// 自费现金银联
         map.put("aliCashSum", aliCashSum);// 自费现金ali
+        map.put("discountSum", discountSum);// 优惠金额
 
         // 将所有的payment分组进行单独处理（业务注释：处理不同财务分类的金额，如西药费中药费等）
         List<PaymentReconciliationAccountDel> paymentList = new ArrayList<>();
@@ -1727,7 +1735,7 @@ public class IChargeBillServiceImpl implements IChargeBillService {
         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);
+            .add(chineseMedicineSlicesFee).add(generalConsultationFee).add(registrationFee).add(otherFee).subtract(discountSum);
         map.put("SUM", sum);// 合计费用
 
         Map<String, List<ChargeItemDefInfo>> chargeItemDefKVByTypeCode =
diff --git a/openhis-server-new/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
index 1b2093f2..6e52e4d3 100644
--- a/openhis-server-new/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
@@ -37,6 +37,7 @@ 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.administration.service.impl.PatientStudentServiceImpl;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
@@ -55,12 +56,15 @@ import com.openhis.financial.service.*;
 import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.nenu.domain.TransactionResponse;
+import com.openhis.nenu.service.ITransactionResponseService;
 import com.openhis.web.chargemanage.appservice.impl.OutpatientRegistrationAppServiceImpl;
 import com.openhis.web.chargemanage.dto.*;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.AdvicePriceDto;
+import com.openhis.web.externalintegration.appservice.IBankPosCloudAppService;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.*;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
@@ -98,6 +102,12 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     @Resource
     private IPaymentNoticeService paymentNoticeService;
     @Resource
+    private ITransactionResponseService transactionResponseService;
+    @Resource
+    private IBankPosCloudAppService bankPosCloudAppService;
+    @Resource
+    private IPractitionerService practitionerService;
+    @Resource
     private IAccountService iAccountService;
     @Resource
     private IContractService iContractService;
@@ -116,6 +126,10 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     @Resource
     private IChargeItemService chargeItemService;
     @Resource
+    private IChargeItemDefinitionService chargeItemDefinitionService;
+    @Resource
+    private IHealthcareServiceService healthcareServiceService;
+    @Resource
     private AssignSeqUtil assignSeqUtil;
     @Resource
     private PaymentMapper paymentMapper;
@@ -139,6 +153,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
     private IRegService iRegService;
     @Resource
     private IPatientService iPatientService;
+    @Resource
+    private PatientStudentServiceImpl patientStudentService;
     @Autowired
     private IPractitionerService iPractitionerService;
     @Autowired
@@ -358,6 +374,35 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             return R.fail("收费项目变动，请重新预结算");
         }
 
+        //2025.11.4 长大发生异常，相同的chargeItem存在两个payment并重复收费，要求在此处增加校验
+        // 经研究最优解为在数据库中查询本次就诊的所有的chargeItemIds，与现有chargeItemId进行匹配
+        List<PaymentReconciliation> paymentReconciliationList = paymentReconciliationService.getListByEncounterId(paymentDto.getEncounterId(), PaymentKind.OUTPATIENT_CLINIC);
+
+        List<Long> chargeItemIds = paymentDto.getChargeItemIds();
+
+        if(!paymentReconciliationList.isEmpty()){
+            // 收集所有元素（包含重复）
+            List<String> allElements = paymentReconciliationList.stream()
+                    .map(PaymentReconciliation::getChargeItemIds)  // 获取逗号拼接的字符串
+                    .filter(str -> str != null && !str.trim().isEmpty())  // 过滤空值
+                    .flatMap(str -> Arrays.stream(str.split(",")))  // 拆分成单个元素
+                    .map(String::trim)  // 去除空格
+                    .filter(s -> !s.isEmpty())  // 过滤空字符串
+                    .collect(Collectors.toList());
+
+            for (Long chargeItemId : chargeItemIds) {
+                Optional<String> first = allElements.stream()
+                        .filter(item -> item.equals(chargeItemId.toString()))
+                        .findFirst();
+
+                if(first.isPresent()){
+                    throw new ServiceException("收费项目id："+chargeItemId+"已经收费过了，请确认");
+                }
+            }
+        }
+
+
+
         // 校验金额：前台输入金额与仍需支付的现金部分进行比较
         BigDecimal sum = BigDecimal.ZERO;
         PaymentRecDetail paymentRecDetailDemo = new PaymentRecDetail();
@@ -382,7 +427,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 .setAmount(paymentDetail.getAmount());
             list.add(newPaymentRecDetail);
         }
-        // 前台传入数据可能会精度丢失，后天临时处理使用近似
+        // 前台传入数据可能会精度丢失，后台临时处理使用近似 11.11要求后台全部改为6位小数，但是实际患者缴费只到1.67，但是我后台是1.666667，所以只能1.67=1.67
         if (sum.setScale(2, BigDecimal.ROUND_HALF_UP)
             .compareTo(chargeAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) != 0) {
             throw new ServiceException("交款金额与预结算金额不相等");
@@ -497,8 +542,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         chargeItemService.updatePaymentStatus(chargeItemIdList, ChargeItemStatus.BILLED.getValue());
 
         // 保存付款快照信息 2025/08/08
-        // paymentRecStaticService.savePaymentRecStatics(paymentReconciliation.getId(), PaymentType.PAY, null,
-        // chargeItemService.getChargeItemDefInfoByIds(chargeItemIdList));
+        paymentRecStaticService.savePaymentRecStatics(paymentReconciliation.getId(), PaymentType.PAY, null,
+            chargeItemService.getChargeItemDefInfoByIdList(chargeItemIdList));
 
         // 生成发票信息
         Invoice invoice = new Invoice();
@@ -703,9 +748,9 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             logger.info(
                 "部分退款：原payment：" + JSON.toJSONString(paymentReconciliation) + "新payment：" + JSON.toJSONString(payment));
             if (chargedPay.compareTo(payAmount) >= 0) {
-                return R.ok("请患者补交" + chargedPay.subtract(payAmount).setScale(1, RoundingMode.HALF_UP) + "元");
+                return R.ok("请患者补交" + chargedPay.subtract(payAmount).setScale(6, RoundingMode.HALF_UP) + "元");
             } else {
-                return R.ok("请返还患者" + payAmount.subtract(chargedPay).setScale(1, RoundingMode.HALF_UP) + "元");
+                return R.ok("请返还患者" + payAmount.subtract(chargedPay).setScale(6, RoundingMode.HALF_UP) + "元");
             }
         }
         // 更新收费状态：已退费
@@ -749,15 +794,22 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
      * @return 结果
      */
     @Override
-    public IPage<PaymentVO> getPage(String searchKey, Integer kingEnum, String invoiceNo,Integer pageNo, Integer pageSize,
-        HttpServletRequest request) {
+    public IPage<PaymentVO> getPage(String searchKey, Integer kingEnum, String invoiceNo, Integer pageNo,
+        Integer pageSize, HttpServletRequest request) {
+
+        String invoiceStatus = request.getParameter("invoiceStatus");
+        PaymentVO paymentVO = new PaymentVO();
+        if (invoiceStatus != null) {
+            paymentVO.setInvoiceStatus(Integer.parseInt(invoiceStatus));
+        }
         // 构建查询条件
-        QueryWrapper<PaymentVO> queryWrapper = HisQueryUtils.buildQueryWrapper(new PaymentVO(), searchKey,
-            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.paymentNo)),
+        QueryWrapper<PaymentVO> queryWrapper = HisQueryUtils.buildQueryWrapper(paymentVO, searchKey,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, 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, invoiceNo,queryWrapper);
+        IPage<PaymentVO> paymentDtoIPage =
+            paymentMapper.getPage(new Page<>(pageNo, pageSize), kingEnum, invoiceNo, queryWrapper);
 
         for (PaymentVO record : paymentDtoIPage.getRecords()) {
             record.setPaymentId(record.getId().toString());
@@ -848,15 +900,15 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         logger.info("退款payment：" + JSON.toJSONString(paymentReconciliation));
 
         // 保存付款快照信息 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));
+        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.getChargeItemDefInfoByIdList(chargeItemIds));
 
         return paymentReconciliation;
     }
@@ -869,6 +921,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
      */
     private List<PaymentRecDetail> savePaymentDetail(List<PrePaymentResult> prePaymentResults,
         PaymentReconciliation payment) {
+        //11.11 paymentDetail的amount在11.7日按照同一的异常日结单，要求改为保留两位小数，后于11.11又被要求改为保留六位小数
         // 保存付款详情
         List<PaymentRecDetail> paymentRecDetails = new ArrayList<>();
         for (PrePaymentResult prePaymentResult : prePaymentResults) {
@@ -878,7 +931,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             if (psnCashPay != null) {
                 PaymentRecDetail paymentRecDetail10 = new PaymentRecDetail();
                 paymentRecDetail10.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_CASH_PAY.getValue())
-                    .setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()).setAmount(psnCashPay)
+                    .setPayLevelEnum(YbPayment.SELF_CASH_PAY.getLevel()).setAmount(psnCashPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail10);
@@ -886,21 +939,21 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
             // 个人负担总金额
             BigDecimal psnPartAmt = prePaymentResult.getPsnPartAmt();
-            if (psnCashPay != null) {
+            if (psnPartAmt != null) {
                 PaymentRecDetail paymentRecDetail1 = new PaymentRecDetail();
                 paymentRecDetail1.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_PAY.getValue())
-                    .setPayLevelEnum(YbPayment.SELF_PAY.getLevel()).setAmount(psnPartAmt)
+                    .setPayLevelEnum(YbPayment.SELF_PAY.getLevel()).setAmount(psnPartAmt.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail1);
             }
             // 基本医疗保险统筹基金支出
             BigDecimal hifpPay = prePaymentResult.getHifpPay();
-            if (psnCashPay != null) {
+            if (hifpPay != null) {
                 PaymentRecDetail paymentRecDetail2 = new PaymentRecDetail();
                 paymentRecDetail2.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.YB_TC_FUND_AMOUNT.getValue())
-                    .setPayLevelEnum(YbPayment.YB_TC_FUND_AMOUNT.getLevel()).setAmount(hifpPay)
+                    .setPayLevelEnum(YbPayment.YB_TC_FUND_AMOUNT.getLevel()).setAmount(hifpPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail2);
@@ -908,126 +961,126 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
             // 公务员医疗补助资金支出
             BigDecimal cvlservPay = prePaymentResult.getCvlservPay();
-            if (psnCashPay != null) {
+            if (cvlservPay != null) {
                 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)
+                    .setPayLevelEnum(YbPayment.YB_BC_GWY_BZ_VALUE.getLevel()).setAmount(cvlservPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail3);
             }
             // 企业补充医疗保险基金支出
             BigDecimal hifesPay = prePaymentResult.getHifesPay();
-            if (psnCashPay != null) {
+            if (hifesPay != null) {
                 PaymentRecDetail paymentRecDetail4 = new PaymentRecDetail();
                 paymentRecDetail4.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.YB_BC_FUND_AMOUNT.getValue())
-                    .setPayLevelEnum(YbPayment.YB_BC_FUND_AMOUNT.getLevel()).setAmount(hifesPay)
+                    .setPayLevelEnum(YbPayment.YB_BC_FUND_AMOUNT.getLevel()).setAmount(hifesPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail4);
             }
             // 居民大病保险资金支出
             BigDecimal hifmiPay = prePaymentResult.getHifmiPay();
-            if (psnCashPay != null) {
+            if (hifmiPay != null) {
                 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)
+                    .setPayLevelEnum(YbPayment.YB_BC_JM_DB_VALUE.getLevel()).setAmount(hifmiPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail5);
             }
             // 职工大额医疗费用补助基金支出
             BigDecimal hifobPay = prePaymentResult.getHifobPay();
-            if (psnCashPay != null) {
+            if (hifobPay != null) {
                 PaymentRecDetail paymentRecDetail6 = new PaymentRecDetail();
                 paymentRecDetail6.setReconciliationId(payment.getId()).setPayTransNo(prePaymentResult.getChrgBchno())
-                    .setPayLevelEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getLevel()).setAmount(hifobPay)
+                    .setPayLevelEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getLevel()).setAmount(hifobPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayEnum(YbPayment.YB_BC_ZG_DE_BZ_VALUE.getValue())
                     .setResultEnum(PaymentResult.UNPAID.getValue()).setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail6);
             }
             // 医疗救助基金支出
             BigDecimal mafPay = prePaymentResult.getMafPay();
-            if (psnCashPay != null) {
+            if (mafPay != null) {
                 PaymentRecDetail paymentRecDetail7 = new PaymentRecDetail();
                 paymentRecDetail7.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.YB_JZ_FUND_AMOUNT.getValue())
-                    .setPayLevelEnum(YbPayment.YB_JZ_FUND_AMOUNT.getLevel()).setAmount(mafPay)
+                    .setPayLevelEnum(YbPayment.YB_JZ_FUND_AMOUNT.getLevel()).setAmount(mafPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail7);
             }
             // 其他支出
             BigDecimal othPay = prePaymentResult.getOthPay();
-            if (psnCashPay != null) {
+            if (othPay != null) {
                 PaymentRecDetail paymentRecDetail8 = new PaymentRecDetail();
                 paymentRecDetail8.setReconciliationId(payment.getId()).setPayEnum(YbPayment.OTHER_PAY.getValue())
-                    .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(othPay)
+                    .setPayLevelEnum(YbPayment.OTHER_PAY.getLevel()).setAmount(othPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail8);
             }
             // 基金支付总额
             BigDecimal fundPaySumamt = prePaymentResult.getFundPaySumamt();
-            if (psnCashPay != null) {
+            if (fundPaySumamt != null) {
                 PaymentRecDetail paymentRecDetail9 = new PaymentRecDetail();
                 paymentRecDetail9.setReconciliationId(payment.getId()).setPayEnum(YbPayment.YB_FUND_PAY.getValue())
-                    .setPayLevelEnum(YbPayment.YB_FUND_PAY.getLevel()).setAmount(fundPaySumamt)
+                    .setPayLevelEnum(YbPayment.YB_FUND_PAY.getLevel()).setAmount(fundPaySumamt.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail9);
             }
             // 个人账户支出
             BigDecimal acctPay = prePaymentResult.getAcctPay();
-            if (psnCashPay != null) {
+            if (acctPay != null) {
                 PaymentRecDetail paymentRecDetail11 = new PaymentRecDetail();
                 paymentRecDetail11.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SELF_YB_ZH_PAY.getValue())
-                    .setPayLevelEnum(YbPayment.SELF_YB_ZH_PAY.getLevel()).setAmount(acctPay)
+                    .setPayLevelEnum(YbPayment.SELF_YB_ZH_PAY.getLevel()).setAmount(acctPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail11);
             }
             // 医院负担金额
             BigDecimal hospPartAmt = prePaymentResult.getHospPartAmt();
-            if (psnCashPay != null) {
+            if (hospPartAmt != null) {
                 PaymentRecDetail paymentRecDetail12 = new PaymentRecDetail();
                 paymentRecDetail12.setReconciliationId(payment.getId()).setPayEnum(YbPayment.HOSP_PART_AMT.getValue())
-                    .setPayLevelEnum(YbPayment.HOSP_PART_AMT.getLevel()).setAmount(hospPartAmt)
+                    .setPayLevelEnum(YbPayment.HOSP_PART_AMT.getLevel()).setAmount(hospPartAmt.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail12);
             }
             // 个人账户共济支付金额
             BigDecimal acctMulaidPay = prePaymentResult.getAcctMulaidPay();
-            if (psnCashPay != null) {
+            if (acctMulaidPay != null) {
                 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)
+                    .setPayLevelEnum(YbPayment.SELF_YB_ZH_GJ_VALUE.getLevel()).setAmount(acctMulaidPay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail13);
             }
             // 全自费金额
             BigDecimal fulamtOwnpayAmt = prePaymentResult.getFulamtOwnpayAmt();
-            if (psnCashPay != null) {
+            if (fulamtOwnpayAmt != null) {
                 PaymentRecDetail paymentRecDetail14 = new PaymentRecDetail();
                 paymentRecDetail14.setReconciliationId(payment.getId())
                     .setPayEnum(YbPayment.FULAMT_OWNPAY_AMT.getValue())
-                    .setPayLevelEnum(YbPayment.FULAMT_OWNPAY_AMT.getLevel()).setAmount(fulamtOwnpayAmt)
+                    .setPayLevelEnum(YbPayment.FULAMT_OWNPAY_AMT.getLevel()).setAmount(fulamtOwnpayAmt.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail14);
             }
             // 超限价自费费用
             BigDecimal overlmtSelfpay = prePaymentResult.getOverlmtSelfpay();
-            if (psnCashPay != null) {
+            if (overlmtSelfpay != null) {
                 PaymentRecDetail paymentRecDetail15 = new PaymentRecDetail();
                 paymentRecDetail15.setReconciliationId(payment.getId()).setPayEnum(YbPayment.OVERLMT_SELFPAY.getValue())
-                    .setPayLevelEnum(YbPayment.OVERLMT_SELFPAY.getLevel()).setAmount(overlmtSelfpay)
+                    .setPayLevelEnum(YbPayment.OVERLMT_SELFPAY.getLevel()).setAmount(overlmtSelfpay.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail15);
@@ -1039,32 +1092,41 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             // .setResultEnum(PaymentResult.PAID.getValue()).setAccountId(clinicOrder2207Result.getAccountId());
             // paymentRecDetails.add(paymentRecDetail16);
             BigDecimal preselfpayAmt = prePaymentResult.getPreselfpayAmt();
-            if (psnCashPay != null) {
+            if (preselfpayAmt != null) {
                 PaymentRecDetail paymentRecDetail17 = new PaymentRecDetail();
                 paymentRecDetail17.setReconciliationId(payment.getId()).setPayEnum(YbPayment.PRESELFPAY_AMT.getValue())
-                    .setPayLevelEnum(YbPayment.PRESELFPAY_AMT.getLevel()).setAmount(preselfpayAmt)
+                    .setPayLevelEnum(YbPayment.PRESELFPAY_AMT.getLevel()).setAmount(preselfpayAmt.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail17);
             }
             BigDecimal inscpScpAmt = prePaymentResult.getInscpScpAmt();
-            if (psnCashPay != null) {
+            if (inscpScpAmt != null) {
                 PaymentRecDetail paymentRecDetail18 = new PaymentRecDetail();
                 paymentRecDetail18.setReconciliationId(payment.getId()).setPayEnum(YbPayment.INSCP_SCP_AMT.getValue())
-                    .setPayLevelEnum(YbPayment.INSCP_SCP_AMT.getLevel()).setAmount(inscpScpAmt)
+                    .setPayLevelEnum(YbPayment.INSCP_SCP_AMT.getLevel()).setAmount(inscpScpAmt.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail18);
             }
             BigDecimal actPayDedc = prePaymentResult.getActPayDedc();
-            if (psnCashPay != null) {
+            if (actPayDedc != null) {
                 PaymentRecDetail paymentRecDetail19 = new PaymentRecDetail();
                 paymentRecDetail19.setReconciliationId(payment.getId()).setPayEnum(YbPayment.ACT_PAY_DEDC.getValue())
-                    .setPayLevelEnum(YbPayment.ACT_PAY_DEDC.getLevel()).setAmount(actPayDedc)
+                    .setPayLevelEnum(YbPayment.ACT_PAY_DEDC.getLevel()).setAmount(actPayDedc.setScale(6,RoundingMode.HALF_UP))
                     .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                     .setAccountId(prePaymentResult.getAccountId());
                 paymentRecDetails.add(paymentRecDetail19);
             }
+            BigDecimal gfRatio = prePaymentResult.getGfRatio();
+            if (gfRatio != null && gfRatio.compareTo(BigDecimal.ZERO) > 0) {
+                PaymentRecDetail paymentRecDetail20 = new PaymentRecDetail();
+                paymentRecDetail20.setReconciliationId(payment.getId()).setPayEnum(YbPayment.SCHOOL_GF_PAY.getValue())
+                    .setPayLevelEnum(YbPayment.SCHOOL_GF_PAY.getLevel()).setAmount(gfRatio.setScale(6,RoundingMode.HALF_UP))
+                    .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
+                    .setAccountId(prePaymentResult.getAccountId());
+                paymentRecDetails.add(paymentRecDetail20);
+            }
             if (prePaymentResult.getSetldetail() != null && !prePaymentResult.getSetldetail().isEmpty()) {
                 PaymentRecDetail paymentRecDetail20;
                 for (Clinic2206FundPaymentResult clinic2206FundPaymentResult : prePaymentResult.getSetldetail()) {
@@ -1075,7 +1137,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     }
                     paymentRecDetail20 = new PaymentRecDetail();
                     paymentRecDetail20.setReconciliationId(payment.getId()).setPayEnum(ybPayment.getValue())
-                        .setPayLevelEnum(ybPayment.getLevel()).setAmount(clinic2206FundPaymentResult.getFundPayamt())
+                        .setPayLevelEnum(ybPayment.getLevel()).setAmount(clinic2206FundPaymentResult.getFundPayamt().setScale(6,RoundingMode.HALF_UP))
                         .setPayTransNo(prePaymentResult.getChrgBchno()).setResultEnum(PaymentResult.UNPAID.getValue())
                         .setAccountId(prePaymentResult.getAccountId());
                     paymentRecDetails.add(paymentRecDetail20);
@@ -1530,6 +1592,13 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         if (patient == null) {
             throw new ServiceException("未查询到患者信息");
         }
+
+        // 挂学生号前需要校验(校医院)
+        if (outpatientRegistrationAddParam.getAccountFormData().getContractNo()
+            .contains(CommonConstants.BusinessName.CONTRACT_STUDENT)) {
+            patientStudentService.checkStatus(patient);
+        }
+
         // 定义日期时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH-mm-ss.SSS+08");
 
@@ -1579,16 +1648,30 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             }
         }
 
+        // 查询挂号信息的医保码等
+        HealthcareService healthcareService =
+            healthcareServiceService.getById(outpatientRegistrationAddParam.getChargeItemFormData().getServiceId());
+        if (healthcareService == null) {
+            throw new ServiceException("未查询到号源信息！");
+        }
+        if (healthcareService.getYbNo() == null) {
+            throw new ServiceException("该号源未对码或未查询到医保码信息！");
+        }
+
         Clinic2206OrderOutput clinic2206OrderResult;
         if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
-            && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
-                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
+            && !(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
+                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
+                || CommonConstants.BusinessName.DEFAULT_STUDENT_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());
+            model.setBusNo(healthcareService.getBusNo());
+            model.setYbNo(healthcareService.getYbNo());
             // 进入医保挂号及预结算流程
             clinic2206OrderResult = ybManager.getPreSettleInfo(model, patient, organization, doctor);
         } else {
@@ -1651,10 +1734,16 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             return R.fail(null, "当日已挂号此服务");
         }
 
+        Contract contract =
+            contractService.getContract(outpatientRegistrationAddParam.getAccountFormData().getContractNo());
+        if (contract == null) {
+            throw new ServiceException("请选择合适的费用性质");
+        }
         com.openhis.financial.model.PaymentResult paymentResult;
         if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))
             && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
-                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())) {
+                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
+            && contract.getYbFlag() == 1) {
             // 医保结算
             paymentResult = ybManager.settle(
                 contractService.getContract(outpatientRegistrationAddParam.getAccountFormData().getContractNo()),
@@ -1664,7 +1753,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             paymentResult = new com.openhis.financial.model.PaymentResult();
             paymentResult.setChrgBchno(chrgBchno).setMedfeeSumamt(chargeItem.getTotalPrice())
                 .setFulamtOwnpayAmt(chargeItem.getTotalPrice()).setPsnPartAmt(chargeItem.getTotalPrice())
-                .setPsnCashPay(chargeItem.getTotalPrice()).setSetlId(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO);
+                .setPsnCashPay(chargeItem.getTotalPrice()).setSetlId(contract.getBusNo());
         }
 
         // 生成payment
@@ -1698,6 +1787,11 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             iEncounterParticipantService.saveEncounterParticipant(encounterParticipant);
         }
         // 保存就诊账户信息
+        // 1.自费挂号，创建一个自费ACCOUNT
+        // 2.省医保挂号，创建两个：自费ACCOUNT，省医保ACCOUNT
+        // 3.市医保挂号，创建两个：自费ACCOUNT，市医保ACCOUNT
+        // 4.学生公费挂号，创建两个：自费ACCOUNT，学生自费ACCOUNT
+        // 5.学生医保公费挂号，创建四个：自费ACCOUNT，学生医保ACCOUNT，学生自费ACCOUNT，该学生对应的医保ACCOUNT
         accountFormData.setEncounterId(encounterId);
         Account account = new Account();
         BeanUtils.copyProperties(accountFormData, account);
@@ -1716,6 +1810,33 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     : outpatientRegistrationAddParam.getYbMdtrtCertType());
             iAccountService.save(accountZf);
         }
+        if (!CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
+            .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
+            && !CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO
+                .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
+            && outpatientRegistrationAddParam.getAccountFormData().getContractNo().length() > 11) {
+            // 建立学生自费ACCOUNT
+            Account accountStudentZf = new Account();
+            BeanUtils.copyProperties(accountFormData, accountStudentZf);
+            accountStudentZf.setContractNo(CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO).setEncounterFlag(0)
+                .setTypeCode(outpatientRegistrationAddParam.getYbMdtrtCertType() == null
+                    ? YbMdtrtCertType.MDTRT_CERT_TYPE02.getValue()
+                    : outpatientRegistrationAddParam.getYbMdtrtCertType());
+            iAccountService.save(accountStudentZf);
+
+            Contract contractYb = contractService.getContract(
+                outpatientRegistrationAddParam.getAccountFormData().getContractNo().substring("STUDENT".length()));
+            if (contractYb != null && 1 == contractYb.getYbFlag()) {
+                // 建立纯医保ACCOUNT
+                Account accountYb = new Account();
+                BeanUtils.copyProperties(accountFormData, accountYb);
+                accountYb.setContractNo(contractYb.getBusNo()).setEncounterFlag(0)
+                    .setTypeCode(outpatientRegistrationAddParam.getYbMdtrtCertType() == null
+                        ? YbMdtrtCertType.MDTRT_CERT_TYPE02.getValue()
+                        : outpatientRegistrationAddParam.getYbMdtrtCertType());
+                iAccountService.save(accountYb);
+            }
+        }
         // 保存挂号费
         chargeItem.setEncounterId(encounterId);
         chargeItem.setAccountId(accountId);
@@ -1756,8 +1877,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         chargeItemService.updatePaymentStatus(chargeItemIds, ChargeItemStatus.BILLED.getValue());
 
         // 保存付款快照信息 2025/08/08
-        // paymentRecStaticService.savePaymentRecStatics(payment.getId(), PaymentType.PAY, null,
-        // chargeItemService.getChargeItemDefInfoByIds(chargeItemIds));
+        paymentRecStaticService.savePaymentRecStatics(payment.getId(), PaymentType.PAY, null,
+            chargeItemService.getChargeItemDefInfoByIdList(chargeItemIds));
 
         // 生成发票信息
         Invoice invoice = new Invoice();
@@ -1804,6 +1925,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     serviceRequest = new ServiceRequest();
                     serviceRequest.setStatusEnum(RequestStatus.COMPLETED.getValue());// 请求状态,默认已完成
                     serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                    serviceRequest.setGenerateSourceEnum(GenerateSource.REGISTRATION_REGISTER.getValue()); // 生成来源
                     serviceRequest.setQuantity(quantity); // 请求数量
                     serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
                     serviceRequest.setCategoryEnum(EncounterClass.AMB.getValue()); // 请求类型,默认-门诊
@@ -1817,7 +1939,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
                     // 生成账单
                     chargeItem = new ChargeItem();
-                    chargeItem.setGenerateSourceEnum(ChargeItemGenerateSource.MEDICAL_ORDER_BINDING.getValue());
+                    chargeItem.setGenerateSourceEnum(GenerateSource.REGISTRATION_REGISTER.getValue()); // 生成来源
                     chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 待收费
                     chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
                     chargeItem.setPatientId(encounter.getPatientId()); // 患者
@@ -1835,9 +1957,9 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     chargeItem.setQuantityValue(quantity); // 数量
                     chargeItem.setQuantityUnit(activityAdviceBaseDto.getUnitCode()); // 单位
                     chargeItem.setUnitPrice(advicePriceDto.getPrice()); // 单价
-                    // 计算总价,保留4位小数
+                    // 计算总价,保留6位小数
                     BigDecimal qty = quantity;
-                    chargeItem.setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(4, RoundingMode.HALF_UP)); // 总价
+                    chargeItem.setTotalPrice(qty.multiply(advicePriceDto.getPrice()).setScale(6, RoundingMode.HALF_UP)); // 总价
 
                     iChargeItemService.save(chargeItem);
                     chargeItemIdList.add(chargeItem.getId().toString());
@@ -1882,7 +2004,17 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         piModel.setMedType(encounterDiagnosis.getMedTypeCode());
         piModel.setTotalPrice(chargeItem.getTotalPrice());
         piModel.setEncounterId(chargeItem.getEncounterId());
-        piModel.setChargeItemId(chargeItem.getId());
+        piModel.setServiceId(chargeItem.getServiceId());
+        piModel.setServiceTable(chargeItem.getServiceTable());
+        piModel.setProductId(chargeItem.getProductId());
+        piModel.setProductTable(chargeItem.getProductTable());
+        piModel.setEntererId(chargeItem.getEntererId());
+        piModel.setRequestingOrgId(chargeItem.getRequestingOrgId());
+        piModel.setEnteredDate(chargeItem.getEnteredDate());
+        piModel.setQuantityValue(chargeItem.getQuantityValue());
+        piModel.setQuantityUnit(chargeItem.getQuantityUnit());
+        piModel.setUnitPrice(chargeItem.getUnitPrice());
+        piModel.setDefinitionId(chargeItem.getDefinitionId());
         return piModel;
     }
 
@@ -1930,15 +2062,19 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
      * @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);
@@ -1946,14 +2082,17 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                 yb2303OutputSetInfos.add(inpatientPreSettleDto);
 
             } else {
+
                 inpatientPreSettleDto =
                     preSettleInpatientBySelf(prePaymentDto.getEncounterId(), stringListEntry.getValue());
                 yb2303OutputSetInfos.add(inpatientPreSettleDto);
+
             }
         }
 
         // 生成业务参数 paymentDetail
-        // PS:2025/08/12同李电话沟通确认，住院患者结算常规情况是会生成三个个payment，特殊情况两条payment，所以结算的时候的支付详情一定是和最初预交金的那条payment绑定，且若开始中途结算功能的话必须要按照payment成对出现的规则执行即正
+        // PS:2025/08/12同李电话沟通确认，住院患者结算常规情况是会生成三个个payment，特殊情况两条payment，所以结算的时候的支付详情一定是和最初预交金的那条payment绑定，且若开始中途结算功能的话必须要按照payment成对出现的规则执行
+        // 三个payment分别对应，预交金，结算金额，预交金和结算金额多退少补的金额
         // 生成业务参数payment
         PaymentReconciliation paymentReconciliation = getPaymentReconciliation(chargeItemBaseInfoByIds);
         iPaymentReconciliationService.save(paymentReconciliation);
@@ -2166,7 +2305,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
 
         // 保存付款快照信息 2025/08/08
         paymentRecStaticService.savePaymentRecStatics(paymentReconciliation.getId(), PaymentType.PAY, null,
-            chargeItemService.getChargeItemDefInfoByIds(paymentDto.getChargeItemIds()));
+            chargeItemService.getChargeItemDefInfoByIdList(paymentDto.getChargeItemIds()));
 
         // 生成发票信息
         Invoice invoice = new Invoice();
@@ -2599,4 +2738,32 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         return inpatientPreSettleDto;
     }
 
+    /**
+     * BPC支付
+     *
+     * @param nenuBpcPayDto bpc支付参数
+     * @return 结果
+     */
+    @Override
+    public String nenuBpcPay(NenuBpcPayDto nenuBpcPayDto) {
+
+        Practitioner practitioner = practitionerService.getById(SecurityUtils.getLoginUser().getPractitionerId());
+        if (practitioner == null || practitioner.getPosNo() == null) {
+            throw new ServiceException("未配置POS机编号！");
+        }
+
+        TransactionResponse transactionResponse = new TransactionResponse()
+            .setTxnAmt(nenuBpcPayDto.getBpcPayAmount().multiply(new BigDecimal("100")).toString())
+            .setPaymentId(nenuBpcPayDto.getPaymentId()).setScanCode(nenuBpcPayDto.getBpcCode())
+            .setIndex(nenuBpcPayDto.getIndex());
+
+        transactionResponseService.save(transactionResponse);
+
+        R<?> r = bankPosCloudAppService.processConsumerScan(
+            String.valueOf(nenuBpcPayDto.getBpcPayAmount().multiply(new BigDecimal("100"))),
+            nenuBpcPayDto.getPaymentId() + "IND" + nenuBpcPayDto.getIndex() + "T" + new Date(),
+            nenuBpcPayDto.getBpcCode(), practitioner.getPosNo());
+
+        return r.getMsg();
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
new file mode 100644
index 00000000..247dd65c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
@@ -0,0 +1,226 @@
+package com.openhis.web.paymentmanage.appservice.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.core.domain.R;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.exception.ServiceException;
+import com.core.common.utils.SecurityUtils;
+import com.core.web.util.TenantOptionUtil;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.domain.ThreePartPayCallBack;
+import com.openhis.financial.service.IPaymentRecDetailService;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.financial.service.ThreePartPayCallBackService;
+import com.openhis.web.paymentmanage.appservice.ThreePartPayService;
+import com.openhis.yb.dto.BaseInfo;
+import com.openhis.yb.dto.BaseParam;
+import com.openhis.yb.dto.PaymentDetailDto;
+import com.openhis.yb.dto.ThreePartPayDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+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.Component;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Slf4j
+public class ThreePartPayServiceImpl implements ThreePartPayService {
+
+    @Autowired
+    private IPractitionerService practitionerService;
+    @Autowired
+    private IPaymentRecDetailService paymentRecDetailService;
+    @Autowired
+    private IPaymentReconciliationService paymentReconciliationService;
+    @Autowired
+    private ThreePartPayCallBackService threePartPayCallBackService;
+    @Autowired
+    private ThreePartSimpleFieldMappingService threePartSimpleFieldMappingService;
+
+
+    @Override
+    public R<?> payFor(ThreePartPayDto threePartPayDto) {
+        String threePartUrl = TenantOptionUtil.getOptionContent(TenantOptionDict.THREE_PART_PAY_URL);
+        //String threePartUrl = "http://127.0.0.1:19994/?MSG=EXEC&yylx=02&posjh=&posygh=&jylx=00&je={je}&yjyrq=&yjyckh=&ypzh=&lrcjy=&cm={cm}&ysddh=&erpddh=&body=";
+        String threePartParam = TenantOptionUtil.getOptionContent(TenantOptionDict.THREE_PART_PARAM);
+        JSONObject jsonObject = JSON.parseObject(threePartParam);
+
+        //订单号及订单信息
+        Long paymentId = threePartPayDto.getId();
+        PaymentReconciliation paymentReconciliation = paymentReconciliationService.getById(paymentId);
+
+        //金额处理
+        BigDecimal amount = BigDecimal.ZERO;
+        for (PaymentDetailDto paymentDetail : threePartPayDto.getPaymentDetails()) {
+            if(threePartPayDto.getIndex().equals(paymentDetail.getPayEnum())){
+                amount = paymentDetail.getAmount();
+            }
+        }
+        amount = amount.multiply(new BigDecimal("100"));
+        String amountResult = String.format("%010d", Integer.parseInt(amount.toString()));
+
+        //款员信息查询
+        Practitioner practitioner = practitionerService.getPractitionerByUserId(SecurityUtils.getLoginUser().getUserId());
+
+        //获取支付码
+        String txtCode = threePartPayDto.getTxtCode();
+
+        //获取参数
+        Map<String, String> paramMap = this.getParamMap(jsonObject, practitioner, null, paymentReconciliation, amountResult, txtCode);
+
+        //获取完整url
+        String url = renderTemplateSafe(threePartUrl, paramMap);
+
+        String result = httpGet(url);
+
+        String threePartMapping = threePartSimpleFieldMappingService.reverseMap("threePartMapping", result);
+
+        threePartPayCallBackService.save(JSON.parseObject(threePartMapping,ThreePartPayCallBack.class));
+
+        return R.ok();
+    }
+
+
+    /**
+     * 拼接参数
+     * @param jsonObject 配置信息
+     * @param practitioner 款员信息
+     * @param threePartPayCallBack 原订单
+     * @param amountResult 金额
+     * @param txtCode 支付码
+     * @return
+     */
+    private Map<String,String> getParamMap(JSONObject jsonObject,Practitioner practitioner, ThreePartPayCallBack threePartPayCallBack,PaymentReconciliation paymentReconciliation,String amountResult,String txtCode){
+        Map<String, String> paramMap = new HashMap<>();
+
+        //款员信息
+        if(practitioner!=null){
+            String posNoKey = jsonObject.getString("posNo");//pos机编码
+            if(posNoKey!=null){
+                paramMap.put(posNoKey,practitioner.getPosNo());
+            }
+            String userIdKey = jsonObject.getString("userId");
+            if(userIdKey!=null){
+                paramMap.put(userIdKey,practitioner.getId().toString());
+            }
+            String userNameKey = jsonObject.getString("userName");
+            if(userNameKey!=null){
+                paramMap.put(userNameKey,practitioner.getName());
+            }
+        }
+
+        //原账单信息
+        if(threePartPayCallBack!=null){
+            String bankOrderIdKey = jsonObject.getString("bankOrderId");
+            if(bankOrderIdKey!=null){
+                paramMap.put(bankOrderIdKey,threePartPayCallBack.getTradeNo());//银行订单号
+            }
+            String payWayOrderIdKey = jsonObject.getString("payWayOrderId");
+            if(payWayOrderIdKey!=null){
+                paramMap.put(payWayOrderIdKey,threePartPayCallBack.getTransNo());//支付渠道订单号
+            }
+            String tranTypeKey = jsonObject.getString("tranType");
+            if(tranTypeKey!=null){
+                paramMap.put(tranTypeKey,threePartPayCallBack.getTranType());//交易类型
+            }
+            String payTypeKey = jsonObject.getString("payType");
+            if(payTypeKey!=null){
+                paramMap.put(payTypeKey,threePartPayCallBack.getPayType());//支付方式
+            }
+            String traceNoKey = jsonObject.getString("traceNo");
+            if(payWayOrderIdKey!=null){
+                paramMap.put(traceNoKey,threePartPayCallBack.getTraceNo());//终端流水号
+            }
+            String txnTimeKey = jsonObject.getString("txnTime");
+            if(payWayOrderIdKey!=null){
+                paramMap.put(txnTimeKey,threePartPayCallBack.getTxnTime());//交易时间
+            }
+            String merTradeNoKey = jsonObject.getString("merTradeNo");
+            if(payWayOrderIdKey!=null){
+                paramMap.put(merTradeNoKey,threePartPayCallBack.getMerTradeNo());//商户系统订单号
+            }
+        }
+
+        if(paymentReconciliation!=null){
+            String paymentIdKey = jsonObject.getString("paymentId");
+            if(paymentIdKey!=null){
+                paramMap.put(paymentIdKey,paymentReconciliation.getId().toString());//his系统订单号
+            }
+        }
+
+        String amountResultKey = jsonObject.getString("amountResult");
+        String txtCodeKey = jsonObject.getString("txtCode");
+
+        if(amountResult!=null){
+            paramMap.put(amountResultKey,amountResult);//金额
+        }
+        if(txtCode!=null){
+            paramMap.put(txtCodeKey,txtCode);//扫码
+        }
+        return paramMap;
+    }
+    /**
+     * 安全替换，避免空指针
+     */
+    private String renderTemplateSafe(String template, Map<String, String> params) {
+        if (template == null) return "";
+        if (params == null) params = new HashMap<>();
+
+        String result = template;
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            String placeholder = "{" + entry.getKey() + "}";
+            String value = entry.getValue() != null ? entry.getValue().toString() : "";
+            // 使用 replace 而不是 replaceAll，避免正则表达式特殊字符问题
+            result = result.replace(placeholder, value);
+        }
+
+        return result;
+    }
+
+    /**
+     * 发送http请求（2025/05/02经测试，若以自带的工具类发送请求失败，故使用原peis系统中成功调用的写法重新封装）
+     *
+     * @param url 路径
+     * @return
+     */
+    private String httpGet(String url) {
+        String resultString = "";
+        // 创建Http请求（2025/10/13 师大会超时故此由30000-》60000）
+        RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(90000).setConnectionRequestTimeout(90000)
+                .setSocketTimeout(90000).build();
+        CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build();
+        CloseableHttpResponse response = null;
+        // 发送请求
+        try {
+            HttpGet httpGet = new HttpGet(url);
+            // 执行http请求
+            response = httpClient.execute(httpGet);
+            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/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
new file mode 100644
index 00000000..cec86af2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
@@ -0,0 +1,121 @@
+package com.openhis.web.paymentmanage.appservice.impl;
+
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.openhis.web.paymentmanage.util.ReverseMappingProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Service;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+@Service
+@ConfigurationProperties(prefix = "threepart.mapping")
+@Data
+@Slf4j
+public class ThreePartSimpleFieldMappingService {
+
+
+    @Autowired
+    private ReverseMappingProperties properties;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    /**
+     * 执行反向映射：三方JSON -> 我方JSON
+     */
+    public String reverseMap(String businessType, String sourceJson) {
+        try {
+            // 1. 获取映射配置
+            Map<String, String> mappingConfig = properties.getMappingConfig(businessType);
+            if (mappingConfig.isEmpty()) {
+                log.warn("未找到业务类型[{}]的映射配置", businessType);
+                return sourceJson; // 返回原JSON
+            }
+
+            // 2. 解析源JSON
+            Map<String, Object> sourceMap;
+            sourceMap = objectMapper.readValue(sourceJson, new TypeReference<Map<String,Object>>(){});
+
+            // 3. 执行反向映射
+            Map<String, Object> resultMap = reverseMap(mappingConfig, sourceMap);
+
+            // 4. 生成结果JSON
+            return objectMapper.writeValueAsString(resultMap);
+
+        } catch (Exception e) {
+            log.error("反向映射失败，业务类型: {}, JSON: {}", businessType, sourceJson, e);
+            throw new RuntimeException("反向映射失败", e);
+        }
+    }
+
+    /**
+     * 执行反向映射：Map版本
+     */
+    public Map<String, Object> reverseMap(String businessType, Map<String, Object> sourceMap) {
+        Map<String, String> mappingConfig = properties.getMappingConfig(businessType);
+        return reverseMap(mappingConfig, sourceMap);
+    }
+
+    /**
+     * 核心映射逻辑
+     */
+    private Map<String, Object> reverseMap(Map<String, String> mappingConfig,
+                                           Map<String, Object> sourceMap) {
+        Map<String, Object> resultMap = new HashMap<>();
+
+        for (Map.Entry<String, Object> entry : sourceMap.entrySet()) {
+            String sourceField = entry.getKey();
+            Object value = entry.getValue();
+
+            // 查找映射关系
+            String targetField = mappingConfig.get(sourceField);
+
+            if (targetField != null) {
+                // 执行映射
+                resultMap.put(targetField, value);
+            } else {
+                // 未配置映射的字段，可以选择保留或忽略
+                // resultMap.put(sourceField, value); // 取消注释则保留未映射字段
+                log.debug("字段[{}]未配置映射，已忽略", sourceField);
+            }
+        }
+
+        log.debug("反向映射完成: {} -> {}", sourceMap.keySet(), resultMap.keySet());
+        return resultMap;
+    }
+
+    /**
+     * 批量处理
+     */
+    public List<Map<String, Object>> reverseMapBatch(String businessType,
+                                                     List<Map<String, Object>> sourceList) {
+        return sourceList.stream()
+                .map(source -> reverseMap(businessType, source))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 检查字段是否已配置映射
+     */
+    public boolean isFieldMapped(String businessType, String fieldName) {
+        Map<String, String> mappingConfig = properties.getMappingConfig(businessType);
+        return mappingConfig.containsKey(fieldName);
+    }
+
+    /**
+     * 获取所有已配置的映射字段
+     */
+    public Set<String> getMappedFields(String businessType) {
+        Map<String, String> mappingConfig = properties.getMappingConfig(businessType);
+        return mappingConfig.keySet();
+    }
+}
diff --git a/openhis-server-new/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
index f6f2f2fe..7e1f272a 100644
--- a/openhis-server-new/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
@@ -29,8 +29,8 @@ public class ChargeBillController {
      *
      * @param paymentId 付款实体
      */
-    @PostMapping("/getDetail")
-    public R<?> getDetail(Long paymentId) {
+    @GetMapping("/getDetail")
+    public R<?> getDetail(@RequestParam("paymentId") Long paymentId) {
         return R.ok(iChargeBillService.getDetail(paymentId));
     }
 
diff --git a/openhis-server-new/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
index b77ea789..eee110f0 100644
--- a/openhis-server-new/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,19 +3,18 @@
  */
 package com.openhis.web.paymentmanage.controller;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import com.core.common.utils.SecurityUtils;
-import com.openhis.web.paymentmanage.dto.CancelPaymentInpatientDto;
 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.core.common.enums.TenantOptionDict;
+import com.core.web.util.TenantOptionUtil;
 import com.openhis.financial.domain.PaymentReconciliation;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
 import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
@@ -23,6 +22,8 @@ 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.CancelPaymentInpatientDto;
+import com.openhis.web.paymentmanage.dto.NenuBpcPayDto;
 import com.openhis.yb.dto.PaymentDto;
 import com.openhis.yb.dto.PaymentInpatientDto;
 import com.openhis.yb.dto.PrePaymentDto;
@@ -63,7 +64,7 @@ public class PaymentReconciliationController {
 
     /**
      * 取消预付款（该接口未被调用）
-     * 
+     *
      * @param encounterId 就诊id
      * @return 操作结果
      */
@@ -86,10 +87,10 @@ public class PaymentReconciliationController {
             if (PaymentReconciliation.class.isAssignableFrom(result.getData().getClass())) {
                 paymentRecon = (PaymentReconciliation)result.getData();
             }
-            Map  detail=iChargeBillService.getDetail(paymentRecon.getId());
-            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
+            Map detail = iChargeBillService.getDetail(paymentRecon.getId());
+            if ("0".equals(TenantOptionUtil.getOptionContent(TenantOptionDict.INVOICE_SWITCH))) {
                 return R.ok(detail);
-            }else {
+            } else {
                 R<?> eleResult = eleInvoiceService.invoiceMZMake(paymentRecon.getId(), paymentDto.getEncounterId());
                 if (eleResult.getCode() != 200) {
                     // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
@@ -116,9 +117,11 @@ public class PaymentReconciliationController {
             if (PaymentReconciliation.class.isAssignableFrom(result.getData().getClass())) {
                 paymentRecon = (PaymentReconciliation)result.getData();
             }
-            if(!"0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
+            if ("0".equals(TenantOptionUtil.getOptionContent(TenantOptionDict.INVOICE_SWITCH))) {
+                return result;
+            } else {
                 R<?> eleResult =
-                        eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentDto.getReason());
+                    eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentDto.getReason());
                 if (eleResult.getCode() != 200) {
                     // 因取消付款成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                     return R.ok(null, " 取消付款成功，电子发票开具失败 :" + eleResult.getMsg());
@@ -144,7 +147,7 @@ public class PaymentReconciliationController {
         @RequestParam(value = "invoiceNo", defaultValue = "") String invoiceNo,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
-        return R.ok(paymentReconciliationService.getPage(searchKey, kinsEnum, invoiceNo,pageNo, pageSize, request));
+        return R.ok(paymentReconciliationService.getPage(searchKey, kinsEnum, invoiceNo, pageNo, pageSize, request));
     }
 
     /**
@@ -176,9 +179,15 @@ public class PaymentReconciliationController {
      * @return 操做结果
      */
     @PostMapping("/reg-pay")
+<<<<<<< HEAD
     public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationSettleParam) {
         R<?> result = paymentReconciliationService.regPay(outpatientRegistrationSettleParam,
                 outpatientRegistrationSettleParam.getChrgBchno(), outpatientRegistrationSettleParam.getPaymentDetails());
+=======
+    public R<?> regPay(@Valid @RequestBody OutpatientRegistrationSettleParam outpatientRegistrationAddParam) {
+        R<?> result = paymentReconciliationService.regPay(outpatientRegistrationAddParam,
+            outpatientRegistrationAddParam.getChrgBchno(), outpatientRegistrationAddParam.getPaymentDetails());
+>>>>>>> upstream/develop
         // 付款成功后，开具发票
         if (result.getCode() == 200) {
             PaymentReconciliation paymentRecon = null;
@@ -187,9 +196,9 @@ public class PaymentReconciliationController {
             }
             Map detail = iChargeBillService.getDetail(paymentRecon.getId());
             Long encounterId = paymentRecon.getEncounterId();
-            if("0".equals(SecurityUtils.getLoginUser().getOptionJson().getString("forwardSwitch"))) {
+            if ("0".equals(TenantOptionUtil.getOptionContent(TenantOptionDict.INVOICE_SWITCH))) {
                 return R.ok(detail);
-            }else {
+            } else {
                 R<?> eleResult = eleInvoiceService.invoiceRegMake(paymentRecon.getId(), encounterId);
                 if (eleResult.getCode() != 200) {
                     // 因收费成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
@@ -236,7 +245,7 @@ public class PaymentReconciliationController {
             }
             return R.ok(detail);
         }
-        return R.ok();
+        return R.ok("收费未成功，请确认实际收款情况");
     }
 
     /**
@@ -254,13 +263,24 @@ public class PaymentReconciliationController {
             if (PaymentReconciliation.class.isAssignableFrom(r.getData().getClass())) {
                 paymentRecon = (PaymentReconciliation)r.getData();
             }
-            R<?> eleResult = eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentInpatientDto.getReason());
+            R<?> eleResult =
+                eleInvoiceService.invoiceWriteoff(paymentRecon.getRelationId(), cancelPaymentInpatientDto.getReason());
             if (eleResult.getCode() != 200) {
                 // 因取消付款成功前端需要关闭弹窗，此处信息仅用于提示所以返回ok
                 return R.ok(null, " 取消付款成功，电子发票开具失败 :" + eleResult.getMsg());
             }
         }
-        return R.ok();
+        return R.ok("取消结算失败，请确认");
     }
 
+    /**
+     * 师大bpc支付
+     *
+     * @param nenuBpcPayDto 付款参数
+     * @return 操作结果
+     */
+    @PostMapping("/nenu-bpc-pay")
+    public R<?> nenuBpcPay(@RequestBody NenuBpcPayDto nenuBpcPayDto) {
+        return R.ok(paymentReconciliationService.nenuBpcPay(nenuBpcPayDto));
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
new file mode 100644
index 00000000..8ac70a1f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
@@ -0,0 +1,59 @@
+package com.openhis.web.paymentmanage.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.core.domain.R;
+import com.core.common.enums.TenantOptionDict;
+import com.core.common.utils.SecurityUtils;
+import com.core.web.util.TenantOptionUtil;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
+import com.openhis.administration.service.impl.PractitionerServiceImpl;
+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.paymentmanage.appservice.ThreePartPayService;
+import com.openhis.yb.dto.PaymentDetailDto;
+import com.openhis.yb.dto.PaymentDto;
+import com.openhis.yb.dto.ThreePartPayDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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 java.math.BigDecimal;
+import java.security.Security;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 第三方支付管理
+ *
+ * @author SunJQ
+ * @date 2025-03-29
+ */
+@RestController
+@RequestMapping("/three-part/pay")
+@Slf4j
+@AllArgsConstructor
+public class ThreePartPayController {
+
+    @Autowired
+    private ThreePartPayService threePartPayService;
+
+    /**
+     * 扫码付款
+     * @return
+     */
+    @PostMapping("/pay-for")
+    public R<?> payFor(@RequestBody ThreePartPayDto threePartPayDto){
+        return threePartPayService.payFor(threePartPayDto);
+    }
+
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java
new file mode 100644
index 00000000..cdd5a4e6
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java
@@ -0,0 +1,83 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName ChangePriceListDto
+ * @Description 药品调价dto
+ * @Author raymond
+ * @Date 2025/10/15 14:09
+ * @Version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+public class ChangePriceListDto {
+    /**
+     * 药品ID
+     */
+   private Long medicationId;
+    /**
+     * 药品编号
+     */
+   private Long busNo;
+    /**
+     * 供应商ID
+     */
+    private Long supplyId;
+    /**
+     * 供应商名字
+     */
+    private String supplyName;
+    /**
+     * 药品规格
+     */
+   private String totalVolume;
+    /**
+     * 当前价格
+     */
+   private BigDecimal curPrice;
+    /**
+     * 调整后价格
+     */
+   private BigDecimal retailPrice;
+    /**
+     * 调价描述
+     */
+   private String description;
+    /**
+     * 调整时间
+     */
+   private Date retailTime;
+    /**
+     * 药品名称
+     */
+    private String name;
+    /**
+     * 药品英文名
+     */
+    private String nameEn;
+    /**
+     * 拼音
+     */
+    private String pyStr;
+    /**
+     * 五笔
+     */
+    private String wbStr;
+    /**
+     * 商品名
+     */
+    private String merchandiseName;
+    /**
+     * 商品名拼音
+     */
+    private String merchandisePyStr;
+    /**
+     * 商品名五笔
+     */
+    private String merchandiseWbStr;
+}
diff --git a/openhis-server-new/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
index e2265fce..3ee5c411 100644
--- a/openhis-server-new/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
@@ -3,15 +3,16 @@
  */
 package com.openhis.web.paymentmanage.dto;
 
+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 lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 电子发票基础信息查询实体
  *
@@ -21,12 +22,12 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class InvoiceBaseInfoDto {
-    //主键
+    // 主键
     @TableId(type = IdType.ASSIGN_ID)
-    @JSONField(serialize=false)
+    @JSONField(serialize = false)
     private String id;
 
-    private String setlId;//结算id
+    private String setlId;// 结算id
 
     private String mdtrtId; // 就诊ID
 
@@ -100,5 +101,7 @@ public class InvoiceBaseInfoDto {
 
     private BigDecimal hifdmPay; // 伤残人员医疗保障基金支出
 
-    private String paymentNo;//结算业务流水号  Payment与ClinicSettle是1：N
+    private String paymentNo;// 结算业务流水号 Payment与ClinicSettle是1：N
+
+    private BigDecimal gfRatio; // 伤残人员医疗保障基金支出
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
new file mode 100644
index 00000000..f1fe3995
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.paymentmanage.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 师大Bpc支付入参
+ *
+ * @author SunJQ
+ * @date 2025-10-28
+ */
+@Data
+@Accessors(chain = true)
+public class NenuBpcPayDto {
+    /**
+     * 二维码
+     */
+    private String bpcCode;
+    /**
+     * 金额
+     */
+    private BigDecimal bpcPayAmount;
+    /**
+     * 付款id
+     */
+    private Long paymentId;
+
+    /**
+     * 序号
+     */
+    private Long index;
+}
diff --git a/openhis-server-new/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
index 70c9a1cc..1a1fabfe 100644
--- a/openhis-server-new/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
@@ -3,15 +3,14 @@
  */
 package com.openhis.web.paymentmanage.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+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 java.math.BigDecimal;
-import java.util.Date;
+import lombok.Data;
 
 /**
  * 映射对象
@@ -24,19 +23,19 @@ public class PaymentVO {
 
     /** ID */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;//付款id
+    private Long id;// 付款id
 
     /** 状态 */
     @Dict(dictCode = "payment_status")
     private Integer statusEnum;
-    private String statusEnum_dictText;//状态
+    private String statusEnum_dictText;// 状态
 
     /** 支付的业务标识符 */
-    private String paymentNo;//业务流水
+    private String paymentNo;// 业务流水
 
     /** 付费/退款 */
     @Dict(dictCode = "payment_enum")
-    private String paymentEnum;//付费/退款
+    private String paymentEnum;// 付费/退款
     private String paymentEnum_dictText;
 
     /** 关联ID */
@@ -44,53 +43,55 @@ public class PaymentVO {
     private String relationIdStr;
 
     /** 收款员 */
-    private Long entererId;//收款员
+    private Long entererId;// 收款员
 
     /** 收款员 */
-    private String entererName;//收款员
+    private String entererName;// 收款员
 
     /** 支付的患者ID */
-    private Long patientId;//支付患者
+    private Long patientId;// 支付患者
 
     /** 支付的患者 */
-    private String patientName;//支付患者
+    private String patientName;// 支付患者
 
     /** 付款结果 */
     @Dict(dictCode = "outcome_enum")
-    private Integer outcomeEnum;//付款结果
+    private Integer outcomeEnum;// 付款结果
     private String outcomeEnum_dictText;
 
     /** 应收金额 */
-    private BigDecimal tenderedAmount;//应收
+    private BigDecimal tenderedAmount;// 应收
 
     /** 找零金额 */
-    private BigDecimal returnedAmount;//找零
+    private BigDecimal returnedAmount;// 找零
 
     /** 付款总额 */
-    private BigDecimal displayAmount;//付款总额
+    private BigDecimal displayAmount;// 付款总额
 
     /** 打印标识 */
-    private Integer printCount;//打印标志
+    private Integer printCount;// 打印标志
 
     /** 结算时间 */
-    private Date billDate;//结算时间
+    private Date billDate;// 结算时间
 
     /** 发票编号 */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long invoiceId;//发票id
+    private Long invoiceId;// 发票id
 
     /** 发票no */
-    private String invoiceNo;//发票no
+    private String invoiceNo;// 发票no
 
     /** 发票no */
-    private String encounterBusNo;//发票no
+    private String encounterBusNo;// 发票no
 
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long encounterId;//就诊id
-    private String encounterIdStr;//就诊id
+    private Long encounterId;// 就诊id
+    private String encounterIdStr;// 就诊id
 
     @JsonSerialize(using = ToStringSerializer.class)
-    private String paymentId;//付款id
+    private String paymentId;// 付款id
 
-    private String ybSettleIds;//医保付款id
+    private String ybSettleIds;// 医保付款id
+
+    private Integer invoiceStatus;// 发票状态
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
new file mode 100644
index 00000000..7a66d53f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
@@ -0,0 +1,20 @@
+package com.openhis.web.paymentmanage.mapper;
+
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Desc:
+ * @Author raymond
+ * @Date 14:37 2025/10/15
+ * @return
+ **/
+@Component
+public interface ChangePriceMapper {
+
+    List<MedicationDefinition> searchMedicationList();
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java
new file mode 100644
index 00000000..bcc2f051
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java
@@ -0,0 +1,30 @@
+package com.openhis.web.paymentmanage.util;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+@ConfigurationProperties(prefix = "threepaymapping")
+@Data
+public class ReverseMappingProperties {
+
+    private Map<String, Map<String, String>> reverseMappings = new HashMap<>();
+
+    /**
+     * 获取特定业务类型的映射配置
+     */
+    public Map<String, String> getMappingConfig(String businessType) {
+        return reverseMappings.getOrDefault(businessType, new HashMap<>());
+    }
+
+    /**
+     * 获取所有映射配置
+     */
+    public Map<String, Map<String, String>> getAllMappings() {
+        return reverseMappings;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index 469c7211..b43238e9 100644
--- a/openhis-server-new/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
@@ -100,8 +100,6 @@ public class ActivityDeviceAppServiceImpl implements IActivityDeviceAppService {
     @Override
     public R<?> getDevicePage(DeviceManageSelParam deviceManageSelParam, String searchKey, Integer pageNo,
         Integer pageSize, HttpServletRequest request) {
-        // 只查询单次消耗类耗材
-        deviceManageSelParam.setCategoryCode(CommonConstants.BusinessName.SINGLE_CONSUMPTION);
         return deviceManageAppService.getDevicePage(deviceManageSelParam, searchKey, pageNo, pageSize, request);
     }
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
index 1db5df36..b95c860b 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/appservice/impl/OrdersGroupPackageAppServiceImpl.java
@@ -92,6 +92,12 @@ public class OrdersGroupPackageAppServiceImpl implements IOrdersGroupPackageAppS
             ordersGroupPackageDetail.setOrderDefinitionTable(ordersGroupPackageDetailSaveDto.getOrderDefinitionTable());// 医嘱定义表名
             ordersGroupPackageDetail.setQuantity(ordersGroupPackageDetailSaveDto.getQuantity()); // 数量
             ordersGroupPackageDetail.setUnitCode(ordersGroupPackageDetailSaveDto.getUnitCode()); // 单位
+            ordersGroupPackageDetail.setDose(ordersGroupPackageDetailSaveDto.getDose()); // 单次剂量
+            ordersGroupPackageDetail.setRateCode(ordersGroupPackageDetailSaveDto.getRateCode()); // 用药频次
+            ordersGroupPackageDetail.setDispensePerDuration(ordersGroupPackageDetailSaveDto.getDispensePerDuration()); // 用药天数
+            ordersGroupPackageDetail.setMethodCode(ordersGroupPackageDetailSaveDto.getMethodCode()); // 给药途径
+            ordersGroupPackageDetail.setDoseQuantity(ordersGroupPackageDetailSaveDto.getDoseQuantity()); // 小单位单次剂量
+            ordersGroupPackageDetail.setGroupId(ordersGroupPackageDetailSaveDto.getGroupId()); // 组号
             ordersGroupPackageDetailService.save(ordersGroupPackageDetail);
         }
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
index db2c9f15..0a49e1ff 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailQueryDto.java
@@ -53,6 +53,27 @@ public class OrdersGroupPackageDetailQueryDto {
     private String unitCode_dictText;
     private String unitCodeName;
 
+    /** 单次剂量 */
+    private BigDecimal dose;
+
+    /** 用药频次 */
+    @Dict(dictCode = "rate_code")
+    private String rateCode;
+    private String rateCode_dictText;
+
+    /** 用药天数 */
+    private Integer dispensePerDuration;
+
+    /** 给药途径 */
+    @Dict(dictCode = "method_code")
+    private String methodCode;
+    private String methodCode_dictText;
+
+    /**
+     * 小单位单次剂量
+     */
+    private BigDecimal doseQuantity;
+
     /**
      * 医嘱名称
      */
@@ -63,4 +84,10 @@ public class OrdersGroupPackageDetailQueryDto {
      */
     private AdviceBaseDto orderDetailInfos;
 
+    /**
+     * 组号
+     */
+    private Long groupId;
+
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
index e53c1559..1f8ea403 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDetailSaveDto.java
@@ -42,4 +42,26 @@ public class OrdersGroupPackageDetailSaveDto {
      */
     private String unitCode;
 
+    /** 单次剂量 */
+    private BigDecimal dose;
+
+    /** 用药频次 */
+    private String rateCode;
+
+    /** 用药天数 */
+    private Integer dispensePerDuration;
+
+    /** 给药途径 */
+    private String methodCode;
+
+    /**
+     * 小单位单次剂量
+     */
+    private BigDecimal doseQuantity;
+
+    /**
+     * 组号
+     */
+    private Long groupId;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java
index 26f9b22b..0cf63895 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageDto.java
@@ -8,6 +8,7 @@ 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;
 
@@ -21,6 +22,13 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class OrdersGroupPackageDto {
 
+    /**
+     * 用于搭配Dict切面,无实际业务意义
+     */
+    @Dict(dictCode = "test_field")
+    private String testField;
+    private String testField_dictText;
+
     /**
      * 组合套餐id
      */
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java
index 82385a0f..82ac8a8e 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/personalization/dto/OrdersGroupPackageUseDto.java
@@ -5,6 +5,7 @@ package com.openhis.web.personalization.dto;
 
 import java.util.List;
 
+import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -18,6 +19,13 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class OrdersGroupPackageUseDto {
 
+    /**
+     * 用于搭配Dict切面,无实际业务意义
+     */
+    @Dict(dictCode = "test_field")
+    private String testField;
+    private String testField_dictText;
+
     /**
      * 个人组套
      */
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
index caab158f..3f7ec952 100644
--- 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
@@ -1,39 +1,28 @@
 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.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.ISupplyDeliveryService;
 import com.openhis.workflow.service.ISupplyRequestService;
 
 /**
@@ -71,15 +60,15 @@ public class PharmacyDispensaryDispensingOrderServiceImpl implements IPharmacyDi
 
         // 单据分类
         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()));
+        // 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);
 
@@ -148,9 +137,8 @@ public class PharmacyDispensaryDispensingOrderServiceImpl implements IPharmacyDi
                 .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())
+                .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());
@@ -161,9 +149,9 @@ public class PharmacyDispensaryDispensingOrderServiceImpl implements IPharmacyDi
                 .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());
+                .setLotNumber(supplyRequest.getLotNumber()).setPractitionerId(supplyRequest.getApplicantId())
+                .setOccurrenceTime(supplyRequest.getApprovalTime()).setReceiverId(supplyRequest.getPurposeLocationId())
+                .setReceiveTime(supplyRequest.getApprovalTime());
 
             supplyDeliveryList.add(supplyDelivery);
         }
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
index 296d6020..12a0c6bb 100644
--- 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
@@ -25,7 +25,6 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryPr
 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;
 
@@ -47,6 +46,7 @@ public class PharmacyDispensaryProfitLossOrderServiceImpl implements IPharmacyDi
     private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
     @Autowired
     private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
     /**
      * 初始化
      *
@@ -59,16 +59,21 @@ public class PharmacyDispensaryProfitLossOrderServiceImpl implements IPharmacyDi
 
         // 单据分类
         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()));
+        // 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);
 
@@ -101,16 +106,14 @@ public class PharmacyDispensaryProfitLossOrderServiceImpl implements IPharmacyDi
         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()
-            ));
+            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);
     }
 
-
     /**
      * 获取单据号
      *
@@ -136,7 +139,8 @@ public class PharmacyDispensaryProfitLossOrderServiceImpl implements IPharmacyDi
     @Override
     public R<?> addOrEditProfitLossOrder(List<PharmacyDispensaryDetailDto> profitLossOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
@@ -147,19 +151,18 @@ public class PharmacyDispensaryProfitLossOrderServiceImpl implements IPharmacyDi
         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());
+            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);
         }
         // 更新请求表
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
index f93c1fbc..5e9c1280 100644
--- 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
@@ -23,7 +23,6 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRe
 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;
 
@@ -47,6 +46,7 @@ public class PharmacyDispensaryRequisitionOrderServiceImpl implements IPharmacyD
 
     @Autowired
     private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
     /**
      * 初始化
      *
@@ -59,10 +59,11 @@ public class PharmacyDispensaryRequisitionOrderServiceImpl implements IPharmacyD
 
         // 单据分类
         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()));
+        // 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);
 
@@ -95,9 +96,8 @@ public class PharmacyDispensaryRequisitionOrderServiceImpl implements IPharmacyD
         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()
-            ));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyDispensaryDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
 
             item.setUnitList(unitList);
         }
@@ -130,7 +130,8 @@ public class PharmacyDispensaryRequisitionOrderServiceImpl implements IPharmacyD
     @Override
     public R<?> addOrEditRequisitionOrder(List<PharmacyDispensaryDetailDto> requisitionOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(requisitionOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(requisitionOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
@@ -140,17 +141,17 @@ public class PharmacyDispensaryRequisitionOrderServiceImpl implements IPharmacyD
 
         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());
+            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);
         }
         // 更新请求表
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
index 05594601..8ea3b488 100644
--- 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
@@ -7,8 +7,6 @@ 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;
 
@@ -27,7 +25,6 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryRe
 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;
 
@@ -38,8 +35,8 @@ import com.openhis.workflow.service.ISupplyRequestService;
  * @date 2025-07-22
  */
 @Service
-public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl implements
-    IPharmacyDispensaryReturnToWarehouseOrderService {
+public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl
+    implements IPharmacyDispensaryReturnToWarehouseOrderService {
 
     @Resource
     private AssignSeqUtil assignSeqUtil;
@@ -51,6 +48,7 @@ public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl implements
     private IPharmacyDispensaryCommonService pharmacyDispensaryCommonService;
     @Autowired
     private PharmacyDispensaryCommonMapper pharmacyDispensaryCommonMapper;
+
     /**
      * 初始化
      *
@@ -63,8 +61,8 @@ public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl implements
 
         // 单据分类
         List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -97,16 +95,14 @@ public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl implements
         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()
-            ));
+            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);
     }
 
-
     /**
      * 获取单据号
      *
@@ -132,7 +128,8 @@ public class PharmacyDispensaryReturnToWarehouseOrderServiceImpl implements
     @Override
     public R<?> addOrEditReturnToWarehouseOrder(List<PharmacyDispensaryDetailDto> returnToDispensaryOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(returnToDispensaryOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(returnToDispensaryOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
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
index f75939d4..f5d7f7fd 100644
--- 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
@@ -61,8 +61,8 @@ public class PharmacyDispensaryStockInOrderServiceImpl implements IPharmacyDispe
 
         // 单据分类
         List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+//        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+//            SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
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
index 5dc21506..7d1d1f62 100644
--- 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
@@ -61,10 +61,10 @@ public class PharmacyDispensaryStocktakingOrderServiceImpl implements IPharmacyD
 
         // 单据分类
         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()));
+//        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);
 
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
index 68907a3a..a6c926cc 100644
--- 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
@@ -25,7 +25,6 @@ import com.openhis.web.pharmacyDispensarymanage.appservice.IPharmacyDispensaryTr
 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;
 
@@ -60,8 +59,8 @@ public class PharmacyDispensaryTransferInOrderServiceImpl implements IPharmacyDi
 
         // 单据分类
         List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -128,7 +127,8 @@ public class PharmacyDispensaryTransferInOrderServiceImpl implements IPharmacyDi
     @Override
     public R<?> addOrEditTransferInOrder(List<PharmacyDispensaryDetailDto> transferInOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(transferInOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
@@ -150,8 +150,8 @@ public class PharmacyDispensaryTransferInOrderServiceImpl implements IPharmacyDi
                 .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());
+                .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index 7a3a3b7c..31c7e005 100644
--- 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
@@ -59,8 +59,8 @@ public class PharmacyDispensaryTransferOutOrderServiceImpl implements IPharmacyD
 
         // 单据分类
         List<PharmacyDispensaryInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+//        supplyCategoryOption.add(new PharmacyDispensaryInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+//            SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
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
index a2d19aaa..e2b40fdf 100644
--- 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
@@ -7,7 +7,6 @@ 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;
 
@@ -18,6 +17,7 @@ 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;
@@ -25,7 +25,6 @@ import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseProf
 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;
 
@@ -47,6 +46,7 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
     private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
     @Autowired
     private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+
     /**
      * 初始化
      *
@@ -59,12 +59,15 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
 
         // 单据分类
         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()));
+        // 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);
 
@@ -97,16 +100,14 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
         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()
-            ));
+            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);
     }
 
-
     /**
      * 获取单据号
      *
@@ -132,7 +133,8 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
     @Override
     public R<?> addOrEditProfitLossOrder(List<PharmacyWarehouseDetailDto> profitLossOrderDtoList) {
         // 请求数据取得
-        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
+        List<SupplyRequest> requestList =
+            supplyRequestService.getSupplyByBusNo(profitLossOrderDtoList.get(0).getBusNo());
         if (!requestList.isEmpty()) {
             // 请求id取得
             List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
@@ -154,8 +156,8 @@ public class PharmacyWarehouseProfitLossOrderServiceImpl implements IPharmacyWar
                     .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());
+                    .setPurposeLocationId(item.getPurposeLocationId()).setApplicantId(item.getApplicantId())
+                    .setApplyTime(applyTime).setRemake(item.getRemake());
             supplyRequestList.add(supplyRequest);
         }
         // 更新请求表
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
index b19fbeb3..5a2b7b1d 100644
--- 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
@@ -1,38 +1,30 @@
 package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.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.inventorymanage.dto.ProductStocktakingInitDto;
 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.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
 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;
 
 /**
  * 药库订货单
@@ -52,7 +44,8 @@ public class PharmacyWarehousePurchaseOrderServiceImpl implements IPharmacyWareh
     private IPharmacyWarehouseCommonService pharmacyWarehouseCommonService;
 
     @Autowired
-    private   PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+    private PharmacyWarehouseCommonMapper pharmacyWarehouseCommonMapper;
+
     /**
      * 初始化
      *
@@ -65,10 +58,11 @@ public class PharmacyWarehousePurchaseOrderServiceImpl implements IPharmacyWareh
 
         // 单据分类
         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()));
+        // 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);
 
@@ -101,9 +95,8 @@ public class PharmacyWarehousePurchaseOrderServiceImpl implements IPharmacyWareh
         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()
-            ));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMaxUnitCode(), item.getMaxUnitCode_dictText()));
+            unitList.add(new PharmacyWarehouseDetailDto.Option(item.getMinUnitCode(), item.getMinUnitCode_dictText()));
 
             item.setUnitList(unitList);
         }
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
index 8a1fd8c6..849d4703 100644
--- 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
@@ -1,19 +1,15 @@
 package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 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;
@@ -21,11 +17,14 @@ 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.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
 import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseReturnOrderService;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseReturnOrderMapper;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
 import com.openhis.workflow.domain.SupplyRequest;
 import com.openhis.workflow.service.ISupplyRequestService;
 
@@ -59,8 +58,8 @@ public class PharmacyWarehouseReturnOrderServiceImpl implements IPharmacyWarehou
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+        // supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+        // SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
@@ -134,10 +133,11 @@ public class PharmacyWarehouseReturnOrderServiceImpl implements IPharmacyWarehou
             // 单据信息删除
             supplyRequestService.removeByIds(requestIdList);
         }
-        //添加原始单据号
-        if(returnOrderDtoList.get(0).getOriginalBusNo()!=null){
+        // 添加原始单据号
+        if (returnOrderDtoList.get(0).getOriginalBusNo() != null) {
             // 审批单据并返回单据详情
-            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(returnOrderDtoList.get(0).getOriginalBusNo(), returnOrderDtoList.get(0).getBusNo());
+            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));
             }
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
index f2e19a70..cc73702a 100644
--- 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
@@ -59,8 +59,8 @@ public class PharmacyWarehouseReturnToWarehouseOrderServiceImpl implements IPhar
 
         // 单据分类
         List<PharmacyWarehouseInitDto.IntegerOption> supplyCategoryOption = new ArrayList<>();
-        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
-            SupplyCategory.NORMAL.getInfo()));
+//        supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.NORMAL.getValue(),
+//            SupplyCategory.NORMAL.getInfo()));
 
         purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption);
 
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
index 786d2804..e12e5313 100644
--- 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
@@ -1,30 +1,15 @@
 package com.openhis.web.pharmacyWarehousemanage.appservice.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 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;
@@ -32,11 +17,14 @@ 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.inventorymanage.dto.ProductStocktakingInitDto;
+import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseCommonService;
 import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStockInOrderService;
-import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseStockInOrderMapper;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseDetailDto;
+import com.openhis.web.pharmacyWarehousemanage.dto.PharmacyWarehouseInitDto;
+import com.openhis.web.pharmacyWarehousemanage.mapper.PharmacyWarehouseCommonMapper;
 import com.openhis.workflow.domain.SupplyRequest;
 import com.openhis.workflow.service.ISupplyRequestService;
 
@@ -71,18 +59,18 @@ public class PharmacyWarehouseStockInOrderServiceImpl implements IPharmacyWareho
 
         // 单据分类
         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()));
+        // 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);
 
@@ -161,10 +149,11 @@ public class PharmacyWarehouseStockInOrderServiceImpl implements IPharmacyWareho
             // 单据信息删除
             supplyRequestService.removeByIds(requestIdList);
         }
-        //添加原始单据号
-        if(stockInOrderDtoList.get(0).getOriginalBusNo()!=null){
+        // 添加原始单据号
+        if (stockInOrderDtoList.get(0).getOriginalBusNo() != null) {
             // 审批单据并返回单据详情
-            List<SupplyRequest> agreedList = supplyRequestService.addOriginalBusNo(stockInOrderDtoList.get(0).getOriginalBusNo(), stockInOrderDtoList.get(0).getBusNo());
+            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));
             }
@@ -184,7 +173,8 @@ public class PharmacyWarehouseStockInOrderServiceImpl implements IPharmacyWareho
                 .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())
+                .setPurposeLocationId(item.getPurposeLocationId())
+                .setPackagingConditionEnum(item.getPackagingConditionEnum())
                 .setAcceptanceResultEnum(item.getAcceptanceResultEnum()).setSupplierId(item.getSupplierId())
                 .setApplicantId(item.getApplicantId()).setApplyTime(applyTime).setReason(item.getReason())
                 .setRemake(item.getRemake());
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
index 493da6ae..a470a972 100644
--- 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
@@ -59,12 +59,12 @@ public class PharmacyWarehouseStockOutOrderServiceImpl implements IPharmacyWareh
 
         // 单据分类
         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()));
+//        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);
 
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
index 5833ef50..62017fdf 100644
--- 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
@@ -7,7 +7,6 @@ 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;
 
@@ -18,6 +17,7 @@ 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;
@@ -25,7 +25,6 @@ import com.openhis.web.pharmacyWarehousemanage.appservice.IPharmacyWarehouseStoc
 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;
 
@@ -60,10 +59,10 @@ public class PharmacyWarehouseStocktakingOrderServiceImpl implements IPharmacyWa
 
         // 单据分类
         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()));
+        // 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);
 
@@ -141,18 +140,19 @@ public class PharmacyWarehouseStocktakingOrderServiceImpl implements IPharmacyWa
         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());
+            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);
         }
         // 更新请求表
diff --git a/openhis-server-new/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
index 2eff34f5..bb0720e3 100644
--- a/openhis-server-new/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
@@ -1,6 +1,7 @@
 package com.openhis.web.pharmacymanage.appservice;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam;
@@ -33,6 +34,9 @@ public interface IMedicationDetailsAppService {
     R<?> getAmbPractitionerDetailPage(MedDetailsSearchParam medDetailsSearchParam, Integer pageNo, Integer pageSize,
         String searchKey, HttpServletRequest request);
 
+    void makeExcelFile(MedDetailsSearchParam medDetailsSearchParam, Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletResponse response, HttpServletRequest request);
+
     /**
      * 门诊发药明细流水账
      *
@@ -45,6 +49,7 @@ public interface IMedicationDetailsAppService {
      */
     R<?> getAmbMedicationDispenseDetailPage(MedDetailsSearchParam medDetailsSearchParam, Integer pageNo,
         Integer pageSize, String searchKey, HttpServletRequest request);
+}
 
 //    /**
 //     * 门诊/住院人员发药明细帐、住院耗材记账领用明细
@@ -71,5 +76,3 @@ public interface IMedicationDetailsAppService {
 //     */
 //    R<?> getMedRunningAccountPage(MedDetailsSearchParam medDetailsSearchParam, Integer pageNo, Integer pageSize,
 //        String searchKey, HttpServletRequest request);
-
-}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
index 2c38eaff..2baeb074 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/ISummaryDispenseMedicineAppService.java
@@ -3,9 +3,11 @@ package com.openhis.web.pharmacymanage.appservice;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import com.core.common.core.domain.R;
-import com.openhis.web.pharmacymanage.dto.MedicineSummarySearchParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.pharmacymanage.dto.*;
 
 /**
  * 住院汇总发药 应用实现接口
@@ -23,31 +25,87 @@ public interface ISummaryDispenseMedicineAppService {
     R<?> init();
 
     /**
-     * 医嘱查询
+     * 分页查询住院病人列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param startTime          开始时间
+     * @param endTime            结束时间
+     * @param searchKey          模糊查询关键字
+     * @param pageNo             当前页码
+     * @param pageSize           查询条数
+     * @param request            请求数据
+     * @return 病人列表
+     */
+    R<?> getEncounterInfoListPage(AdmissionPageParam admissionPageParam, String startTime, String endTime,
+                                  Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+
+    void makeExcelFile(MedicineSummarySearchParam searchParam, Integer pageNo,
+                       Integer pageSize, String searchKey,
+                       HttpServletRequest request, HttpServletResponse response);
+
+    /**
+     * 住院汇总药品
+     *
+     * @param searchParam 查询信息
+     * @param pageNo      当前页码
+     * @param pageSize    查询条数
+     * @return 药品汇总
+     */
+    R<?> getSummaryMedicationInfo(MedicineSummarySearchParam searchParam, Integer pageNo, Integer pageSize);
+
+    /**
+     * 住院汇总发药单
+     *
+     * @param searchParam 查询信息
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param pageNo      当前页码
+     * @param pageSize    查询条数
+     * @param request     请求数据
+     * @return 药品汇总
+     */
+    R<?> getSummaryFromInfo(FromSummarySearchParam searchParam, String startTime, String endTime, String searchKey,
+                            Integer pageNo, Integer pageSize, HttpServletRequest request);
+
+    /**
+     * 住院药品汇总发药单详细
      *
      * @param searchParam 查询条件
-     * @param searchKey 模糊查询关键字
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @param request 请求数据
+     * @param searchKey   模糊查询关键字
+     * @param pageNo      当前页码
+     * @param pageSize    查询条数
+     * @param request     请求数据
      */
-    R<?> getMedicationSummaryInfo(MedicineSummarySearchParam searchParam, String searchKey, Integer pageNo,
-        Integer pageSize, HttpServletRequest request);
+    R<?> getOrderInfo(FromSearchParam searchParam, String searchKey, Integer pageNo, Integer pageSize,
+                      HttpServletRequest request);
 
     /**
      * 处方单核对发药
      *
-     * @param searchParam 条件
+     * @param dispenseMedicineList 发药信息
      * @return 处理结果
      */
-    R<?> SummaryDispenseMedicine(List<MedicineSummarySearchParam> searchParam);
+    R<?> SummaryDispenseMedicine(List<DispenseItemDto> dispenseMedicineList);
 
     /**
      * 作废
      *
-     * @param deliveryIdList 供应发放id
-     * @param notPerformedReasonEnum 未发原因
+     * @param dispenseMedicineList 作废信息
      * @return 处理结果
      */
-    R<?> dispenseCancel(List<Long> deliveryIdList, Integer notPerformedReasonEnum);
+    R<?> dispenseCancel(List<DispenseItemDto> dispenseMedicineList);
+
+    /**
+     * 退药处理
+     *
+     * @param dispenseMedicineList 退药清单
+     * @return 处理结果
+     */
+    R<?> medicineReturn(List<DispenseItemDto> dispenseMedicineList);
+
 }
+
+
+
+
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
index 8523c351..355d9c52 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
@@ -145,7 +145,7 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
         // 构建查询条件
         QueryWrapper<EncounterInfoSearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(encounterInfoSearchParam, searchKey,
-                new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.idCard,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.IdCard,
                     CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
                 request);
         // 查询就诊病人列表
@@ -218,45 +218,45 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
         List<Long> devDispenseIdList =
             dispenseDeviceList.stream().map(DispenseItemDto::getDispenseId).collect(Collectors.toList());
         // 获取库存信息
-        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
+        List<UnDispenseInventoryDto> 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));
+        Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
         // 遍历每个分组校验库存状态
-        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
-            List<InventoryDto> groupItems = entry.getValue();
-            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+        for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<UnDispenseInventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(UnDispenseInventoryDto::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())) {
+            for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
                     InventoryItem inventoryItem = new InventoryItem();
                     // 库存数量判定
-                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                    if (unDispenseInventoryDto.getDispenseUnit().equals(unDispenseInventoryDto.getInventoryUnitCode())) {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(unDispenseInventoryDto.getQuantity());
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     } else {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
-                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                            .subtract(unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     }
                     inventoryItemList.add(inventoryItem);
@@ -396,45 +396,45 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
             .list(new LambdaQueryWrapper<DeviceDispense>().in(DeviceDispense::getDeviceReqId, devRequestIdList))
             .stream().map(DeviceDispense::getId).collect(Collectors.toList());
         // 获取库存信息
-        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, null,
+        List<UnDispenseInventoryDto> 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));
+        Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
         // 遍历每个分组校验库存状态
-        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
-            List<InventoryDto> groupItems = entry.getValue();
-            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+        for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<UnDispenseInventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(UnDispenseInventoryDto::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())) {
+            for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
                     InventoryItem inventoryItem = new InventoryItem();
                     // 库存数量判定
-                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                    if (unDispenseInventoryDto.getDispenseUnit().equals(unDispenseInventoryDto.getInventoryUnitCode())) {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(unDispenseInventoryDto.getQuantity());
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     } else {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
-                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                            .subtract(unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     }
                     inventoryItemList.add(inventoryItem);
diff --git a/openhis-server-new/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
index 46dd4fc8..981b1ab4 100644
--- a/openhis-server-new/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
@@ -1,27 +1,38 @@
 package com.openhis.web.pharmacymanage.appservice.impl;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import com.openhis.administration.domain.Practitioner;
-import com.openhis.administration.service.IPractitionerService;
-import com.openhis.common.enums.*;
-import com.openhis.web.pharmacymanage.dto.*;
+import com.core.common.utils.poi.ExcelUtil;
+import com.openhis.web.inventorymanage.dto.ReceiptPageDto;
 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.core.domain.entity.SysDictData;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.CommonConstants;
+import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.EncounterClass;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.RequestStatus;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.pharmacymanage.appservice.IMedicationDetailsAppService;
+import com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto;
+import com.openhis.web.pharmacymanage.dto.MedDetailsInitDto;
+import com.openhis.web.pharmacymanage.dto.MedDetailsSearchParam;
 import com.openhis.web.pharmacymanage.mapper.MedicationDetailsMapper;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
 
 /**
  * 发药明细 应用实现类
@@ -35,14 +46,17 @@ public class MedicationDetailsAppServiceImpl implements IMedicationDetailsAppSer
     @Autowired
     private MedicationDetailsMapper medicationDetailsMapper;
 
+    @Autowired
+    private ISysDictTypeService sysDictTypeService;
+
     @Autowired
     private IPractitionerService iPractitionerService;
 
     /**
      * 获取页面初始化信息
-     *
-     * @return 初始化信息
      */
+
+
     @Override
     public R<?> init() {
 
@@ -87,12 +101,150 @@ public class MedicationDetailsAppServiceImpl implements IMedicationDetailsAppSer
         Page<MedDetailedAccountPageDto> medDetailsPage =
             medicationDetailsMapper.selectAmbPractitionerDetailPage(new Page<>(pageNo, pageSize), queryWrapper,
                 EncounterClass.AMB.getValue(), DispenseStatus.COMPLETED.getValue(), RequestStatus.COMPLETED.getValue(),
-                DispenseStatus.REFUNDED.getValue(), 1, flg);
+                DispenseStatus.REFUNDED.getValue(), 1, flg, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
 
         return R.ok(medDetailsPage);
 
     }
 
+    /**
+     * 发药明细导出
+     *
+     * @param medDetailsSearchParam 查询条件
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param response 响应数据
+     * @param request 请求数据
+     *
+     */
+    @Override
+    public void makeExcelFile(MedDetailsSearchParam medDetailsSearchParam, Integer pageNo, Integer pageSize,
+        String searchKey, HttpServletResponse response, HttpServletRequest request) {
+        R<?> result = this.getAmbPractitionerDetailPage(medDetailsSearchParam, 1, 10000, searchKey, request);
+        if (result != null && result.getData() != null) {
+            // 先获取Page对象，再获取其中的记录列表
+            Page<MedDetailedAccountPageDto> pageData = (Page<MedDetailedAccountPageDto>)result.getData();
+            List<MedDetailedAccountPageDto> dataList = pageData.getRecords();
+
+            // 获取字典数据
+            for (MedDetailedAccountPageDto medDetailedAccountPageDto : dataList) {
+                String unitCode = medDetailedAccountPageDto.getUnitCode();
+                // 添加空值检查
+                if (unitCode != null && sysDictTypeService != null) {
+                    // 缓存字典数据，避免重复查询
+                    List<SysDictData> unitCodelist = sysDictTypeService.selectDictDataByType("unit_code");
+                    if (unitCodelist != null) {
+                        for (SysDictData dictData : unitCodelist) {
+                            if (dictData != null && dictData.getDictValue() != null
+                                && dictData.getDictValue().equals(unitCode)) {
+                                medDetailedAccountPageDto.setUnitCode_dictText(dictData.getDictLabel());
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // 将发药数量与单位拼接
+            for (MedDetailedAccountPageDto medDetailedAccountPageDto : dataList) {
+                String unitCode_dictText = medDetailedAccountPageDto.getUnitCode_dictText();
+                Integer dispenseQuantity = medDetailedAccountPageDto.getDispenseQuantity();
+                // 将发药数量与单位拼接
+                medDetailedAccountPageDto.setDispenseQuantitystr(dispenseQuantity + unitCode_dictText);
+            }
+
+            // 将退药数量与单位拼接
+            for (MedDetailedAccountPageDto medDetailedAccountPageDto : dataList) {
+                String unitCode_dictText = medDetailedAccountPageDto.getUnitCode_dictText();
+                Integer refundQuantity = medDetailedAccountPageDto.getRefundQuantity();
+                // 添加完整的空值检查和默认值处理
+                String unitText = (unitCode_dictText != null) ? unitCode_dictText : "";
+                if (refundQuantity == null) {
+                    medDetailedAccountPageDto.setRefundQuantitystr("0.00" + unitCode_dictText);
+                } else if (refundQuantity == 0) {
+                    medDetailedAccountPageDto.setRefundQuantitystr("0.00" + unitCode_dictText);
+                } else {
+                    medDetailedAccountPageDto.setRefundQuantitystr(refundQuantity.toString() + unitCode_dictText);
+                }
+            }
+
+            // 将退药金额
+            for (MedDetailedAccountPageDto medDetailedAccountPageDto : dataList) {
+                BigDecimal refundPrice = medDetailedAccountPageDto.getRefundPrice();
+                if (refundPrice == null) {
+                    medDetailedAccountPageDto.setRefundPricestr("0.00" );
+                } else if (refundPrice.signum() == 0) {
+                    medDetailedAccountPageDto.setRefundPricestr("0.00" );
+                } else {
+                    refundPrice = refundPrice.setScale(6, RoundingMode.HALF_UP);
+                    medDetailedAccountPageDto.setRefundPricestr(refundPrice.toString() );
+                }
+
+            }
+
+            //发药金额
+            for (MedDetailedAccountPageDto medDetailedAccountPageDto : dataList) {
+                BigDecimal dispensePrice = medDetailedAccountPageDto.getDispensePrice();
+                if (dispensePrice == null) {
+                    medDetailedAccountPageDto.setDispensePricestr("0.00" );
+                } else if (dispensePrice.signum() == 0) {
+                    medDetailedAccountPageDto.setDispensePricestr("0.00" );
+                } else {
+                    dispensePrice = dispensePrice.setScale(6, RoundingMode.HALF_UP);
+                    medDetailedAccountPageDto.setDispensePricestr(dispensePrice.toString() );
+                }
+
+            }
+            // 添加项目类别
+            for (MedDetailedAccountPageDto medDetailedAccountPageDto : dataList) {
+                String itemTable = medDetailedAccountPageDto.getItemTable();
+                if (itemTable != null) {
+                    if(itemTable.equals("med_medication_definition")){
+                        medDetailedAccountPageDto.setItemTable("药品");
+                    }
+                    if(itemTable.equals("adm_device_definition")){
+                        medDetailedAccountPageDto.setItemTable("耗材");
+                    }
+                }
+                else{
+                    medDetailedAccountPageDto.setItemTable("未知类型");
+                }
+            }
+
+            //判断项目类别  
+
+            try {
+                // 准备表头（key对应DTO的字段名）
+                //Map<String, String> headers = new LinkedHashMap<>();
+//                headers.put("practitionerName", "发药人");
+//                headers.put("dispenseNo", "发药单号");
+//                headers.put("medicationName", "药品项目");
+//                headers.put("itemTable", "项目类别");
+//                headers.put("busNo", "药品编码");
+//                headers.put("ybNo", "医保编码");
+//                headers.put("totalVolume", "规格");
+//                headers.put("dispenseQuantitystr", "发药数量");
+//                headers.put("dispensePricestr", "发药金额");
+//                headers.put("refundQuantitystr", "退药数量");
+//                headers.put("refundPricestr", "退药金额");
+//                headers.put("lotNumber", "生产批号");
+//                headers.put("manufacturerText", "厂家/产地");
+//                headers.put("supplierName", "供应商");
+//                headers.put("dispenseTime", "发药时间");
+                // 导出到Excel
+//                ExcelFillerUtil.makeExcelFile(response, dataList, headers, "发药明细", null);
+                // 导出到Excel
+                ExcelUtil<MedDetailedAccountPageDto> util = new ExcelUtil<MedDetailedAccountPageDto>(MedDetailedAccountPageDto.class);
+                util.exportExcel(response,dataList,"发药明细");
+            } catch (Exception e) {
+                e.printStackTrace();
+                System.out.printf("导出Excel失败：" + e.getMessage());
+            }
+        }
+    }
+
     /**
      * 门诊发药明细流水账
      *
@@ -117,7 +269,8 @@ public class MedicationDetailsAppServiceImpl implements IMedicationDetailsAppSer
         Page<MedDetailedAccountPageDto> medDetailsPage =
             medicationDetailsMapper.selectAmbPractitionerDetailPage(new Page<>(pageNo, pageSize), queryWrapper,
                 EncounterClass.AMB.getValue(), DispenseStatus.COMPLETED.getValue(), RequestStatus.COMPLETED.getValue(),
-                DispenseStatus.REFUNDED.getValue(), 2, flg);
+                DispenseStatus.REFUNDED.getValue(), 2, flg, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
+                CommonConstants.TableName.ADM_DEVICE_DEFINITION);
 
         return R.ok(medDetailsPage);
 
diff --git a/openhis-server-new/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/ReturnMedicineAppServiceImpl.java
index 3621e582..effd76c6 100644
--- a/openhis-server-new/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/ReturnMedicineAppServiceImpl.java
@@ -8,9 +8,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.openhis.yb.dto.MedicalInventory3511Output;
-import com.openhis.yb.dto.MedicalInventory3511Param;
-import com.openhis.yb.service.YbHttpUtils;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONArray;
@@ -51,7 +48,9 @@ import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.IInventoryItemService;
 import com.openhis.yb.domain.ClinicSettle;
 import com.openhis.yb.dto.Medical3506Param;
+import com.openhis.yb.dto.MedicalInventory3511Param;
 import com.openhis.yb.service.IClinicSettleService;
+import com.openhis.yb.service.YbHttpUtils;
 import com.openhis.yb.service.YbManager;
 
 /**
@@ -165,7 +164,7 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
         Integer pageSize, HttpServletRequest request) {
         // 构建查询条件
         QueryWrapper<EncounterInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(encounterInfoDto, searchKey,
-            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.idCard,
+            new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.IdCard,
                 CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
             request);
         // 查询退药患者分页列表
@@ -395,12 +394,12 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
 
         List<InventoryItem> inventoryItemList = new ArrayList<>();
         // 获取库存信息
-        List<InventoryDto> inventoryList =
+        List<UnDispenseInventoryDto> inventoryList =
             returnMedicineMapper.selectInventoryInfoList(devDispenseIdList, medDispenseIdList,
                 CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
         if (inventoryList != null && !inventoryList.isEmpty()) {
             // 设置库存数量
-            for (InventoryDto inventory : inventoryList) {
+            for (UnDispenseInventoryDto inventory : inventoryList) {
                 // 库存表项目设定
                 InventoryItem inventoryItem = new InventoryItem();
                 // id
@@ -636,9 +635,6 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
         } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(dispenseInventoryDto.getItemTable())) {
             medical3506Param.setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION);
         }
-        MedicalInventory3511Output medicalInventory3511Output =
-            ybHttpUtils.querySalesInfo(getMedical3511Param(dispenseInventoryDto));
-        medical3506Param.setMedinsProdSelNo(medicalInventory3511Output.getMedinsProdSelNo());
         return medical3506Param;
     }
 
@@ -649,7 +645,8 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
             SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.FIXMEDINS_CODE);
         // TODO
         medicalInventory3511Param.setFixmedinsCode(fixmedinsCode).setMedinsListCodg(dispenseInventoryDto.getYbNo())
-            .setFixmedinsBchno(dispenseInventoryDto.getLotNumber()).setBegndate(dispenseInventoryDto.getDispenseTime()).setEnddate(dispenseInventoryDto.getDispenseTime());
+            .setFixmedinsBchno(dispenseInventoryDto.getLotNumber()).setBegndate(dispenseInventoryDto.getDispenseTime())
+            .setEnddate(dispenseInventoryDto.getDispenseTime());
 
         return medicalInventory3511Param;
     }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
index d1fe464a..3d9d2f05 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
@@ -1,44 +1,64 @@
 package com.openhis.web.pharmacymanage.appservice.impl;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 
+import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.utils.poi.ExcelUtil;
+import com.core.system.mapper.SysDictDataMapper;
+import com.core.system.service.ISysDictTypeService;
+import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
+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.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.constant.HttpStatus;
 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.Practitioner;
+import com.core.common.utils.*;
+import com.openhis.administration.domain.Organization;
 import com.openhis.administration.domain.TraceNoManage;
 import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.IOrganizationService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.administration.service.ITraceNoManageService;
 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.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationDefinition;
 import com.openhis.medication.domain.MedicationDispense;
+import com.openhis.medication.service.IMedicationDefinitionService;
 import com.openhis.medication.service.IMedicationDispenseService;
+import com.openhis.medication.service.impl.MedicationRequestServiceImpl;
+import com.openhis.web.basedatamanage.appservice.IPractitionerAppService;
+import com.openhis.web.basedatamanage.dto.PractitionerOrgAndLocationDto;
+import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
 import com.openhis.web.inhospitalnursestation.appservice.IMedicineSummaryAppService;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPatientPageDto;
+import com.openhis.web.inhospitalnursestation.mapper.AdviceProcessAppMapper;
+import com.openhis.web.inventorymanage.appservice.impl.ReceiptApprovalAppServiceImpl;
+import com.openhis.web.inventorymanage.dto.SupplyItemDetailDto;
 import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.MedicineSummaryDto;
-import com.openhis.web.pharmacymanage.dto.MedicineSummaryInitDto;
-import com.openhis.web.pharmacymanage.dto.MedicineSummarySearchParam;
+import com.openhis.web.pharmacymanage.dto.*;
 import com.openhis.web.pharmacymanage.mapper.ReturnMedicineMapper;
 import com.openhis.web.pharmacymanage.mapper.SummaryDispenseMedicineMapper;
-import com.openhis.workflow.domain.DeviceDispense;
+import com.openhis.web.pharmacymanage.mapper.WesternMedicineDispenseMapper;
 import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
@@ -56,37 +76,78 @@ import com.openhis.workflow.service.ISupplyRequestService;
 @Service
 public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMedicineAppService {
 
-    @Autowired
+    @Resource
+    private IPractitionerAppService practitionerAppService;
+
+    @Resource
     private IMedicationDispenseService medicationDispenseService;
 
-    @Autowired
+    @Resource
     private IDeviceDispenseService deviceDispenseService;
 
-    @Autowired
+    @Resource
     private IInventoryItemService iInventoryItemService;
 
-    @Autowired
+    @Resource
     private SummaryDispenseMedicineMapper inpatientMedicineDispenseMapper;
 
-    @Autowired
+    @Resource
     private ReturnMedicineMapper returnMedicineMapper;
 
     @Autowired
     private ILocationService locationService;
+
     @Resource
     private IPractitionerService practitionerService;
+
     @Resource
     private ISupplyRequestService supplyRequestService;
+
     @Resource
     private ISupplyDeliveryService supplyDeliveryService;
-    @Autowired
+
+    @Resource
     private ITraceNoManageService traceNoManageService;
-    @Autowired
+
+    @Resource
     private WesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppServiceImpl;
 
-    @Autowired
+    @Resource
     private IMedicineSummaryAppService inpatientMedicineCollectionAppService;
 
+    @Resource
+    private WesternMedicineDispenseMapper westernMedicineDispenseMapper;
+
+    @Resource
+    private IOrganizationService organizationService;
+
+    @Resource
+    private AdviceProcessAppMapper adviceProcessAppMapper;
+
+    @Resource
+    private IInventoryItemService inventoryItemService;
+
+    @Resource
+    private IMedicationDefinitionService medicationDefinitionService;
+
+    @Resource
+    private ReceiptApprovalAppServiceImpl receiptApprovalAppService;
+
+    @Resource
+    private WesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppService;
+
+    @Resource
+    private MedicationRequestServiceImpl medicationRequestService;
+
+    @Resource
+    private AssignSeqUtil assignSeqUtil;
+
+    @Resource
+    private ReturnMedicineAppServiceImpl returnMedicineAppService;
+    private HttpServletResponse response;
+    @Autowired
+    private ISysDictTypeService sysDictTypeService;
+
     /**
      * 获取页面初始化信息
      *
@@ -95,42 +156,305 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
     @Override
     public R<?> init() {
 
-        MedicineSummaryInitDto initDto = new MedicineSummaryInitDto();
+        DispenseInitDto initDto = new DispenseInitDto();
 
-        // // 获取科室下拉选列表 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<MedicineSummaryInitDto.IntegerOptions> notPerformedReasonOptions =
-            Stream.of(NotPerformedReasonEnum.values())
-                .map(notPerformedReason -> new MedicineSummaryInitDto.IntegerOptions(notPerformedReason.getValue(),
-                    notPerformedReason.getInfo()))
+        // 获取科室下拉选列表
+        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> applicantList = practitionerService.getList();
-
-        // 发药状态
-        List<MedicineSummaryInitDto.IntegerOptions> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new MedicineSummaryInitDto.IntegerOptions(DispenseStatus.SUMMARIZED.getValue(),
-            DispenseStatus.SUMMARIZED.getInfo()));
-        dispenseStatusOptions.add(new MedicineSummaryInitDto.IntegerOptions(DispenseStatus.COMPLETED.getValue(),
-            DispenseStatus.COMPLETED.getInfo()));
-        dispenseStatusOptions.add(new MedicineSummaryInitDto.IntegerOptions(DispenseStatus.DECLINED.getValue(),
-            DispenseStatus.DECLINED.getInfo()));
-
-        initDto// .setDepartmentOptions(organizationOptions)
-            .setApplicantOptions(applicantList).setDispenseStatusOptions(dispenseStatusOptions)
-            .setNotPerformedReasonOptions(notPerformedReasonOptions);
+        initDto.setDepartmentOptions(organizationOptions);
         return R.ok(initDto);
     }
 
+    @Override
+    public R<?> getEncounterInfoListPage(AdmissionPageParam admissionPageParam, String startTime, String endTime,
+        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(), EncounterActivityStatus.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 searchParam 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 药品汇总
+     */
+    @Override
+    public R<?> getSummaryMedicationInfo(MedicineSummarySearchParam searchParam, Integer pageNo, Integer pageSize) {
+        ItemDispenseOrderDto itemDispenseOrderDto = new ItemDispenseOrderDto();
+        itemDispenseOrderDto.setEncounterId(searchParam.getEncounterId());
+        // 发药状态初始化
+        Integer dispenseStatus = itemDispenseOrderDto.getStatusEnum();
+        itemDispenseOrderDto.setStatusEnum(null);
+        // 构建查询条件
+        QueryWrapper<ItemDispenseOrderDto> queryWrapper =
+            HisQueryUtils.buildQueryWrapper(itemDispenseOrderDto, null, null, null);
+        // 处方单信息查询
+        Page<ItemDispenseOrderDto> medicineDispenseOrderPage =
+            westernMedicineDispenseMapper.selectMedicineDispenseOrderPage(new Page<>(pageNo, pageSize), queryWrapper,
+                DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
+                DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus);
+        medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> {
+            // 发药状态
+            medicineDispenseOrder.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(DispenseStatus.class, medicineDispenseOrder.getStatusEnum()));
+            // 设置所在表名
+            medicineDispenseOrder.setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION);
+        });
+        return R.ok(medicineDispenseOrderPage);
+    }
+
+
+    /**
+     * 导出住院发药信息到Excel
+     *
+     * @param searchParam 查询参数
+     * @param searchKey 搜索关键字
+     * @param pageNo 页码
+     * @param pageSize 每页大小
+     * @param request HTTP请求对象
+     * @param response HTTP响应对象
+     */
+    @Override
+    public void makeExcelFile(MedicineSummarySearchParam searchParam, Integer pageNo,
+                              Integer pageSize, String searchKey,
+                              HttpServletRequest request, HttpServletResponse response) {
+
+        // 获取发药数据
+        R<?> result = this.getSummaryMedicationInfo(searchParam,1, 10000);
+
+        if (result != null && result.getCode() == 200 && result.getData() != null) {
+            // 获取Page对象中的记录列表
+            Page<ItemDispenseOrderDto> pageData = (Page<ItemDispenseOrderDto>) result.getData();
+            List<ItemDispenseOrderDto> dataList = pageData.getRecords();
+                try {
+                    //获取药品类型
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        String itemType = itemDispenseOrderDto.getItemType();
+                        if (itemType != null) {
+                            List<SysDictData> itemTypeList = sysDictTypeService.selectDictDataByType("med_category_code");
+                            if (itemTypeList != null) {
+                                for (SysDictData dictData : itemTypeList) {
+                                    if (dictData != null && dictData.getDictValue() != null
+                                            && dictData.getDictValue().equals(itemType)) {
+                                        itemDispenseOrderDto.setItemType_dictText(dictData.getDictLabel());
+                                        break;
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+
+
+                    //用药频次
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        String rateCode = itemDispenseOrderDto.getRateCode();
+                        if (rateCode != null) {
+                            List<SysDictData> rateCodeList = sysDictTypeService.selectDictDataByType("rate_code");
+                            if (rateCodeList != null) {
+                                for (SysDictData dictData : rateCodeList) {
+                                    if (dictData != null && dictData.getDictValue() != null
+                                            && dictData.getDictValue().equals(rateCode)) {
+                                        itemDispenseOrderDto.setRateCode_dictText(dictData.getDictLabel());
+                                        break;
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+
+
+                    //用法
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        String methodCode = itemDispenseOrderDto.getMethodCode();
+                        if (methodCode != null) {
+                            List<SysDictData> methodCodeList = sysDictTypeService.selectDictDataByType("method_code");
+                            if (methodCodeList != null) {
+                                for (SysDictData dictData : methodCodeList) {
+                                    if (dictData != null && dictData.getDictValue() != null
+                                            && dictData.getDictValue().equals(methodCode)) {
+                                        itemDispenseOrderDto.setMethodCode_dictText(dictData.getDictLabel());
+                                        break;
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+
+
+                    // 计量单位
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        //获取计量单位翻译前的值
+                        String doseUnitCode = itemDispenseOrderDto.getDoseUnitCode();
+                        if (doseUnitCode != null) {
+                            //从系统字典服务中查询计量单位的值
+                            List<SysDictData> doseUnitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+                            if (doseUnitCodeList != null) {
+                                for (SysDictData dictData : doseUnitCodeList) {
+                                    if (dictData != null && dictData.getDictValue() != null
+                                            && dictData.getDictValue().equals(doseUnitCode)) {
+                                        itemDispenseOrderDto.setDoseUnitCode_dictText(dictData.getDictLabel());
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+
+                    // 获取单位翻译值
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        //获取单位翻译前的值
+                        String unitCode = itemDispenseOrderDto.getUnitCode();
+                        if (unitCode != null) {
+                            //从系统字典服务中查询单位的值
+                            List<SysDictData> unitCodeList = sysDictTypeService.selectDictDataByType("unit_code");
+                            if (unitCodeList != null) {
+                                for (SysDictData dictData : unitCodeList) {
+                                    if (dictData != null && dictData.getDictValue() != null
+                                            && dictData.getDictValue().equals(unitCode)) {
+                                        itemDispenseOrderDto.setUnitCode_dictText(dictData.getDictLabel());
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+
+                    // 金额保留两位小数
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        //获取金额的值
+                        BigDecimal totalPrice = itemDispenseOrderDto.getTotalPrice();
+                        //把金额值转换成double
+                        double doubleValue = totalPrice.doubleValue();
+                        double value = Math.round(doubleValue * 100.0) / 100.0;
+                        itemDispenseOrderDto.setTotalPrice(BigDecimal.valueOf(value));
+                    }
+
+                    // 单价保留两位小数
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        //获取单价的值
+                        BigDecimal unitPrice = itemDispenseOrderDto.getUnitPrice();
+                        //把单价值转换成double
+                        double valueLis = unitPrice.doubleValue();
+                        double valuePis = Math.round(valueLis * 100.0) / 100.0;
+                        itemDispenseOrderDto.setUnitPrice(BigDecimal.valueOf(valuePis));
+                    }
+
+                    //单次剂量保留两位小数
+                    for (ItemDispenseOrderDto itemDispenseOrderDto : dataList) {
+                        //获取单次剂量的值
+                        BigDecimal dose = itemDispenseOrderDto.getDose();
+                        //把单次剂量转换成double
+                        double valuePas = dose.doubleValue();
+                        double valueRas = Math.round(valuePas * 100.0) / 100.0;
+                        itemDispenseOrderDto.setDose(BigDecimal.valueOf(valueRas));
+                    }
+
+                ExcelUtil<ItemDispenseOrderDto> util = new ExcelUtil<ItemDispenseOrderDto>(ItemDispenseOrderDto.class);
+                 util.exportExcel(response, dataList, "住院发药单");
+            } catch (Exception e) {
+                e.printStackTrace();
+                System.out.printf("导出住院发药Excel失败：%s", e.getMessage());
+            }
+        }
+    }
+
+
+    /**
+     * 住院汇总发药单
+     *
+     * @param searchParam 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 药品汇总
+     */
+    @Override
+    public R<?> getSummaryFromInfo(FromSummarySearchParam searchParam, String startTime, String endTime,
+        String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
+        // 构建查询条件
+        QueryWrapper<MedicineSummarySearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(searchParam, searchKey,
+            new HashSet<>(List.of(CommonConstants.FieldName.ApplicantName, CommonConstants.FieldName.BusNo)), request);
+
+        // 查询医嘱详细信息
+        Page<MedicineSummaryDto> prescriptionItemInfoPageDto =
+            inpatientMedicineDispenseMapper.selectMedicationSummaryInfo(new Page<>(pageNo, pageSize), queryWrapper);
+
+        List<MedicineSummaryDto> medicineSummaryDtoList = prescriptionItemInfoPageDto.getRecords();
+
+        List<MedicineSummaryDto.Option> unitList;
+        // 个别项目设定
+        for (MedicineSummaryDto prescriptionInfoDto : medicineSummaryDtoList) {
+            // 状态
+            prescriptionInfoDto.setStatusEnum_enumText(
+                EnumUtils.getInfoByValue(DispenseStatus.class, prescriptionInfoDto.getStatusEnum()));
+            // 追溯码单位列表
+            unitList = new ArrayList<>();
+            unitList.add(new MedicineSummaryDto.Option(prescriptionInfoDto.getMaxUnitCode(),
+                prescriptionInfoDto.getMaxUnitCode_dictText()));
+            unitList.add(new MedicineSummaryDto.Option(prescriptionInfoDto.getMinUnitCode(),
+                prescriptionInfoDto.getMinUnitCode_dictText()));
+
+            prescriptionInfoDto.setUnitList(unitList);
+        }
+
+        // 获取当前用户id
+        Long userId = SecurityUtils.getUserId();
+        UserAndPractitionerDto userAndPractitionerDto = new UserAndPractitionerDto();
+        userAndPractitionerDto.setUserId(userId);
+        IPage<UserAndPractitionerDto> userPractitionerPage =
+            practitionerAppService.getUserPractitionerPage(userAndPractitionerDto, "", 1, 1);
+        // 查询该用户管理的药房
+        List<Long> locationIdList = userPractitionerPage.getRecords().get(0).getManageMedicationLocationDtoList()
+            .stream().map(PractitionerOrgAndLocationDto::getLocationId).toList();
+
+        List<FromSummaryDto> fromSummaryDtoList = new ArrayList<>();
+        for (MedicineSummaryDto medicineSummaryDto : medicineSummaryDtoList) {
+
+            FromSummaryDto fromSummaryDto = new FromSummaryDto();
+            BeanUtils.copyProperties(medicineSummaryDto, fromSummaryDto);
+
+            if (!locationIdList.isEmpty() && locationIdList.contains(fromSummaryDto.getSourceLocationId()))
+                fromSummaryDtoList.add(fromSummaryDto);
+        }
+
+        return R.ok(fromSummaryDtoList);
+    }
+
+    /**
+     * 住院药品汇总发药单详细
      *
      * @param searchParam 查询条件
      * @param searchKey 模糊查询关键字
@@ -139,19 +463,16 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
      * @param request 请求数据
      */
     @Override
-    public R<?> getMedicationSummaryInfo(MedicineSummarySearchParam searchParam, String searchKey, Integer pageNo,
-        Integer pageSize, HttpServletRequest request) {
+    public R<?> getOrderInfo(FromSearchParam searchParam, String searchKey, Integer pageNo, Integer pageSize,
+        HttpServletRequest request) {
 
         // 构建查询条件
-        QueryWrapper<MedicineSummarySearchParam> queryWrapper =
+        QueryWrapper<FromSearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(searchParam, searchKey, null, request);
-        queryWrapper.orderByDesc(CommonConstants.FieldName.applyTime);
 
         // 查询医嘱详细信息
         Page<MedicineSummaryDto> 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());
+            inpatientMedicineDispenseMapper.selectOrderInfo(new Page<>(pageNo, pageSize), queryWrapper);
 
         List<MedicineSummaryDto.Option> unitList;
         // 个别项目设定
@@ -167,133 +488,113 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
                 prescriptionInfoDto.getMinUnitCode_dictText()));
 
             prescriptionInfoDto.setUnitList(unitList);
-        } ;
+        }
         return R.ok(prescriptionItemInfoPageDto);
     }
 
     /**
      * 处方单核对发药
      *
-     * @param searchParam 条件
+     * @param dispenseMedicineList 发药信息
      * @return 处理结果
      */
     @Override
-    public R<?> SummaryDispenseMedicine(List<MedicineSummarySearchParam> searchParam) {
-        // 构建供应发放Id到追溯码的映射
-        Map<Long, String> traceNoMap = new HashMap<>();
-        for (MedicineSummarySearchParam param : searchParam) {
-            if (param != null && param.getDeliveryId() != null) {
-                traceNoMap.put(param.getDeliveryId(), param.getTraceNo());
-            }
+    public R<?> SummaryDispenseMedicine(List<DispenseItemDto> dispenseMedicineList) {
+        // 汇总状态更新标志
+        boolean summaryFlag = false;
+        List<InventoryItem> inventoryItemList = new ArrayList<>();
+
+        // 获取发药单id列表
+        List<Long> medDispenseIdList =
+            dispenseMedicineList.stream().map(DispenseItemDto::getDispenseId).collect(Collectors.toList());
+
+        if (medDispenseIdList.stream().allMatch(Objects::isNull)) {
+            List<String> busNoList =
+                dispenseMedicineList.stream().map(DispenseItemDto::getBusNo).collect(Collectors.toList());
+            medDispenseIdList = medicationDispenseService.getMedDispenseBySummaryNo(busNoList).stream()
+                .map(MedicationDispense::getId).toList();
+            summaryFlag = true;
         }
 
-        // 供应发放idList
-        List<Long> deliveryIdList =
-            searchParam.stream().map(MedicineSummarySearchParam::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;
+        // 获取库存信息
+        List<UnDispenseInventoryDto> inventoryList =
+            returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
 
-        // 构建项目发放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类型
-                .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()));
+        // 按每个药品分组
+        Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
+        // 遍历每个分组校验库存状态
+        for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<UnDispenseInventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(UnDispenseInventoryDto::getInventoryStatusEnum)
+                .allMatch(x -> x.equals(PublicationStatus.RETIRED.getValue()))) {
+                // 库存停供校验
+                return R.fail(groupItems.get(0).getItemName() + "库存已停供");
+            }
+        }
+        if (!inventoryList.isEmpty()) {
+            for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
+                    InventoryItem inventoryItem = new InventoryItem();
+                    // 库存数量判定
+                    if (unDispenseInventoryDto.getDispenseUnit()
+                        .equals(unDispenseInventoryDto.getInventoryUnitCode())) {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                            .subtract(unDispenseInventoryDto.getQuantity());
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    } else {
+                        // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(
+                            unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
+                        // 库存数量判定
+                        if (quantity.compareTo(BigDecimal.ZERO) < 0) {
+                            // 库存数量不足
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
+                        } else {
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
+                        }
+                    }
+                    inventoryItemList.add(inventoryItem);
                 }
             }
         }
-
-        // 校验库存
-        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<MedicationDispense> dispenseList = medicationDispenseService
+            .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, medDispenseIdList));
         // 追溯码列表
         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
+        List<SupplyItemDetailDto> supplyItemDetailList = new ArrayList<>();
+        if (dispenseList != null) {
+            // if (dispenseList.stream().map(MedicationDispense::getStatusEnum)
+            // .anyMatch(x -> !x.equals(DispenseStatus.PREPARED.getValue()))) {
+            // throw new ServiceException("发药失败，请检查发药单状态");
+            // } else {
+            for (MedicationDispense medicationDispense : dispenseList) {
+                // 药品发放状态
+                medicationDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                // 状态变更时间
+                medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
+                // 发药数量
+                medicationDispense.setDispenseQuantity(medicationDispense.getQuantity());
+                // 发药时间
+                medicationDispense.setDispenseTime(DateUtils.getNowDate());
+                // 发药人
+                medicationDispense.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                // 设置库存变更参数
+                supplyItemDetailList.add(new SupplyItemDetailDto().setItemId(medicationDispense.getMedicationId())
+                    .setLotNumber(medicationDispense.getLotNumber())
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION));
+                // 使用逗号分割追溯码并转换为List
+                if (medicationDispense.getTraceNo() != null) {
                     String[] traceNoList = medicationDispense.getTraceNo().split(CommonConstants.Common.COMMA);
                     for (String item : traceNoList) {
                         traceNoManage = new TraceNoManage();
@@ -318,95 +619,62 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
                         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) {
+            // 药品发放更新
+            medicationDispenseService.updateBatchById(dispenseList);
+            // 汇总发放更新
+            if (summaryFlag) {
+                List<Long> requestId = supplyRequestService.getSupplyByBusNo(dispenseMedicineList.get(0).getBusNo())
+                    .stream().map(SupplyRequest::getId).collect(Collectors.toList());
+                List<SupplyDelivery> supplyDeliveryList = supplyDeliveryService.selectByRequestIdList(requestId);
+                for (SupplyDelivery supplyDelivery : supplyDeliveryList) {
                     // 药品发放状态
-                    deviceDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
-                    // 发药数量
-                    deviceDispense.setDispenseQuantity(deviceDispense.getQuantity());
+                    supplyDelivery.setStatusEnum(DispenseStatus.COMPLETED.getValue());
                     // 发药时间
-                    deviceDispense.setDispenseTime(now);
+                    supplyDelivery.setOccurrenceTime(DateUtils.getNowDate());
                     // 发药人
-                    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);
-                    }
+                    supplyDelivery.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
                 }
-                // 耗材发放更新
-                deviceDispenseService.updateBatchById(devDispenseList);
+                supplyDeliveryService.updateBatchById(supplyDeliveryList);
+                List<SupplyRequest> supplyRequestList = supplyRequestService.selectByIdList(requestId);
+                for (SupplyRequest supplyRequest : supplyRequestList) {
+                    supplyRequest.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+                }
+                supplyRequestService.updateBatchById(supplyRequestList);
             }
+            // }
         } else {
             return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
         }
-
-        // 供应申请表更新
-        supplyRequestService.updateCompletedStatusBatch(requestIdList);
-
-        // 供应发放表更新
-        supplyDeliveryService.updateCompletedStatusBatch(deliveryIdList);
-
         // 库存更新
-        iInventoryItemService.updateBatchById(inventoryItemList);
-
+        inventoryItemService.updateBatchById(inventoryItemList);
         // 追溯码管理表数据追加
-        boolean result = traceNoManageService.saveBatch(tracesNoManageList);
-        if (!result) {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-        }
-
-        // todo 医保进销存 不知道怎么改
+        traceNoManageService.saveBatch(tracesNoManageList);
         // 返回信息
         String returnMsg = null;
+        List<String> uploadFailedNoList;
         // 调用医保商品销售接口
         String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
-            List<String> uploadFailedNoList =
-                westernMedicineDispenseAppServiceImpl.ybMedicineIntegrated(medDispenseIdList, null);
+            // 设置进销存参数
+            List<MedicationDefinition> medicationDefinitions = medicationDefinitionService.listByIds(
+                supplyItemDetailList.stream().map(SupplyItemDetailDto::getItemId).collect(Collectors.toList()));
+            // 用itemId分组
+            Map<Long, MedicationDefinition> medicationMap = medicationDefinitions.stream()
+                .collect(Collectors.toMap(MedicationDefinition::getId, Function.identity()));
+            // 设置库存变更参数
+            for (SupplyItemDetailDto dto : supplyItemDetailList) {
+                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(dto.getItemTable())) {
+                    MedicationDefinition med = medicationMap.get(dto.getItemId());
+                    if (med != null) {
+                        dto.setItemBusNo(med.getBusNo()).setPartPercent(med.getPartPercent()).setRxFlag(med.getRxFlag())
+                            .setYbNo(med.getYbNo());
+                    }
+                }
+            }
+            uploadFailedNoList = westernMedicineDispenseAppService.ybMedicineIntegrated(medDispenseIdList, null);
+            uploadFailedNoList = receiptApprovalAppService.ybInventoryIntegrated(supplyItemDetailList,
+                YbInvChgType.OTHER_OUT, DateUtils.getNowDate());
             if (uploadFailedNoList != null) {
                 returnMsg = "3505商品销售上传错误，错误项目编码" + uploadFailedNoList;
             } else {
@@ -419,102 +687,269 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
     /**
      * 作废
      *
-     * @param deliveryIdList 供应发放id
-     * @param notPerformedReasonEnum 未发原因
+     * @param dispenseMedicineList 作废信息
      * @return 处理结果
      */
     @Override
-    public R<?> dispenseCancel(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类型
-                    .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));
+    public R<?> dispenseCancel(List<DispenseItemDto> dispenseMedicineList) {
+        // 汇总状态更新标志
+        boolean summaryFlag = false;
+        // 获取发药单id列表
+        List<Long> medDispenseIdList =
+            dispenseMedicineList.stream().map(DispenseItemDto::getDispenseId).collect(Collectors.toList());
+
+        if (medDispenseIdList.isEmpty()) {
+            List<String> busNoList =
+                dispenseMedicineList.stream().map(DispenseItemDto::getBusNo).collect(Collectors.toList());
+            medDispenseIdList = medicationDispenseService.getMedDispenseBySummaryNo(busNoList).stream()
+                .map(MedicationDispense::getId).toList();
+            summaryFlag = true;
         }
 
-        Date now = DateUtils.getNowDate();
-
-        // 获取发药单id列表
-        List<MedicationDispense> medDispenseInfoList = medicationDispenseService.selectByIdList(medDispenseIdList);
-        if (medDispenseInfoList != null) {
-            for (MedicationDispense medicationDispense : medDispenseInfoList) {
+        // 药品发药信息查询
+        List<MedicationDispense> dispenseList = medicationDispenseService
+            .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, medDispenseIdList));
+        if (dispenseList != null) {
+            for (MedicationDispense medicationDispense : dispenseList) {
                 // 药品发放状态
                 medicationDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
                 // 未发药原因
-                medicationDispense.setNotPerformedReasonEnum(notPerformedReasonEnum);
+                medicationDispense.setNotPerformedReasonEnum(dispenseMedicineList.get(0).getNotPerformedReasonEnum());
                 // 状态变更时间
-                medicationDispense.setStatusChangedTime(now);
+                medicationDispense.setStatusChangedTime(DateUtils.getNowDate());
             }
             // 药品发放更新
-            medicationDispenseService.updateBatchById(medDispenseInfoList);
-        } else {
-            return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
-        }
-
-        // 获取发耗材单id列表
-        List<DeviceDispense> devDispenseInfoList = deviceDispenseService.listByIds(devDispenseIdList);
-        if (devDispenseInfoList != null) {
-            for (DeviceDispense deviceDispense : devDispenseInfoList) {
-                // 耗材发放状态
-                deviceDispense.setStatusEnum(DispenseStatus.DECLINED.getValue());
-                // 未发药原因
-                deviceDispense.setNotPerformedReasonEnum(notPerformedReasonEnum);
+            medicationDispenseService.updateBatchById(dispenseList);
+            // 汇总发放更新
+            if (summaryFlag) {
+                List<Long> requestId = supplyRequestService.getSupplyByBusNo(dispenseMedicineList.get(0).getBusNo())
+                    .stream().map(SupplyRequest::getId).collect(Collectors.toList());
+                List<SupplyDelivery> supplyDeliveryList = supplyDeliveryService.selectByRequestIdList(requestId);
+                for (SupplyDelivery supplyDelivery : supplyDeliveryList) {
+                    // 药品发放状态
+                    supplyDelivery.setStatusEnum(DispenseStatus.DECLINED.getValue());
+                }
+                supplyDeliveryService.updateBatchById(supplyDeliveryList);
             }
-            // 耗材发放更新
-            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));
     }
 
+    /**
+     * 退药处理
+     *
+     * @param dispenseMedicineList 退药清单
+     * @return 处理结果
+     */
+    @Override
+    public R<?> medicineReturn(List<DispenseItemDto> dispenseMedicineList) {
+        if (dispenseMedicineList == null || dispenseMedicineList.isEmpty()) {
+            return R.ok();
+        }
+
+        // 汇总状态更新标志
+        boolean summaryFlag = false;
+        // 获取发药单id列表
+        List<Long> medDispenseIdList =
+            dispenseMedicineList.stream().map(DispenseItemDto::getDispenseId).collect(Collectors.toList());
+
+        if (medDispenseIdList.stream().allMatch(Objects::isNull)) {
+            List<String> busNoList =
+                dispenseMedicineList.stream().map(DispenseItemDto::getBusNo).collect(Collectors.toList());
+            medDispenseIdList = medicationDispenseService.getMedDispenseBySummaryNo(busNoList).stream()
+                .map(MedicationDispense::getId).toList();
+            summaryFlag = true;
+        }
+
+        // 退药请求列表
+        List<ReturnMedicineDto> returnMedicineList = new ArrayList<>();
+        // 追溯码列表
+        List<TraceNoManage> traceNoManageList = new ArrayList<>();
+        TraceNoManage traceNoManage;
+
+        medDispenseIdList.forEach(dispenseId -> {
+            MedicationDispense medicationDispense = medicationDispenseService.getById(dispenseId);
+            returnMedicineList
+                .add(new ReturnMedicineDto().setDispenseId(dispenseId).setRequestId(medicationDispense.getMedReqId()));
+        });
+
+        // 获取药品退药请求id列表
+        List<Long> medRequestIdList =
+            returnMedicineList.stream().map(ReturnMedicineDto::getRequestId).collect(Collectors.toList());
+
+        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("药品已退药，请勿重复退药");
+                }
+            }
+        }
+
+        // 退药单列表
+        List<MedicationDispense> medicationRefundList = new ArrayList<>();
+        List<SupplyItemDetailDto> supplyItemDetailList = new ArrayList<>();
+        if (!medDispenseIdList.isEmpty()) {
+            // 药品已发放信息查询
+            List<MedicationDispense> medicationDispenseList = medicationDispenseService
+                .list(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getId, medDispenseIdList));
+            // 根据发药单对应生成退药单
+            for (MedicationDispense medicationDispense : medicationDispenseList) {
+                // 退药的药品请求id
+                for (ReturnMedicineDto returnMedicineDto : returnMedicineList) {
+                    if (returnMedicineDto.getDispenseId().equals(medicationDispense.getId())) {
+                        medicationDispense.setMedReqId(returnMedicineDto.getRequestId());
+                    }
+                }
+                // 药品发放编码
+                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);
+                // 设置库存变更参数
+                supplyItemDetailList.add(new SupplyItemDetailDto()
+                    .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+                    .setItemId(medicationDispense.getMedicationId()).setLotNumber(medicationDispense.getLotNumber()));
+                if (medicationDispense.getTraceNo() != null) {
+                    // 使用逗号分割追溯码并转换为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, null, null);
+            // 汇总退药更新
+            if (summaryFlag) {
+                List<Long> requestId = supplyRequestService.getSupplyByBusNo(dispenseMedicineList.get(0).getBusNo())
+                    .stream().map(SupplyRequest::getId).collect(Collectors.toList());
+                List<SupplyDelivery> supplyDeliveryList = supplyDeliveryService.selectByRequestIdList(requestId);
+                for (SupplyDelivery supplyDelivery : supplyDeliveryList) {
+                    // 药品发放状态
+                    supplyDelivery.setStatusEnum(DispenseStatus.REFUNDED.getValue());
+                    // 发药时间
+                    supplyDelivery.setOccurrenceTime(DateUtils.getNowDate());
+                    // 发药人
+                    supplyDelivery.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
+                }
+                supplyDeliveryService.updateBatchById(supplyDeliveryList);
+                List<SupplyRequest> supplyRequestList = supplyRequestService.selectByIdList(requestId);
+                for (SupplyRequest supplyRequest : supplyRequestList) {
+                    supplyRequest.setStatusEnum(DispenseStatus.REFUNDED.getValue());
+                }
+                supplyRequestService.updateBatchById(supplyRequestList);
+            }
+        }
+
+        List<InventoryItem> inventoryItemList = new ArrayList<>();
+        // 获取库存信息
+        List<UnDispenseInventoryDto> inventoryList =
+            returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+
+        if (inventoryList != null && !inventoryList.isEmpty()) {
+            // 设置库存数量
+            for (UnDispenseInventoryDto 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);
+            // 追溯码管理表数据追加
+            traceNoManageService.saveBatch(traceNoManageList);
+        }
+
+        // 返回信息
+        String returnMsg = null;
+        List<String> uploadFailedNoList;
+        // 调用医保商品销售退货接口
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH); // 医保开关
+        if (Whether.YES.getCode().equals(ybSwitch)) {
+            List<MedicationDefinition> medicationDefinitions = new ArrayList<>();
+            if (!medicationRefundList.isEmpty()) {
+                // 设置进销存参数
+                medicationDefinitions = medicationDefinitionService.listByIds(supplyItemDetailList.stream()
+                    .filter(x -> x.getItemTable().equals(CommonConstants.TableName.MED_MEDICATION_DEFINITION))
+                    .map(SupplyItemDetailDto::getItemId).collect(Collectors.toList()));
+            }
+
+            // 创建映射表，添加空集合保护
+            Map<Long, MedicationDefinition> medicationMap =
+                medicationDefinitions != null ? medicationDefinitions.stream().filter(Objects::nonNull)
+                    .collect(Collectors.toMap(MedicationDefinition::getId, Function.identity())) : new HashMap<>();
+
+            // 设置库存变更参数，添加完整判空
+            for (SupplyItemDetailDto dto : supplyItemDetailList) {
+                if (dto == null)
+                    continue;
+                if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(dto.getItemTable())) {
+                    if (dto.getItemId() != null) {
+                        MedicationDefinition med = medicationMap.get(dto.getItemId());
+                        if (med != null) {
+                            dto.setItemBusNo(med.getBusNo()).setPartPercent(med.getPartPercent())
+                                .setRxFlag(med.getRxFlag()).setYbNo(med.getYbNo());
+                        }
+                    }
+                }
+            }
+            uploadFailedNoList = returnMedicineAppService.ybReturnIntegrated(medDispenseIdList, null);
+            uploadFailedNoList = receiptApprovalAppService.ybInventoryIntegrated(supplyItemDetailList,
+                YbInvChgType.OTHER_OUT, DateUtils.getNowDate());
+            if (uploadFailedNoList != null) {
+                returnMsg = "3506商品销售退货上传错误，错误项目编码" + uploadFailedNoList;
+            } else {
+                returnMsg = "3506商品销售退货上传成功";
+            }
+        }
+        // 返回退药成功信息
+        return R.ok(returnMsg, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"退药"}));
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
index d5b30dfa..d3663509 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
@@ -177,7 +177,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         // 构建查询条件
         QueryWrapper<EncounterInfoSearchParam> queryWrapper =
             HisQueryUtils.buildQueryWrapper(encounterInfoSearchParam, searchKey,
-                new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.idCard,
+                new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.IdCard,
                     CommonConstants.FieldName.PatientPyStr, CommonConstants.FieldName.PatientWbStr)),
                 request);
         // 查询就诊病人列表
@@ -249,40 +249,43 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         List<Long> medDispenseIdList =
             dispenseMedicineList.stream().map(DispenseItemDto::getDispenseId).collect(Collectors.toList());
         // 获取库存信息
-        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
-            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+        List<UnDispenseInventoryDto> inventoryList =
+            returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
         // 按每个药品分组
-        Map<Long, List<InventoryDto>> groupedByItemId =
-            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
         // 遍历每个分组校验库存状态
-        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
-            List<InventoryDto> groupItems = entry.getValue();
-            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+        for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<UnDispenseInventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(UnDispenseInventoryDto::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())) {
+            for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
                     // 库存数量判定
-                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                    if (unDispenseInventoryDto.getDispenseUnit()
+                        .equals(unDispenseInventoryDto.getInventoryUnitCode())) {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                            .subtract(unDispenseInventoryDto.getQuantity());
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         }
                     } else {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
-                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(
+                            unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         }
                     }
                 }
@@ -332,46 +335,50 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         // 获取发药单id列表
         List<Long> medDispenseIdList =
             dispenseMedicineList.stream().map(DispenseItemDto::getDispenseId).collect(Collectors.toList());
-        // 获取库存信息
-        List<InventoryDto> inventoryList = returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
-            CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
+
+        // 获取药品发放库存信息
+        List<UnDispenseInventoryDto> inventoryList =
+            returnMedicineMapper.selectInventoryInfoList(null, medDispenseIdList,
+                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION);
         // 按每个药品分组
-        Map<Long, List<InventoryDto>> groupedByItemId =
-            inventoryList.stream().collect(Collectors.groupingBy(InventoryDto::getItemId));
+        Map<Long, List<UnDispenseInventoryDto>> groupedByItemId =
+            inventoryList.stream().collect(Collectors.groupingBy(UnDispenseInventoryDto::getItemId));
         // 遍历每个分组校验库存状态
-        for (Map.Entry<Long, List<InventoryDto>> entry : groupedByItemId.entrySet()) {
-            List<InventoryDto> groupItems = entry.getValue();
-            if (groupItems.stream().map(InventoryDto::getInventoryStatusEnum)
+        for (Map.Entry<Long, List<UnDispenseInventoryDto>> entry : groupedByItemId.entrySet()) {
+            List<UnDispenseInventoryDto> groupItems = entry.getValue();
+            if (groupItems.stream().map(UnDispenseInventoryDto::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())) {
+            for (UnDispenseInventoryDto unDispenseInventoryDto : inventoryList) {
+                if (PublicationStatus.ACTIVE.getValue().equals(unDispenseInventoryDto.getInventoryStatusEnum())) {
                     InventoryItem inventoryItem = new InventoryItem();
                     // 库存数量判定
-                    if (inventoryDto.getDispenseUnit().equals(inventoryDto.getInventoryUnitCode())) {
+                    if (unDispenseInventoryDto.getDispenseUnit()
+                        .equals(unDispenseInventoryDto.getInventoryUnitCode())) {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-请求数量
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity().subtract(inventoryDto.getQuantity());
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity()
+                            .subtract(unDispenseInventoryDto.getQuantity());
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     } else {
                         // 当前库存数量(拆零单位)=当前库存数量(拆零单位)-拆零数量（拆零比×请求数量）
-                        BigDecimal quantity = inventoryDto.getInventoryQuantity()
-                            .subtract(inventoryDto.getPartPercent().multiply(inventoryDto.getQuantity()));
+                        BigDecimal quantity = unDispenseInventoryDto.getInventoryQuantity().subtract(
+                            unDispenseInventoryDto.getPartPercent().multiply(unDispenseInventoryDto.getQuantity()));
                         // 库存数量判定
                         if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                             // 库存数量不足
-                            return R.fail(inventoryDto.getItemName() + "当前库存数量不足");
+                            return R.fail(unDispenseInventoryDto.getItemName() + "当前库存数量不足");
                         } else {
-                            inventoryItem.setId(inventoryDto.getInventoryId()).setQuantity(quantity);
+                            inventoryItem.setId(unDispenseInventoryDto.getInventoryId()).setQuantity(quantity);
                         }
                     }
                     inventoryItemList.add(inventoryItem);
diff --git a/openhis-server-new/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
index 4d3aed2d..7bdebcef 100644
--- a/openhis-server-new/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
@@ -1,7 +1,9 @@
 package com.openhis.web.pharmacymanage.controller;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+import com.openhis.web.pharmacymanage.appservice.impl.MedicationDetailsAppServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -115,4 +117,14 @@ public class MedicationDetailsController {
 //        return medicationDetailsAppService.getMedRunningAccountPage(medDetailsSearchParam, pageNo, pageSize, searchKey,
 //            request);
 //    }
+    @GetMapping(value = "/excel-out")
+    public void exportExcel(MedDetailsSearchParam medDetailsSearchParam,
+                            @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                            @RequestParam(name = "searchKey", required = false) String searchKey,
+                            HttpServletRequest request, HttpServletResponse response) {
+        medicationDetailsAppService.makeExcelFile(medDetailsSearchParam, pageNo, pageSize, searchKey, response, request);
+
+    }
+
 }
diff --git a/openhis-server-new/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
index 93058a21..e9722233 100644
--- a/openhis-server-new/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
@@ -2,6 +2,7 @@ package com.openhis.web.pharmacymanage.controller;
 
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class ReturnMedicineController {
 
-    @Autowired
+    @Resource
     public IReturnMedicineAppService returnMedicineAppService;
 
     /**
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
index 4be5f20f..7c1bd1d4 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/SummaryDispenseMedicineController.java
@@ -4,16 +4,20 @@ import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
+
+import com.openhis.web.inhospitalnursestation.dto.AdmissionPageParam;
+import com.openhis.web.pharmacymanage.dto.*;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;
 import com.openhis.web.pharmacymanage.appservice.ISummaryDispenseMedicineAppService;
-import com.openhis.web.pharmacymanage.dto.MedicineSummarySearchParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+
 /**
  * 住院汇总发药
  *
@@ -40,7 +44,63 @@ public class SummaryDispenseMedicineController {
     }
 
     /**
-     * 住院药品汇总发药单查询
+     * 分页查询住院病人列表
+     *
+     * @param admissionPageParam 查询条件
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 病人列表
+     */
+    @GetMapping("/encounter-list")
+    public R<?> getEncounterInfoList(AdmissionPageParam admissionPageParam, String startTime, String endTime,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return medicineSummaryDispenseService.getEncounterInfoListPage(admissionPageParam, startTime, endTime, pageNo,
+            pageSize, searchKey, request);
+    }
+
+    /**
+     * 住院汇总药品
+     *
+     * @param searchParam 查询信息
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @return 药品汇总
+     */
+    @GetMapping("/medication_summary-list")
+    public R<?> getSummaryMedicationInfo(MedicineSummarySearchParam searchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        return medicineSummaryDispenseService.getSummaryMedicationInfo(searchParam, pageNo, pageSize);
+    }
+
+    /**
+     * 住院汇总发药单
+     *
+     * @param searchParam 查询条件
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 汇总单汇总
+     */
+    @GetMapping("/from_summary-list")
+    public R<?> getSummaryFromInfo(FromSummarySearchParam searchParam, String startTime, String endTime,
+        String searchKey, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+        return medicineSummaryDispenseService.getSummaryFromInfo(searchParam, startTime, endTime, searchKey, pageNo,
+            pageSize, request);
+    }
+
+    /**
+     * 住院药品汇总发药单详细
      *
      * @param searchParam 查询条件
      * @param searchKey 模糊查询关键字
@@ -48,35 +108,77 @@ public class SummaryDispenseMedicineController {
      * @param pageSize 查询条数
      * @param request 请求数据
      */
-    @GetMapping("/medication_summary-list")
-    public R<?> getMedicationSummaryInfo(MedicineSummarySearchParam searchParam, String searchKey,
+    @GetMapping("/from-list")
+    public R<?> getFromInfo(FromSearchParam 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);
+        return medicineSummaryDispenseService.getOrderInfo(searchParam, searchKey, pageNo, pageSize, request);
     }
 
     /**
-     * 汇总发药
+     * 药品发药
      *
-     * @param searchParam 条件
+     * @param dispenseMedicineList 发药信息
      * @return 处理结果
      */
     @PutMapping("/summary-dispense-medicine")
-    public R<?> SummaryDispenseMedicine(@RequestBody List<MedicineSummarySearchParam> searchParam) {
-        return medicineSummaryDispenseService.SummaryDispenseMedicine(searchParam);
+    public R<?> SummaryDispenseMedicine(@RequestBody List<DispenseItemDto> dispenseMedicineList) {
+        return medicineSummaryDispenseService.SummaryDispenseMedicine(dispenseMedicineList);
     }
 
     /**
      * 作废
      *
-     * @param deliveryIdList 供应发放id
-     * @param notPerformedReasonEnum 未发原因
+     * @param dispenseMedicineList 作废信息
      * @return 处理结果
      */
     @PutMapping("/dispense-cancel")
-    public R<?> dispenseCancel(@RequestBody List<Long> deliveryIdList, Integer notPerformedReasonEnum) {
-        return medicineSummaryDispenseService.dispenseCancel(deliveryIdList, notPerformedReasonEnum);
+    public R<?> dispenseCancel(@RequestBody List<DispenseItemDto> dispenseMedicineList) {
+        return medicineSummaryDispenseService.dispenseCancel(dispenseMedicineList);
     }
 
+    /**
+     * 退药处理
+     *
+     * @param dispenseMedicineList 退药清单
+     * @return 处理结果
+     */
+    @PutMapping("/medicine-return")
+    public R<?> medicineReturn(@RequestBody List<DispenseItemDto> dispenseMedicineList) {
+        return medicineSummaryDispenseService.medicineReturn(dispenseMedicineList);
+    }
+
+    /**
+     * 住院发药
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     */
+
+    @GetMapping(value = "/excel-out")
+    public void excelOut(MedicineSummarySearchParam searchParam,
+                              @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                              @RequestParam(value = "pageSize", defaultValue = "10000") Integer pageSize,
+                              @RequestParam(name = "searchKey", required = false) String searchKey,
+                              HttpServletRequest request,HttpServletResponse response) {
+        medicineSummaryDispenseService.makeExcelFile(searchParam, pageNo, pageSize, searchKey, request, response);
+
+    }
+    /**
+     * 住院药品汇总
+     *
+     * @param searchParam 查询条件
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     */
+
+
+
+
+
 }
diff --git a/openhis-server-new/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
index 4c3fe659..30bd1e25 100644
--- a/openhis-server-new/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
@@ -2,6 +2,7 @@ package com.openhis.web.pharmacymanage.controller;
 
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class WesternMedicineDispenseController {
 
-    @Autowired
+    @Resource
     public IWesternMedicineDispenseAppService westernMedicineDispenseService;
 
     /**
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
index 88064bac..5756b410 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
@@ -27,6 +27,9 @@ public class DispenseItemDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long dispenseId;
 
+    /** 单据号 */
+    private String busNo;
+
     /** 追溯码 */
     private String traceNo;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java
new file mode 100644
index 00000000..a2e8a172
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java
@@ -0,0 +1,12 @@
+package com.openhis.web.pharmacymanage.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FromSearchParam implements Serializable {
+
+    /** 单据号 */
+    private String busNo;
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java
new file mode 100644
index 00000000..585934ce
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java
@@ -0,0 +1,36 @@
+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 java.util.Date;
+
+/**
+ * 汇总发药单信息
+ *
+ */
+@Data
+public class FromSummaryDto {
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 申请时间 */
+    private Date applyTime;
+
+    /** 领药人 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long applicantId;
+    private String applicantName;
+
+    /** 发放地点 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sourceLocationId;
+    private String sourceLocationName;
+
+    /** 状态 */
+    private Integer statusEnum;
+    private String statusEnum_enumText;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java
new file mode 100644
index 00000000..a520089a
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java
@@ -0,0 +1,16 @@
+package com.openhis.web.pharmacymanage.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class FromSummarySearchParam implements Serializable {
+
+    /** 单据号 */
+    private String busNo;
+
+    /** 发药状态 */
+    private Integer statusEnum;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
index 6f7f8a4a..82aaa00d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
@@ -6,6 +6,7 @@ package com.openhis.web.pharmacymanage.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.core.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -57,26 +58,37 @@ public class ItemDispenseOrderDto {
     /**
      * 发放药房
      */
+    @Excel(name = "发放药房",sort = 3)
     private String locationName;
 
     /**
      * 批次号
      */
+    @Excel(name = "批次号",sort = 4)
     private String lotNumber;
 
     /**
      * 科室
      */
+    @Excel(name = "科室",sort = 5)
     private String departmentName;
 
+    /**
+     * 开单医生ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long doctorId;
+
     /**
      * 开单医生
      */
+    @Excel(name = "开单医生",sort = 6)
     private String doctorName;
 
     /**
      * 发药医生
      */
+     @Excel(name = "发药医生",sort = 7)
     private String dispenseDoctorName;
 
     /**
@@ -84,37 +96,46 @@ public class ItemDispenseOrderDto {
      */
     @Dict(dictCode = "med_category_code")
     private String itemType;
+    @Excel(name = "项目类型",sort = 8)
     private String itemType_dictText;
 
+
+
     /**
      * 发药状态
      */
     private Integer statusEnum;
+    @Excel(name = "发药状态",sort = 9)
     private String statusEnum_enumText;
 
     /**
      * 诊断名称
      */
+    @Excel(name = "诊断名称",sort = 10)
     private String conditionName;
 
     /**
      * 处方号
      */
+    @Excel(name = "处方号",sort = 11)
     private String prescriptionNo;
 
     /**
      * 项目名称
      */
+    @Excel(name = "项目名称",sort = 1,width = 30)
     private String itemName;
 
     /**
      * 规格
      */
+    @Excel(name = "规格",sort = 2,width = 30)
     private String totalVolume;
 
     /**
      * 单次剂量
      */
+    @Excel(name = "单次剂量",sort = 12)
     private BigDecimal dose;
 
     /**
@@ -122,6 +143,7 @@ public class ItemDispenseOrderDto {
      */
     @Dict(dictCode = "rate_code")
     private String rateCode;
+    @Excel(name = "用药频次",sort = 13)
     private String rateCode_dictText;
 
     /**
@@ -129,45 +151,58 @@ public class ItemDispenseOrderDto {
      */
     @Dict(dictCode = "method_code")
     private String methodCode;
+    @Excel(name = "用法",sort = 14)
     private String methodCode_dictText;
 
+
+
     /**
      * 剂量单位
      */
     @Dict(dictCode = "unit_code")
     private String doseUnitCode;
+    @Excel(name = "剂量单位",sort = 15)
     private String doseUnitCode_dictText;
 
+
+
     /**
      * 单位
      */
     @Dict(dictCode = "unit_code")
     private String unitCode;
+    @Excel(name = "单位",sort = 16)
     private String unitCode_dictText;
 
+
     /**
      * 单次发药数
      */
+    @Excel(name = "单次发药数",sort = 17)
     private Integer dispensePerQuantity;
 
     /**
      * 每次发药供应天数
      */
+    @Excel(name = "每次发药供应天数",sort = 18)
     private Integer dispensePerDuration;
 
     /**
      * 数量
      */
+    @Excel(name = "数量",sort = 19)
     private Integer quantity;
 
     /**
      * 单价
      */
+    @Excel(name = "单价",sort = 20)
     private BigDecimal unitPrice;
 
     /**
      * 金额
      */
+    @Excel(name = "金额",sort = 21)
     private BigDecimal totalPrice;
     /**
      * 组合号
@@ -179,28 +214,35 @@ public class ItemDispenseOrderDto {
      * 就诊NO
      */
     @JsonSerialize(using = ToStringSerializer.class)
+    @Excel(name = "就诊NO",sort = 24)
     private String encounterBusNo;
 
     /** 开具日期 */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+     @Excel(name = "开具日期",sort = 25, dateFormat = "yyyy-MM-dd HH:mm:ss",width = 25)
     private Date reqAuthoredTime;
 
     /** 皮试标志 */
+    @Excel(name = "皮试标志",sort = 26)
     private Integer skinTestFlag;
 
     /** 中药标识 */
+    @Excel(name = "中药标识",sort = 27)
     private Integer tcmFlag;
 
     /** 所在表 */
+    @Excel(name = "所在表",sort = 28,width = 30)
     private String itemTable;
 
     /**
      * 生产厂家
      */
+    @Excel(name = "生产厂家",sort = 22,width = 35)
     private String manufacturerText;
 
     /**
      * 追溯码
      */
+    @Excel(name = "追溯码",sort = 23)
     private String traceNo;
 }
diff --git a/openhis-server-new/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
index 67922669..389588a0 100644
--- a/openhis-server-new/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
@@ -1,5 +1,9 @@
 package com.openhis.web.pharmacymanage.dto;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.common.annotation.Excel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -7,9 +11,6 @@ import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 发药明细账分页列表 dto
  *
@@ -19,7 +20,6 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class MedDetailedAccountPageDto {
-
     /** 门诊号 */
     private String outpatientNo;
 
@@ -29,29 +29,54 @@ public class MedDetailedAccountPageDto {
     /** 患者 */
     private String patientName;
 
+    /** 项目类别 */
+    private String pinYin;
+
+    /** 接收发药数量 */
+    @Excel(name = "发药数量")
+    private String dispenseQuantitystr;
+
+    /** 接收发药金额 */
+    @Excel(name = "发药金额")
+    private String dispensePricestr;
+
+    /** 接收退药数量 */
+    @Excel(name = "退药数量")
+    private String refundQuantitystr;
+
+    /** 接收退药金额 */
+    @Excel(name = "退药金额")
+    private String refundPricestr;
+
     /** 发药人 */
     @JsonSerialize(using = ToStringSerializer.class)
     private String practitionerId;
 
     /** 发药人名称 */
+    @Excel(name = "发药人")
     private String practitionerName;
 
     /** 药品项目 */
+    @Excel(name = "药品项目")
     private String medicationName;
 
     /** 药品拼音 */
     private String pyStr;
 
     /** 项目编码 */
+    @Excel(name = "药品编码")
     private String busNo;
 
     /** 发药编码 */
+    @Excel(name = "发药单号")
     private String dispenseNo;
 
     /** 医保编码 */
+    @Excel(name = "医保编码")
     private String ybNo;
 
     /** 规格 */
+    @Excel(name = "规格")
     private String totalVolume;
 
     /** 发药数量 */
@@ -67,12 +92,15 @@ public class MedDetailedAccountPageDto {
     private BigDecimal refundPrice;
 
     /** 批号 */
+    @Excel(name = "生产批号")
     private String lotNumber;
 
     /** 厂商 */
+    @Excel(name = "厂家/产地")
     private String manufacturerText;
 
     /** 供应商 */
+    @Excel(name = "供应商")
     private String supplierName;
 
     /** 发药单位 */
@@ -86,6 +114,10 @@ public class MedDetailedAccountPageDto {
     private String refundUnitCode_dictText;
 
     /** 发药时间 */
+    @Excel(name = "发药时间", dateFormat="yyyy-MM-dd HH:mm:ss")
     private Date dispenseTime;
 
+    /** 项目所在表 */
+//    @Excel(name = "项目类别")
+    private String itemTable;
 }
diff --git a/openhis-server-new/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
index f85cb1da..e0ed7424 100644
--- a/openhis-server-new/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
@@ -23,7 +23,6 @@ public class MedDetailsSearchParam {
     private Long locationId;
 
     /** 患者姓名 */
-    @Length(max = 2000)
     private String patientName;
 
     /** 发药人 */
@@ -40,4 +39,7 @@ public class MedDetailsSearchParam {
 
     /** 门诊住院flg */
     private Integer flag;
+
+    /** 项目所在表 */
+    private String itemTable;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
index 9ade4172..3e92522e 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
@@ -4,6 +4,7 @@
 package com.openhis.web.pharmacymanage.dto;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -97,7 +98,7 @@ public class MedicineSummaryDto {
     private String applicantName;
 
     /** 申请时间 */
-    private Data applyTime;
+    private Date applyTime;
 
     /**
      * 状态
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
index 6d5e13ad..900b118d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
@@ -21,6 +21,10 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class MedicineSummarySearchParam implements Serializable {
 
+    /** 就诊ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
     /** 科室 */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
diff --git a/openhis-server-new/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/UnDispenseInventoryDto.java
similarity index 84%
rename from openhis-server-new/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/UnDispenseInventoryDto.java
index 270574ff..5a9f7c17 100644
--- a/openhis-server-new/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/UnDispenseInventoryDto.java
@@ -11,14 +11,14 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 库存信息
+ * 待发放库存信息
  *
  * @author yangmo
  * @date 2025-04-08
  */
 @Data
 @Accessors(chain = true)
-public class InventoryDto implements Serializable {
+public class UnDispenseInventoryDto implements Serializable {
 
     /** 库存ID */
     private Long inventoryId;
@@ -29,6 +29,12 @@ public class InventoryDto implements Serializable {
     /** 项目ID */
     private Long itemId;
 
+    /** 批号 */
+    private String lotNumber;
+
+    /** 发放药房id */
+    private Long locationId;
+
     /** 拆零单位 */
     private String inventoryUnitCode;
 
diff --git a/openhis-server-new/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
index 17dc3dd1..6d237488 100644
--- a/openhis-server-new/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
@@ -24,12 +24,16 @@ public interface MedicationDetailsMapper {
      * @param completed 发药状态：已发药
      * @param refunded 发药状态：已退药
      * @param dispenseEnum 统计类型
+     * @param medMedicationDefinition 药品
+     * @param admDeviceDefinition 耗材
      * @return 门诊人员发药明细表
      */
     Page<MedDetailedAccountPageDto> selectAmbPractitionerDetailPage(@Param("page") Page<MedDetailedAccountPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<MedDetailsSearchParam> queryWrapper, @Param("amb") Integer amb,
         @Param("completed") Integer completed, @Param("agree") Integer agree, @Param("refunded") Integer refunded,
-        @Param("dispenseEnum") Integer dispenseEnum, @Param("flg") Integer flg);
+        @Param("dispenseEnum") Integer dispenseEnum, @Param("flg") Integer flg,
+        @Param("medMedicationDefinition") String medMedicationDefinition,
+        @Param("admDeviceDefinition") String admDeviceDefinition);
 
     // /**
     // * 门诊发药明细流水账
diff --git a/openhis-server-new/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
index d37da68a..5a892280 100644
--- a/openhis-server-new/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
@@ -11,7 +11,10 @@ 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.*;
+import com.openhis.web.pharmacymanage.dto.DispenseInventoryDto;
+import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
+import com.openhis.web.pharmacymanage.dto.ReturnMedicineInfoDto;
+import com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto;
 
 @Repository
 public interface ReturnMedicineMapper {
@@ -25,7 +28,7 @@ public interface ReturnMedicineMapper {
      * @return 退药患者分页列表
      */
     Page<EncounterInfoDto> selectEncounterInfoListPage(@Param("page") Page<EncounterInfoDto> page,
-                                                       @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoDto> queryWrapper, @Param("amb") Integer amb);
+        @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoDto> queryWrapper, @Param("amb") Integer amb);
 
     /**
      * 申请退药清单查询
@@ -55,7 +58,7 @@ public interface ReturnMedicineMapper {
      * @param admDeviceDefinition 耗材定义表
      * @return 待发药信息
      */
-    List<InventoryDto> selectInventoryInfoList(@Param("devDispenseIdList") List<Long> devDispenseIdList,
+    List<UnDispenseInventoryDto> selectInventoryInfoList(@Param("devDispenseIdList") List<Long> devDispenseIdList,
         @Param("medDispenseIdList") List<Long> medDispenseIdList,
         @Param("medMedicationDefinition") String medMedicationDefinition,
         @Param("admDeviceDefinition") String admDeviceDefinition);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
index 838b4cbc..e3c7037d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.pharmacymanage.mapper;
 
+import com.openhis.web.pharmacymanage.dto.FromSearchParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -20,12 +21,18 @@ public interface SummaryDispenseMedicineMapper {
      *
      * @param page 分页
      * @param queryWrapper 查询条件
-     * @param medicationDefinition 药品定义
-     * @param deviceDefinition 耗材定义
      * @return 汇总药品信息
      */
     Page<MedicineSummaryDto> selectMedicationSummaryInfo(@Param("page") Page<MedicineSummaryDto> page,
-        @Param(Constants.WRAPPER) QueryWrapper<MedicineSummarySearchParam> queryWrapper,
-        @Param("medicationDefinition") String medicationDefinition, @Param("deviceDefinition") String deviceDefinition,
-        @Param("typeEnum") Integer typeEnum, @Param("categoryEnum") Integer categoryEnum);
+        @Param(Constants.WRAPPER) QueryWrapper<MedicineSummarySearchParam> queryWrapper);
+
+    /**
+     * 汇总药品信息列表查询
+     *
+     * @param page 分页
+     * @param queryWrapper 查询条件
+     * @return 汇总药品信息
+     */
+    Page<MedicineSummaryDto> selectOrderInfo(@Param("page") Page<MedicineSummaryDto> page,
+        @Param(Constants.WRAPPER) QueryWrapper<FromSearchParam> queryWrapper);
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/INurseManageService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/INurseManageService.java
new file mode 100644
index 00000000..1a674ab4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/INurseManageService.java
@@ -0,0 +1,30 @@
+package com.openhis.web.regdoctorstation.appservice;
+
+import com.core.common.core.domain.R;
+
+/**
+ * Desc: 护士站 业务层
+ * @Author raymond
+ * @Date 15:25 2025/10/27
+ * @return
+ **/
+public interface INurseManageService {
+    /**
+     * Desc: 划价确费业务
+     * @param
+     * @Author raymond
+     * @Date 15:31 2025/10/27
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> pricingBusiness(String searchKeyWord);
+
+    /**
+     * Desc: 医嘱计费业务
+     * @param
+     * @Author raymond
+     * @Date 15:31 2025/10/27
+     * @return com.core.common.core.domain.R<?>
+     **/
+    R<?> medicalDeviceBusiness();
+
+}
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
index d27f6afe..37f6fe93 100644
--- 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
@@ -1,10 +1,7 @@
 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;
-import com.openhis.web.regdoctorstation.dto.TransferOrganizationParam;
+import com.openhis.web.regdoctorstation.dto.*;
 
 /**
  * 特殊医嘱 应用Service
@@ -42,4 +39,12 @@ public interface ISpecialAdviceAppService {
      */
     R<?> saveTransferOrganizationOrders(TransferOrganizationParam transferOrganizationParam);
 
+    /**
+     * 保存离院医嘱
+     *
+     * @param leaveHospitalParam 转科离院参数
+     * @return 结果
+     */
+    R<?> saveLeaveHospitalOrders(LeaveHospitalParam leaveHospitalParam);
+
 }
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
index 8bc51a18..d69d772f 100644
--- 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
@@ -1,14 +1,5 @@
 package com.openhis.web.regdoctorstation.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.conditions.update.LambdaUpdateWrapper;
@@ -41,8 +32,14 @@ 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;
+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;
 
 /**
  * 医嘱管理 应用实现类
@@ -82,25 +79,25 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
      * 查询住院患者信息
      *
      * @param regPatientMainInfoDto 住院患者信息 dto
-     * @param searchKey 模糊查询关键字
-     * @param pageNo 当前页
-     * @param pageSize 每页多少条
-     * @param request 请求
+     * @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) {
+                                                              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);
+                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(),
-            EncounterActivityStatus.ACTIVE.getValue(), EncounterClass.IMP.getValue(), status, Whether.YES.getValue(),
-            AccountType.PERSONAL_CASH_ACCOUNT.getCode(), queryWrapper);
+                new Page<>(pageNo, pageSize), SecurityUtils.getLoginUser().getPractitionerId(),
+                LocationForm.WARD.getValue(), LocationForm.HOUSE.getValue(), LocationForm.BED.getValue(),
+                EncounterActivityStatus.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()));
@@ -114,7 +111,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
      * 住院保存医嘱
      *
      * @param regAdviceSaveParam 住院医嘱表单信息
-     * @param adviceOpType 医嘱操作类型
+     * @param adviceOpType       医嘱操作类型
      * @return 结果
      */
     @Override
@@ -138,21 +135,21 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         List<RegAdviceSaveDto> regAdviceSaveList = regAdviceSaveParam.getRegAdviceSaveList();
         // 药品
         List<RegAdviceSaveDto> medicineList = regAdviceSaveList.stream()
-            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .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());
+                .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());
+                    .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);
@@ -177,24 +174,24 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         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());
+                    .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));
+                    .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[] {"住院医嘱"}));
+        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) {
+                                String adviceOpType, Long organizationId, String signCode) {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 保存操作
@@ -204,34 +201,19 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
 
         // 删除
         List<RegAdviceSaveDto> deleteList = medicineList.stream()
-            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+                .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());
+                    regAdviceSaveDto.getRequestId());
         }
-
-        // 当前时间毫秒值
-        Long currentTimeMillis = System.currentTimeMillis();
         // 签发时统一处理组号 (排除删除操作,包括长期和临时)
         List<RegAdviceSaveDto> exceptDelList = medicineList.stream()
-            .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+                .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);
         }
@@ -240,15 +222,15 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         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());
+                        .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()); // 请求状态
+                    .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
             longMedicationRequest.setPrescriptionNo(regAdviceSaveDto.getPrescriptionNo()); // 处方号
             longMedicationRequest.setGroupId(regAdviceSaveDto.getGroupId()); // 组号
             if (is_sign) {
@@ -259,7 +241,8 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
             if (is_save) {
                 longMedicationRequest.setEffectiveDoseStart(startTime); // 医嘱开始时间
                 longMedicationRequest
-                    .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                        .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                longMedicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 longMedicationRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
                 longMedicationRequest.setExecuteNum(regAdviceSaveDto.getExecuteNum()); // 执行次数
                 longMedicationRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
@@ -296,14 +279,14 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         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());
+                        .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()); // 请求状态
+                    .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue()); // 请求状态
             tempMedicationRequest.setPrescriptionNo(regAdviceSaveDto.getPrescriptionNo()); // 处方号
             tempMedicationRequest.setGroupId(regAdviceSaveDto.getGroupId()); // 组号
             if (is_sign) {
@@ -314,7 +297,8 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
             if (is_save) {
                 tempMedicationRequest.setEffectiveDoseStart(startTime); // 医嘱开始时间
                 tempMedicationRequest
-                    .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                        .setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
+                tempMedicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 tempMedicationRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
                 tempMedicationRequest.setExecuteNum(regAdviceSaveDto.getExecuteNum()); // 执行次数
                 tempMedicationRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
@@ -342,26 +326,17 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 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());
+                Long dispenseId = 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.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPrescriptionNo(regAdviceSaveDto.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(regAdviceSaveDto.getAdviceType()); // 类型
@@ -378,6 +353,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 chargeItem.setAccountId(regAdviceSaveDto.getAccountId());// 关联账户ID
                 chargeItem.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
                 chargeItem.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+                // chargeItem.setDispenseId(dispenseId); // 发放ID
 
                 chargeItem.setQuantityValue(regAdviceSaveDto.getQuantity()); // 数量
                 chargeItem.setQuantityUnit(regAdviceSaveDto.getUnitCode()); // 单位
@@ -393,7 +369,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
      * 处理诊疗
      */
     private void handService(List<RegAdviceSaveDto> activityList, Date startTime, Date authoredTime, Date curDate,
-        String adviceOpType, Long organizationId, String signCode) {
+                             String adviceOpType, Long organizationId, String signCode) {
         // 当前登录账号的科室id
         Long orgId = SecurityUtils.getLoginUser().getOrgId();
         // 保存操作
@@ -403,26 +379,26 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
 
         // 删除
         List<AdviceSaveDto> deleteList = activityList.stream()
-            .filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
+                .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());
+                    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());
+                        .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());// 请求状态
+                    .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态
             if (is_sign) {
                 longServiceRequest.setAuthoredTime(authoredTime); // 医嘱签发时间
                 longServiceRequest.setSignCode(signCode);
@@ -431,6 +407,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
             if (is_save) {
                 longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
                 longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                longServiceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 longServiceRequest.setQuantity(new BigDecimal("1")); // 请求数量 | 诊疗的长期医嘱数量都是1
                 longServiceRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
                 longServiceRequest.setRateCode(regAdviceSaveDto.getRateCode()); // 用药频次
@@ -456,14 +433,14 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         // 新增 + 修改 (临时医嘱)
         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());
+                        .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());// 请求状态
+                    .setStatusEnum(is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue());// 请求状态
             if (is_sign) {
                 tempServiceRequest.setAuthoredTime(authoredTime); // 医嘱签发时间
                 tempServiceRequest.setSignCode(signCode);
@@ -472,6 +449,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
             if (is_save) {
                 tempServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
                 tempServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                tempServiceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 tempServiceRequest.setQuantity(regAdviceSaveDto.getQuantity()); // 请求数量
                 tempServiceRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
                 tempServiceRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
@@ -495,6 +473,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 chargeItem.setId(regAdviceSaveDto.getChargeItemId()); // 费用项id
                 chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(tempServiceRequest.getBusNo()));
+                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(regAdviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
@@ -520,7 +499,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 // 第一次保存时,处理诊疗套餐的子项信息
                 if (regAdviceSaveDto.getRequestId() == null) {
                     ActivityDefinition activityDefinition =
-                        iActivityDefinitionService.getById(regAdviceSaveDto.getAdviceDefinitionId());
+                            iActivityDefinitionService.getById(regAdviceSaveDto.getAdviceDefinitionId());
                     String childrenJson = activityDefinition.getChildrenJson();
                     if (childrenJson != null) {
                         // 诊疗子项参数类
@@ -551,29 +530,30 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         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());
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         // 根据 requestId 过滤重复医嘱信息
         List<RegRequestBaseDto> distinctList = regRequestBaseInfo.stream()
-            .collect(Collectors.toMap(RegRequestBaseDto::getRequestId, dto -> dto, (existing, replacement) -> existing // 如果key冲突，保留已存在的（第一条）
-            )).values().stream().collect(Collectors.toList());
+                .collect(Collectors.toMap(RegRequestBaseDto::getRequestId, dto -> dto, (existing, replacement) -> existing // 如果key冲突，保留已存在的（第一条）
+                )).values().stream().collect(Collectors.toList());
 
         for (RegRequestBaseDto regRequestBaseDto : distinctList) {
             // 请求状态
             regRequestBaseDto.setStatusEnum_enumText(
-                EnumUtils.getInfoByValue(RequestStatus.class, regRequestBaseDto.getStatusEnum()));
+                    EnumUtils.getInfoByValue(RequestStatus.class, regRequestBaseDto.getStatusEnum()));
             // 是否皮试
             regRequestBaseDto
-                .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getSkinTestFlag()));
+                    .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getSkinTestFlag()));
             // 是否为注射药物
             regRequestBaseDto
-                .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getInjectFlag()));
+                    .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getInjectFlag()));
             // 收费状态
             regRequestBaseDto.setChargeStatus_enumText(
-                EnumUtils.getInfoByValue(ChargeItemStatus.class, regRequestBaseDto.getChargeStatus()));
+                    EnumUtils.getInfoByValue(ChargeItemStatus.class, regRequestBaseDto.getChargeStatus()));
             // 治疗类型
             regRequestBaseDto.setTherapyEnum_enumText(
-                EnumUtils.getInfoByValue(TherapyTimeType.class, regRequestBaseDto.getTherapyEnum()));
+                    EnumUtils.getInfoByValue(TherapyTimeType.class, regRequestBaseDto.getTherapyEnum()));
         }
         return R.ok(distinctList);
     }
@@ -582,7 +562,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
      * 查询历史住院医嘱请求数据
      *
      * @param encounterId 就诊id
-     * @param patientId 病人id
+     * @param patientId   病人id
      * @return 历史住院医嘱请求数据
      */
     @Override
@@ -591,24 +571,25 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         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());
+                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
+                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode(),
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         for (RegRequestBaseDto regRequestBaseDto : regRequestBaseInfo) {
             // 请求状态
             regRequestBaseDto.setStatusEnum_enumText(
-                EnumUtils.getInfoByValue(RequestStatus.class, regRequestBaseDto.getStatusEnum()));
+                    EnumUtils.getInfoByValue(RequestStatus.class, regRequestBaseDto.getStatusEnum()));
             // 是否皮试
             regRequestBaseDto
-                .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getSkinTestFlag()));
+                    .setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getSkinTestFlag()));
             // 是否为注射药物
             regRequestBaseDto
-                .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getInjectFlag()));
+                    .setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, regRequestBaseDto.getInjectFlag()));
             // 收费状态
             regRequestBaseDto.setChargeStatus_enumText(
-                EnumUtils.getInfoByValue(ChargeItemStatus.class, regRequestBaseDto.getChargeStatus()));
+                    EnumUtils.getInfoByValue(ChargeItemStatus.class, regRequestBaseDto.getChargeStatus()));
             // 治疗类型
             regRequestBaseDto.setTherapyEnum_enumText(
-                EnumUtils.getInfoByValue(TherapyTimeType.class, regRequestBaseDto.getTherapyEnum()));
+                    EnumUtils.getInfoByValue(TherapyTimeType.class, regRequestBaseDto.getTherapyEnum()));
         }
         return R.ok(regRequestBaseInfo);
     }
@@ -623,27 +604,27 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
     public R<?> signOffRegAdvice(List<AdviceBatchOpParam> paramList) {
         // 药品
         List<AdviceBatchOpParam> medicineList = paramList.stream()
-            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
         List<Long> medicineRequestIds =
-            medicineList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+                medicineList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
         // 诊疗
         List<AdviceBatchOpParam> activityList = paramList.stream()
-            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
         List<Long> activityRequestIds =
-            activityList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+                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));
+                    .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));
+                    .eq(ServiceRequest::getStatusEnum, RequestStatus.COMPLETED.getValue())
+                    .in(ServiceRequest::getId, activityRequestIds));
         }
         if (!medicineCompleteList.isEmpty() || !activityCompleteList.isEmpty()) {
             throw new ServiceException("存在已完成的医嘱，请重新选择");
@@ -666,7 +647,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         if (!chargeItemIdList.isEmpty()) {
             iChargeItemService.updatePaymentStatus(chargeItemIdList, ChargeItemStatus.DRAFT.getValue());
         }
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"医嘱签退"}));
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"医嘱签退"}));
     }
 
     /**
@@ -681,25 +662,25 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         Date date = new Date();
         // 药品
         List<AdviceBatchOpParam> medicineList = paramList.stream()
-            .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
         List<Long> medicineRequestIds =
-            medicineList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+                medicineList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
         // 诊疗
         List<AdviceBatchOpParam> activityList = paramList.stream()
-            .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
+                .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
         List<Long> activityRequestIds =
-            activityList.stream().map(AdviceBatchOpParam::getRequestId).collect(Collectors.toList());
+                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()));
+                    .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()));
+                    .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[] {"医嘱停止"}));
+        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/NurseManageServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
new file mode 100644
index 00000000..4fe1f0a2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/NurseManageServiceImpl.java
@@ -0,0 +1,121 @@
+package com.openhis.web.regdoctorstation.appservice.impl;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.core.common.utils.AgeCalculatorUtil;
+import com.core.common.utils.StringUtils;
+import com.core.common.utils.bean.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.dto.EncounterDataDto;
+import com.openhis.administration.dto.LocationDataDto;
+import com.openhis.administration.dto.PatientBedInfoDto;
+import com.openhis.administration.mapper.EncounterLocationMapper;
+import com.openhis.administration.mapper.LocationMapper;
+import com.openhis.administration.service.IEncounterService;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.administration.service.IPatientService;
+import com.openhis.administration.service.IPractitionerRoleService;
+import com.openhis.common.enums.*;
+import com.openhis.common.utils.EnumUtils;
+import com.openhis.web.regdoctorstation.appservice.INurseManageService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @ClassName NurseManageServiceImpl
+ * @Description 护士站 业务实现类
+ * @Author raymond
+ * @Date 2025/10/27 15:26
+ * @Version 1.0
+ **/
+@Slf4j
+@Service
+public class NurseManageServiceImpl implements INurseManageService {
+
+    @Resource
+    private IPractitionerRoleService practitionerRoleService;
+    @Resource
+    private ILocationService locationService;
+    @Resource
+    private LocationMapper locationMapper;
+    @Resource
+    private EncounterLocationMapper encounterLocationMapper;
+    @Resource
+    private IEncounterService encounterService;
+    @Resource
+    private IPatientService patientService;
+
+    @Override
+    public R<?> pricingBusiness(String searchKeyWord) {
+        // TODO 一、基础数据 1、获取 当前护士负责的 病区 和 病区下的患者数据；2、护士点击 患者姓名时，获取患者基础数据（床号，姓名等）；
+        // 此处应该提供两个接口，策略模式， 如果从 门诊过来，new 门诊的用户来源，如果从 住院来，那么 new 住院的用户来源；
+        // 获取当前人 SecurityUtils.getLoginUser().getPractitionerId();
+        Long practitionerId = 2L;
+        // 获取当前角色的负责的区域id数组
+        List<Long> roleLocationIds = practitionerRoleService.searchPractitionerRoleLocationIds(practitionerId,
+            PractitionerRoles.NURSE.getCode());
+        // 根据 roleLocationIds 获取病区集合
+        List<LocationDataDto> locationAreaDataList = this.locationService.searchLocationDataByIds(roleLocationIds);
+        for (LocationDataDto data : locationAreaDataList) {
+            List<PatientBedInfoDto> locationBedDataList = this.exeEncapsulation(data);
+            if (!StringUtils.isEmpty(searchKeyWord) && !locationBedDataList.isEmpty()) {
+                List<PatientBedInfoDto> searchResultDataList = new LinkedList<>();
+                for (PatientBedInfoDto bedInfoDto : locationBedDataList) {
+                    // 根据 换着姓名和 患者床位号查询
+                    if (bedInfoDto.getBedName().equals(searchKeyWord)
+                        || bedInfoDto.getPatientName().matches(searchKeyWord)) {
+                        PatientBedInfoDto searchResultData = new PatientBedInfoDto();
+                        BeanUtils.copyProperties(bedInfoDto, searchResultData);
+                        searchResultDataList.add(searchResultData);
+                    }
+                }
+                data.setPatientBedInfoDtoList(searchResultDataList);
+            } else {
+                data.setPatientBedInfoDtoList(locationBedDataList);
+            }
+        }
+
+        return R.ok(locationAreaDataList);
+    }
+
+    public List<PatientBedInfoDto> exeEncapsulation(LocationDataDto data) {
+        // 根据病区 找到 有效床位的信息
+        List<PatientBedInfoDto> locationBedDataList = this.locationMapper.searchLocationDataByBusNo(data.getBusNo(),
+            LocationForm.BED.getValue(), LocationStatus.OCCUPY.getValue());
+        List<PatientBedInfoDto> finalDataList = new LinkedList<>();
+        if (!locationBedDataList.isEmpty()) {
+            int size = locationBedDataList.size();
+            for (int i = 0; i < size; i++) {
+                PatientBedInfoDto bedInfoDto = locationBedDataList.get(i);
+                PatientBedInfoDto patientBedInfoDto =
+                    this.encounterLocationMapper.searchEncounterDataByLocationId(bedInfoDto.getBedLocationId(),
+                        EncounterActivityStatus.ACTIVE.getValue(), LocationForm.BED.getValue());
+                EncounterDataDto encounterDataDto = this.encounterService
+                    .getPatientIdByParam(EncounterClass.IMP.getValue(), patientBedInfoDto.getEncounterId());
+                Patient patient = this.patientService.getById(encounterDataDto.getPatientId());
+                bedInfoDto.setPatientName(patient.getName());
+                bedInfoDto.setPatientNumber(patient.getIdCard());
+                bedInfoDto.setPatientAgeText(
+                        patient.getBirthDate() != null ? AgeCalculatorUtil.getAge(patient.getBirthDate()) : null);
+                bedInfoDto.setPatientGenderText(
+                    EnumUtils.getInfoByValue(AdministrativeGender.class, patient.getGenderEnum()));
+                finalDataList.add(bedInfoDto);
+            }
+        }
+        return finalDataList;
+    }
+
+    @Override
+    public R<?> medicalDeviceBusiness() {
+        // 获取当前人
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        return null;
+    }
+}
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
index 12ff22ca..e3273e3d 100644
--- 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
@@ -10,6 +10,7 @@ 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.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
@@ -17,19 +18,13 @@ 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.common.enums.*;
 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.dto.*;
 import com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper;
 import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.domain.ServiceRequest;
@@ -138,10 +133,18 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         ChargeItem chargeItem;
         // 诊疗集合
         List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
+        // 诊疗执行科室配置
+        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
+            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
+        if (activityOrganizationConfig.isEmpty()) {
+            throw new ServiceException("请先配置当前时间段的执行科室");
+        }
+
         for (ActivitySaveDto activitySaveDto : activityList) {
             serviceRequest = new ServiceRequest();
             serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());
             serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+            serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             serviceRequest.setPrescriptionNo(prescriptionNo);
             serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
             serviceRequest.setQuantity(activitySaveDto.getQuantity()); // 请求数量
@@ -152,7 +155,15 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
             serviceRequest.setRequesterId(practitionerId); // 开方医生
             serviceRequest.setEncounterId(encounterId); // 就诊id
             serviceRequest.setAuthoredTime(curDate); // 请求签发时间
-            serviceRequest.setOrgId(activitySaveDto.getPositionId()); // 执行科室
+
+            Long positionId = activityOrganizationConfig.stream()
+                .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
+            if (positionId == null) {
+                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
+            }
+            serviceRequest.setOrgId(positionId); // 执行科室
+
             serviceRequest.setYbClassEnum(activitySaveDto.getYbClassEnum());// 类别医保编码
             serviceRequest.setConditionId(activitySaveDto.getConditionId()); // 诊断id
             serviceRequest.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
@@ -161,6 +172,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
             chargeItem = new ChargeItem();
             chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
             chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+            chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             chargeItem.setPatientId(patientId); // 患者
             chargeItem.setContextEnum(activitySaveDto.getAdviceType()); // 类型
             chargeItem.setEncounterId(encounterId); // 就诊id
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
index 54ae4c77..38c98d33 100644
--- 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
@@ -169,6 +169,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
                     longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
                     longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
                     longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+                    longServiceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                     longServiceRequest.setQuantity(new BigDecimal("1")); // 请求数量
                     longServiceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
                     longServiceRequest.setCategoryEnum(categoryEnum); // 请求类型
@@ -216,6 +217,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
             longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
             longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
             longServiceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+            longServiceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             longServiceRequest.setQuantity(new BigDecimal("1")); // 请求数量
             longServiceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
             longServiceRequest.setCategoryEnum(categoryEnum); // 请求类型
@@ -347,7 +349,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         }
         AdviceBaseDto adviceBaseDto = new AdviceBaseDto();
         adviceBaseDto.setAdviceDefinitionId(transferOrganizationDefinitionId); // 医嘱定义id
-        // 对应的诊疗医嘱信息
+        // 转科的医嘱信息
         AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService
             .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, Whether.NO.getValue(), List.of(3))
             .getRecords().get(0);
@@ -356,6 +358,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
         serviceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
         serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+        serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
         serviceRequest.setQuantity(new BigDecimal("1")); // 请求数量
         serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
         serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
@@ -385,4 +388,83 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"转科医嘱"}));
     }
 
+    /**
+     * 保存离院医嘱
+     *
+     * @param leaveHospitalParam 转科离院参数
+     * @return 结果
+     */
+    @Override
+    public R<?> saveLeaveHospitalOrders(LeaveHospitalParam leaveHospitalParam) {
+        // 当前登录账号参与者id
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 当前时间
+        Date curDate = new Date();
+        // 计划出院时间
+        Date endTime = leaveHospitalParam.getEndTime();
+        if (endTime == null) {
+            endTime = endTime;
+        }
+        // 就诊id
+        Long encounterId = leaveHospitalParam.getEncounterId();
+        // 患者
+        Long patientId = leaveHospitalParam.getPatientId();
+        // 诊断ID
+        Long conditionId = leaveHospitalParam.getConditionId();
+        // 就诊诊断id
+        Long encounterDiagnosisId = leaveHospitalParam.getEncounterDiagnosisId();
+
+        // 出院的医嘱定义id
+        Long transferOrganizationDefinitionId =
+            iActivityDefinitionService.getAppointActivityDefinitionId(CommonConstants.BusinessName.LEAVE_HOSPITAL);
+        if (transferOrganizationDefinitionId == null) {
+            return R.fail("请先在诊疗目录维护出院医嘱");
+        }
+
+        // 校验重复开立
+        LambdaQueryWrapper<ServiceRequest> lambdaQuery = new LambdaQueryWrapper<>();
+        lambdaQuery.eq(ServiceRequest::getEncounterId, encounterId)
+            .eq(ServiceRequest::getActivityId, transferOrganizationDefinitionId)
+            .and(wrapper -> wrapper.eq(ServiceRequest::getStatusEnum, RequestStatus.DRAFT.getValue()).or()
+                .eq(ServiceRequest::getStatusEnum, RequestStatus.ACTIVE.getValue()).or());
+        if (!iServiceRequestService.list(lambdaQuery).isEmpty()) {
+            return R.fail("请勿重复开立出院医嘱");
+        }
+
+        // 出院的医嘱信息
+        AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
+            List.of(transferOrganizationDefinitionId), null, 1, 1, Whether.NO.getValue(), List.of(3)).getRecords()
+            .get(0);
+        // 保存出院医嘱请求
+        ServiceRequest serviceRequest = new ServiceRequest();
+        serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
+        serviceRequest.setOccurrenceStartTime(endTime); // 预计执行时间
+        serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+        serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+        serviceRequest.setQuantity(new BigDecimal("1")); // 请求数量
+        serviceRequest.setUnitCode(activityAdviceBaseDto.getUnitCode()); // 请求单位编码
+        serviceRequest.setCategoryEnum(Integer.valueOf(activityAdviceBaseDto.getCategoryCode())); // 请求类型
+        serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
+        serviceRequest.setReasonText(leaveHospitalParam.getReasonText()); // 理由
+        serviceRequest.setActivityId(transferOrganizationDefinitionId);// 诊疗定义id
+        serviceRequest.setPatientId(patientId); // 患者
+        serviceRequest.setRequesterId(practitionerId); // 开方医生
+        serviceRequest.setEncounterId(encounterId); // 就诊id
+        serviceRequest.setOrgId(activityAdviceBaseDto.getPositionId()); // 执行科室
+        serviceRequest.setConditionId(conditionId); // 诊断id
+        serviceRequest.setEncounterDiagnosisId(encounterDiagnosisId); // 就诊诊断id
+        iServiceRequestService.save(serviceRequest);
+
+        // 保存出院医嘱请求的过程数据
+        OrderProcess orderProcess = new OrderProcess();
+        orderProcess.setName(CommonConstants.BusinessName.TRANSFER_ORGANIZATION); // 名称
+        orderProcess.setEncounterId(encounterId); // 就诊id
+        orderProcess.setRequestId(serviceRequest.getId()); // 请求id
+        orderProcess.setRequestTableName(CommonConstants.TableName.WOR_SERVICE_REQUEST); // 请求表名
+        orderProcess.setOutWayCode(leaveHospitalParam.getOutWayCode()); // 出院方式
+        iOrderProcessService.save(orderProcess);
+
+        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"出院医嘱"}));
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java
new file mode 100644
index 00000000..77c05ee4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/NurseManageController.java
@@ -0,0 +1,66 @@
+package com.openhis.web.regdoctorstation.controller;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.regdoctorstation.appservice.INurseManageService;
+import com.openhis.web.regdoctorstation.dto.NurseStationRequestParam;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+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.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @ClassName NurseManageController
+ * @Description 护士站
+ * @Author raymond
+ * @Date 2025/10/27 10:07
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("/reg-nurse-station/operation")
+@Slf4j
+@AllArgsConstructor
+public class NurseManageController {
+    @Resource
+    private INurseManageService nurseManageService;
+    /**
+     * Desc: 加载 当前人 负责的区域和患者信息
+     * @param
+     * @Author raymond
+     * @Date 15:06 2025/10/27
+     * @return com.core.common.core.domain.R<?>
+     **/
+    @GetMapping(value = "/searchOrgAndPatientData")
+    public R<?> searchOrgAndPatientData(@RequestParam(name = "searchKeyWord", required = false) String searchKeyWord){
+        return this.nurseManageService.pricingBusiness(searchKeyWord);
+    }
+    public R<?> getPatientInfo(@RequestParam(name = "patientId") Long patientId){
+        return null;
+    }
+
+    /**
+     * Desc: 护士站 划价接口
+     * @param nurseStationRequestParam
+     * @param request
+     * @Author raymond
+     * @Date 10:16 2025/10/27
+     * @return com.core.common.core.domain.R<?>
+     **/
+    public R<?> searchDataListByPricing(NurseStationRequestParam nurseStationRequestParam,HttpServletRequest request){
+        /**
+         * TODO 一、基础数据 1、获取 当前护士负责的 病区 和 病区下的患者数据；2、护士点击 患者姓名时，获取患者基础数据（床号，姓名等）；
+         * TODO 二、核心数据 1、护士点击 患者姓名时，默认返回 由当前"护士" 添加的 当前"患者" "今日"的诊疗和耗材数据；
+         * TODO 三、划价：护士在执行时发现有需要独立收费的项，直接增加。
+         * TODO 四：计费：护士在执行时医嘱时，发现有需要增加的项，直接增加。
+         * TODO 先执行 request -> 操作记录->发放、账单
+         * TODO 问题：1、是否增加 标识：数据为划价；
+         */
+
+        return R.ok();
+    }
+
+}
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
index 952b2d4b..e7a25d5f 100644
--- 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
@@ -6,7 +6,7 @@ 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.common.enums.ActivityDefCategory;
 import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
 import com.openhis.web.regdoctorstation.dto.RequestFormSaveDto;
 
@@ -32,7 +32,7 @@ public class RequestFormManageController {
      */
     @PostMapping(value = "/save-check")
     public R<?> saveCheckRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
-        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, RequestFormType.CHECK.getCode());
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, ActivityDefCategory.TEST.getCode());
     }
 
     /**
@@ -43,7 +43,7 @@ public class RequestFormManageController {
      */
     @PostMapping(value = "/save-inspection")
     public R<?> saveInspectionRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
-        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, RequestFormType.INSPECTION.getCode());
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, ActivityDefCategory.PROOF.getCode());
     }
 
     /**
@@ -55,7 +55,7 @@ public class RequestFormManageController {
     @PostMapping(value = "/save-blood-transfusion")
     public R<?> saveBloodTransfusionRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
         return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto,
-            RequestFormType.BLOOD_TRANSFUSION.getCode());
+            ActivityDefCategory.METACHYSIS.getCode());
     }
 
     /**
@@ -66,7 +66,8 @@ public class RequestFormManageController {
      */
     @PostMapping(value = "/save-surgery")
     public R<?> saveSurgeryRequestForm(@RequestBody RequestFormSaveDto requestFormSaveDto) {
-        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto, RequestFormType.SURGERY.getCode());
+        return iRequestFormManageAppService.saveRequestForm(requestFormSaveDto,
+            ActivityDefCategory.PROCEDURE.getCode());
     }
 
     /**
@@ -77,7 +78,7 @@ public class RequestFormManageController {
      */
     @GetMapping(value = "/get-check")
     public R<?> getCheckRequestForm(@RequestParam Long encounterId) {
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.CHECK.getCode()));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode()));
     }
 
     /**
@@ -88,7 +89,7 @@ public class RequestFormManageController {
      */
     @GetMapping(value = "/get-inspection")
     public R<?> getInspectionRequestForm(@RequestParam Long encounterId) {
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.INSPECTION.getCode()));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode()));
     }
 
     /**
@@ -99,8 +100,7 @@ public class RequestFormManageController {
      */
     @GetMapping(value = "/get-blood-transfusion")
     public R<?> getBloodTransfusionRequestForm(@RequestParam Long encounterId) {
-        return R
-            .ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.BLOOD_TRANSFUSION.getCode()));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.METACHYSIS.getCode()));
     }
 
     /**
@@ -111,7 +111,7 @@ public class RequestFormManageController {
      */
     @GetMapping(value = "/get-surgery")
     public R<?> getSurgeryRequestForm(@RequestParam Long encounterId) {
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, RequestFormType.SURGERY.getCode()));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROCEDURE.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
index e0aeb8c2..298ef586 100644
--- 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
@@ -7,6 +7,7 @@ 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.LeaveHospitalParam;
 import com.openhis.web.regdoctorstation.dto.NursingOrdersSaveDto;
 import com.openhis.web.regdoctorstation.dto.TransferOrganizationParam;
 
@@ -67,4 +68,15 @@ public class SpecialAdviceController {
         return iSpecialAdviceAppService.saveTransferOrganizationOrders(transferOrganizationParam);
     }
 
+    /**
+     * 保存出院医嘱
+     *
+     * @param leaveHospitalParam 转科医嘱参数
+     * @return 结果
+     */
+    @PostMapping(value = "/leave-hospital-orders")
+    public R<?> saveLeaveHospitalOrders(@RequestBody LeaveHospitalParam leaveHospitalParam) {
+        return iSpecialAdviceAppService.saveLeaveHospitalOrders(leaveHospitalParam);
+    }
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
new file mode 100644
index 00000000..b16e2fba
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/ActivityOrganizationConfigDto.java
@@ -0,0 +1,28 @@
+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 ActivityOrganizationConfigDto {
+
+    /**
+     * 执行科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+
+    /**
+     * 诊疗定义id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long activityDefinitionId;
+
+}
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
index 6e44e4d0..f718dba0 100644
--- 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
@@ -20,6 +20,11 @@ public class ActivitySaveDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long adviceDefinitionId;
 
+    /**
+     * 诊疗定义名称
+     */
+    private String adviceDefinitionName;
+
     /** 请求数量 */
     private BigDecimal quantity;
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java
index 6b22377d..cb25b54e 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/LeaveHospitalParam.java
@@ -1,5 +1,13 @@
 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;
 
@@ -10,4 +18,41 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class LeaveHospitalParam {
 
+    /** 就诊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;
+
+    /**
+     * 计划出院时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /**
+     * 出院方式
+     */
+    private String outWayCode;
+
+    /**
+     * 理由
+     */
+    private String reasonText;
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NurseStationRequestParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NurseStationRequestParam.java
new file mode 100644
index 00000000..f0a7599c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/NurseStationRequestParam.java
@@ -0,0 +1,49 @@
+package com.openhis.web.regdoctorstation.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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @ClassName NurseRequestParam
+ * @Description 护士站 查询条件
+ * @Author raymond
+ * @Date 2025/10/27 10:17
+ * @Version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+public class NurseStationRequestParam {
+
+    /**
+     * 患者住院入科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizationId;
+    /**
+     * 患者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 startTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+
+}
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
index 939dabe6..c7ce2702 100644
--- 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
@@ -52,12 +52,13 @@ public interface AdviceManageAppMapper {
      * @param WOR_SERVICE_REQUEST 诊疗请求表名
      * @param practitionerId 当前账号的参与者id
      * @param historyFlag 历史医嘱标记
+     * @param generateSourceEnum 生成来源
      * @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("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
 
 }
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
index 96407418..6c7a90c6 100644
--- 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
@@ -1,11 +1,13 @@
 package com.openhis.web.regdoctorstation.mapper;
 
-import com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto;
-import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
+import com.openhis.web.regdoctorstation.dto.ActivityOrganizationConfigDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormQueryDto;
 
 /**
  * 申请单管理 应用Mapper
@@ -31,4 +33,13 @@ public interface RequestFormManageAppMapper {
      */
     List<RequestFormDetailQueryDto> getRequestFormDetail(@Param("prescriptionNo") String prescriptionNo);
 
+    /**
+     * 查询诊疗执行科室配置
+     * 
+     * @param activityCategoryCode 诊疗类型编码
+     * @return 诊疗执行科室配置
+     */
+    List<ActivityOrganizationConfigDto>
+        getActivityOrganizationConfig(@Param("activityCategoryCode") String activityCategoryCode);
+
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java
new file mode 100644
index 00000000..74ccf015
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/IReportAppService.java
@@ -0,0 +1,140 @@
+/*
+ * 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;
+
+/**
+ * 报表 appService
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+public interface IReportAppService {
+
+    /**例子
+     * 药剂科报表_常规报表:出库明细表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 出库明细表
+     */
+    R<?> getStockOutDetailPage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:患者明细主表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 患者明细主表
+     */
+    R<?> getPatientMasterDetailPage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:线下采购占比
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 线下采购占比报表
+     */
+    R<?> getOfflinePurchaseRatioPage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:药品使用情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品使用情况报表
+     */
+    R<?> getMedicationUsagePage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:患者明细
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 患者明细报表
+     */
+    R<?> getPatientDetailsPage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表_常规报表:药品费用增长率
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品费用增长率
+     */
+    R<?> getDrugExpensesGrowthRate(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表_结余留用:30天回款率
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 30天回款率
+     */
+    R<?> getThirtyDayCollectionRate(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:基本情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 基本情况报表
+     */
+    R<?> getBasicInformationDetails(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:药品出库情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品出库情况报表
+     */
+    R<?> getMedicationStockOutDetails(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:产品使用情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 产品使用情况报表
+     */
+    R<?> getProductUsageDetails(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+    /**
+     * 药剂科报表:非中选产品采购量占比
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 非中选产品采购量占比报表
+     */
+    R<?> getNonWinQtyRatio(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
+
+
+}
diff --git a/openhis-server-new/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
index ef4f1054..8fa58955 100644
--- a/openhis-server-new/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
@@ -11,29 +11,24 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.core.common.utils.AgeCalculatorUtil;
-import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.utils.EnumUtils;
-import com.openhis.web.basedatamanage.dto.UserAndPractitionerDto;
-import com.openhis.web.pharmacymanage.dto.MedDetailedAccountPageDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 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.Organization;
+import com.core.common.utils.AgeCalculatorUtil;
 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.reportmanage.appservice.IChargeReportAppService;
-import com.openhis.web.reportmanage.dto.*;
+import com.openhis.web.reportmanage.dto.ChargeReportInitDto;
+import com.openhis.web.reportmanage.dto.ChargeReportPageDto;
+import com.openhis.web.reportmanage.dto.ChargeReportSearchParam;
 import com.openhis.web.reportmanage.mapper.ChargeReportMapper;
 
 /**
@@ -73,8 +68,8 @@ public class ChargeReportAppServiceImpl implements IChargeReportAppService {
                 ChargeItemContext.getInfo()))
             .collect(Collectors.toList());
 
-        initDto.setStatisticsTypeOptions(statisticsTypeOptions)
-            .setIssuerOptions(applicantList).setPayeeOptions(applicantList).setClinicalTypeOptions(clinicalTypeOptions);
+        initDto.setStatisticsTypeOptions(statisticsTypeOptions).setIssuerOptions(applicantList)
+            .setPayeeOptions(applicantList).setClinicalTypeOptions(clinicalTypeOptions);
         return R.ok(initDto);
     }
 
@@ -103,34 +98,33 @@ public class ChargeReportAppServiceImpl implements IChargeReportAppService {
                     CommonConstants.FieldName.ClinicalNo)),
                 request);
         queryWrapper.orderByDesc(CommonConstants.FieldName.BusNo).orderByAsc(CommonConstants.FieldName.ChargeId)
-                .orderByAsc(CommonConstants.FieldName.ChargeTime);
-
+            .orderByAsc(CommonConstants.FieldName.ChargeTime);
 
         // 最终返回结果
         Page<ChargeReportPageDto> chargeReportList;
         // 判断统计类型
         if (Objects.equals(statisticsType, StatisticsType.OUTPATIENT_REVENUE.getCode())) {
             // 门诊整体收入明细
-            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize),queryWrapper,
+            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 PaymentStatus.SUCCESS.getValue(), PaymentStatus.REFUND_ALL.getValue(),
                 ChargeItemContext.MEDICATION.getValue(), ChargeItemContext.DEVICE.getValue(),
                 ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.REGISTER.getValue(), 2);
         } else if (Objects.equals(statisticsType, StatisticsType.OUTPATIENT_YB_REVENUE.getCode())) {
             // 门诊医保收入明细
-            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize),queryWrapper,
+            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 PaymentStatus.SUCCESS.getValue(), PaymentStatus.REFUND_ALL.getValue(),
                 ChargeItemContext.MEDICATION.getValue(), ChargeItemContext.DEVICE.getValue(),
                 ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.REGISTER.getValue(), 1);
 
         } else if (Objects.equals(statisticsType, StatisticsType.OUTPATIENT_SELF_REVENUE.getCode())) {
             // 门诊自费收入明细
-            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize),queryWrapper,
+            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 PaymentStatus.SUCCESS.getValue(), PaymentStatus.REFUND_ALL.getValue(),
                 ChargeItemContext.MEDICATION.getValue(), ChargeItemContext.DEVICE.getValue(),
                 ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.REGISTER.getValue(), 0);
         } else if (Objects.equals(statisticsType, StatisticsType.OUTPATIENT_REFUND.getCode())) {
             // 门诊退费明细
-            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize),queryWrapper,
+            chargeReportList = chargeReportMapper.selectRevenueReportPage(new Page<>(pageNo, pageSize), queryWrapper,
                 PaymentStatus.SUCCESS.getValue(), PaymentStatus.REFUND_ALL.getValue(),
                 ChargeItemContext.MEDICATION.getValue(), ChargeItemContext.DEVICE.getValue(),
                 ChargeItemContext.ACTIVITY.getValue(), ChargeItemContext.REGISTER.getValue(), 3);
@@ -141,7 +135,9 @@ public class ChargeReportAppServiceImpl implements IChargeReportAppService {
 
         // 年龄 性别 医保等级 状态转换
         chargeReportList.getRecords().forEach(infoDto -> {
-            infoDto.setAge(AgeCalculatorUtil.getAge(infoDto.getBirthDate()));
+            if (infoDto.getBirthDate() != null) {
+                infoDto.setAge(AgeCalculatorUtil.getAge(infoDto.getBirthDate()));
+            }
             infoDto
                 .setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, infoDto.getGenderEnum()));
             infoDto.setChrgitmLv_enumText(EnumUtils.getInfoByValue(InsuranceLevel.class, infoDto.getChrgitmLv()));
@@ -151,14 +147,10 @@ public class ChargeReportAppServiceImpl implements IChargeReportAppService {
         List<ChargeReportPageDto> content = chargeReportList.getRecords();
         // 按 busNo 分组，并合计 totalPrice
         Map<String, BigDecimal> subtotalAmount = content.stream()
-            .collect(Collectors.groupingBy(
-                ChargeReportPageDto::getBusNo,
-                    Collectors.reducing(
-                        BigDecimal.ZERO, // 初始值
-                        dto -> dto.getTotalPrice() != null ? dto.getTotalPrice() : BigDecimal.ZERO,
-                        BigDecimal::add) // 累加操作
-                )
-            );
+            // 过滤掉 busNo 为 null 的元素,否则会报错但实际上不会出现这个情况 element cannot be mapped to a null key
+            .filter(dto -> dto.getBusNo() != null)
+            .collect(Collectors.groupingBy(ChargeReportPageDto::getBusNo, Collectors.reducing(BigDecimal.ZERO,
+                dto -> dto.getTotalPrice() != null ? dto.getTotalPrice() : BigDecimal.ZERO, BigDecimal::add)));
 
         // 更新每条数据的 Price 字段
         for (ChargeReportPageDto dto : content) {
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
new file mode 100644
index 00000000..38ffee9b
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.appservice.impl;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+
+import com.core.common.core.domain.R;
+import com.openhis.web.reportmanage.appservice.IReportAppService;
+
+/**
+ * 报表 impl
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Service
+public class ReportAppServiceImpl implements IReportAppService {
+
+    /**例子
+     * 药剂科报表_常规报表:出库明细表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 出库明细表
+     */
+    @Override
+    public R<?> getStockOutDetailPage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:患者明细主表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 患者明细主表
+     */
+    @Override
+    public R<?> getPatientMasterDetailPage(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:线下采购占比
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 线下采购占比报表
+     */
+    @Override
+    public R<?> getOfflinePurchaseRatioPage(Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request) {
+        return null;
+    }
+    /**
+     * 药剂科报表:药品使用情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品使用情况报表
+     */
+    @Override
+    public R<?> getMedicationUsagePage(Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:患者明细
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 患者明细报表
+     */
+    @Override
+    public R<?> getPatientDetailsPage(Integer pageNo, Integer pageSize, String searchKey,
+        HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表_常规报表:药品费用增长率
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品费用增长率
+     */
+    @Override
+    public R<?> getDrugExpensesGrowthRate(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表_结余留用:30天回款率
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 30天回款率
+     */
+    @Override
+    public R<?> getThirtyDayCollectionRate(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:基本情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 基本情况报表
+     */
+    @Override
+    public R<?> getBasicInformationDetails(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:药品出库情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品出库情况报表
+     */
+    @Override
+    public R<?> getMedicationStockOutDetails(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:产品使用情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 产品使用情况报表
+     */
+    @Override
+    public R<?> getProductUsageDetails(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+    /**
+     * 药剂科报表:非中选产品采购量占比
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 非中选产品采购量占比报表
+     */
+    @Override
+    public R<?> getNonWinQtyRatio(Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
+        return null;
+    }
+
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java
new file mode 100644
index 00000000..9ce1db1d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/controller/ReportController.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.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.reportmanage.appservice.IReportAppService;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 报表 controller
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@RestController
+@RequestMapping("/report-manage/report")
+@Slf4j
+public class ReportController {
+
+    @Autowired
+    private IReportAppService reportAppService;
+
+
+    /**例子，Dto例子参考：ReportStockOutDetailDto
+     * 药剂科报表_常规报表:出库明细表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 出库明细表
+     */
+    @GetMapping(value = "/stock-out-detail-page")
+    public R<?> getStockOutDetailPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getStockOutDetailPage(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportPatientMasterDetailDto
+     * 药剂科报表:患者明细主表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 患者明细主报表
+     */
+    @GetMapping(value = "/patient-master-detail")
+    public R<?> getPatientMasterDetailPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getPatientMasterDetailPage(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportOfflinePurchaseRatioDto
+     * 药剂科报表:线下采购占比
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 线下采购占比报表
+     */
+    @GetMapping(value = "/offline-purchase-ratio")
+    public R<?> getOfflinePurchaseRatioPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getOfflinePurchaseRatioPage(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportMedicationUsageDto
+     * 药剂科报表:药品使用情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品使用情况报表
+     */
+    @GetMapping(value = "/medication-usage")
+    public R<?> getMedicationUsagePage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getMedicationUsagePage(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportPatientDetailsDto
+     * 药剂科报表:患者明细
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 患者明细报表
+     */
+    @GetMapping(value = "/patient-details")
+    public R<?> getPatientDetailsPage(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getPatientDetailsPage(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportDrugCostGrowthDto
+     * 药剂科报表:药品费用增长率
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品费用增长率
+     */
+    @GetMapping(value = "/drug-expenses-growth-rate")
+    public R<?> getDrugExpensesGrowthRate(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getDrugExpensesGrowthRate(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportThirtyDayCollectionRateDto
+     * 药剂科报表:30天回款率
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 30天回款率
+     */
+    @GetMapping(value = "/thirty-day-collection-rate")
+    public R<?> getThirtyDayCollectionRate(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getThirtyDayCollectionRate(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportBasicInformationDetailsDto
+     * 药剂科报表:基本情况报表
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 基本情况报表
+     */
+    @GetMapping(value = "/basic-information-details")
+    public R<?> getBasicInformationDetails(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getBasicInformationDetails(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportMedicationStockOutDetailsDto
+     * 药剂科报表:药品出库情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 药品出库情况报表
+     */
+    @GetMapping(value = "/medication-stock-out-details")
+    public R<?> getMedicationStockOutDetails(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getMedicationStockOutDetails(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportProductUsageDto
+     * 药剂科报表:产品使用情况
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 产品使用情况报表
+     */
+    @GetMapping(value = "/product-usage-details")
+    public R<?> getProductUsageDetails(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getProductUsageDetails(pageNo,pageSize,searchKey,request);
+    }
+
+    /**Dto参考：ReportNonWinQtyRatioDto
+     * 药剂科报表:非中选产品采购量占比
+     *
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param searchKey 模糊查询关键字
+     * @param request 请求数据
+     * @return 非中选产品采购量占比报表
+     */
+    @GetMapping(value = "/non-win-qty-ratio")
+    public R<?> getNonWinQtyRatio(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+        @RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
+        return reportAppService.getNonWinQtyRatio(pageNo,pageSize,searchKey,request);
+    }
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
new file mode 100644
index 00000000..461c45ef
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportBasicInformationDetailsDto.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * 基本情况 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportBasicInformationDetailsDto {
+
+    /** 序号 */
+    private String no;
+
+    /** 数据上报日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private String dataReportingDate;
+
+    /** 省级行政区划代码 */
+    private String provinceCodes;
+
+    /** 组织机构代码 */
+    private String organizationCode;
+
+    /** 医疗机构代码 */
+    private String medicalCode;
+
+    /** 组织机构名称 */
+    private String organizationName;
+
+    /** 年度药品总收入(元) */
+    private BigDecimal yearMedicineTotalRevenue;
+
+    /** 实有床位数 */
+    private BigDecimal actualBedsNo;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java
new file mode 100644
index 00000000..97b3e0cf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportDrugCostGrowthDto.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品费用增长率 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportDrugCostGrowthDto {
+
+    /** 项目名称 */
+    private String name;
+
+    /** 医疗机构名 */
+    private String medinsName;
+
+    /** 本年度药品支出额（元） */
+    private BigDecimal currentYearExpenditure;
+
+    /** 上一年度药品支出额（元） */
+    private BigDecimal lastYearExpenditure;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
new file mode 100644
index 00000000..307cdf3d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationStockOutDetailsDto.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品出库情况 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportMedicationStockOutDetailsDto {
+
+    /** 医疗机构代码 */
+    private String medicalInstitutionCode;
+
+    /** 组织机构名称 */
+    private String organizationName;
+
+    /** 国家药品编码(YPID) */
+    private String nationalMedicineCode;
+
+    /** 院内药品唯一码 */
+    private String busNo;
+
+    /** 省级药品集中采购平台药品编码 */
+    private String provincialMedicineConcentratedCode;
+
+    /** 产品名称 */
+    private String lotName;
+
+    /** 出库数量(最小销售包装单位) */
+    private BigDecimal quantitySales;
+
+    /** 出库数量(最小制剂单位) */
+    private BigDecimal quantityPreparation;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java
new file mode 100644
index 00000000..1acb8d67
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportMedicationUsageDto.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品使用情况报表始化 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportMedicationUsageDto {
+
+    /** 医疗机构代码 */
+    private String orgId;
+
+    /** 组织机构名称 */
+    private String orgName;
+
+    /** 国家药品编码(YPID) */
+    private String nationalDrugCode;
+
+    /** 院内药品唯一码 */
+    private String busNo;
+
+    /** 省级药品集中采购平台药品编码 */
+    private String provincialDrugCode;
+
+    /** 产品名称 */
+    private String itemName;
+
+    /** 销售总金额(元) */
+    private BigDecimal totalSalesPrice;
+
+    /** 销售数量(最小销售包装单位) */
+    private BigDecimal packageSalesQuantity;
+
+    /** 销售数量(最小制剂单位) */
+    private BigDecimal dosageSalesQuantity;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
new file mode 100644
index 00000000..17c47beb
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportNonWinQtyRatioDto.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 非中选产品采购量占比 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportNonWinQtyRatioDto {
+
+    /** 项目名称 */
+    private String itemName;
+
+    /** 医疗机构名称 */
+    private String orgName;
+
+    /** 药品通用名 */
+    private String medName;
+
+    /** 非中选产品采购数量（片袋支） */
+    private BigDecimal nonWinQty;
+
+    /** 通用名药品采购数量（片袋支） */
+    private BigDecimal quantity;
+
+    /** 非中选产品采购金额（元） */
+    private BigDecimal nonWinAmt;
+
+    /** 通用名药品采购金额（元） */
+    private BigDecimal amount;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
new file mode 100644
index 00000000..ae3bca5e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportOfflinePurchaseRatioDto.java
@@ -0,0 +1,36 @@
+/*
+ * 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 lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 线下采购占比报表初始化 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportOfflinePurchaseRatioDto {
+
+    /** 项目名称 */
+    private String itemName;
+
+    /** 医疗机构名称 */
+    private String orgName;
+
+    /** 实际药品采购金额（元） */
+    private BigDecimal actualDrugPurchasePrice;
+
+    /** 平台采购金额（元） */
+    private BigDecimal platformPurchasePrice;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java
new file mode 100644
index 00000000..86740d35
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientDetailsDto.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 报表例子:患者明细初始化 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportPatientDetailsDto {
+
+    /** 门诊住院号 */
+    private String encounterBusNo;
+
+    /** 药品通用名 */
+    private String medName;
+
+    /** 药品医保编码 */
+    private String medYbNo;
+
+    /** 药品类别 */
+    @Dict(dictCode = "med_category_code")
+    private String categoryCode;
+    private String categoryCode_dictText;
+
+    /** 剂型 */
+    @Dict(dictCode = "dose_form_code")
+    private String doseFormCode;
+    private String doseFormCode_dictText;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 包装 */
+    private String packageUnit;
+
+    /** 计价单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 是否中选产品 */
+    private String isSelected;
+
+    /** 生产企业 */
+    private String manufacturerText;
+
+    /** 单价（元） */
+    private BigDecimal price;
+
+    /** 使用数量（片袋支） */
+    private BigDecimal quantity;
+
+    /** 使用总金额（元） */
+    private BigDecimal totalPrice;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java
new file mode 100644
index 00000000..fce46c7c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportPatientMasterDetailDto.java
@@ -0,0 +1,66 @@
+/*
+ * 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 lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 报表例子:患者明细主表初始化 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportPatientMasterDetailDto {
+
+    /** 门诊住院号 */
+    private String encounterBusNo;
+
+    /** 患者姓名 */
+    private String patientName;
+
+    /** 身份证号 */
+    private String idCard;
+
+    /** 人员编码 */
+    private String psnNo;
+
+    /** 参保地区编码 */
+    private String insuPlcNo;
+
+    /** 参保类型 */
+    private String ybType;
+
+    /** 入院时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date encounterStartTime;
+
+    /** 出院时间 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date encounterEndTime;
+
+    /** 处方日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date issueTime;
+
+    /** 出院诊断 */
+    private String outDiagnoseName;
+
+    /** 总费用（元） */
+    private BigDecimal feeAmount;
+
+    /** 政策范围内 */
+    private BigDecimal inscpScpAmt;
+
+    /** 基本医保统筹支付金额（元） */
+    private BigDecimal tcPayAmount;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java
new file mode 100644
index 00000000..7e963c84
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportProductUsageDto.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import com.openhis.common.annotation.Dict;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 产品使用情况始化 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportProductUsageDto {
+
+    /** 编码 */
+    private String busNo;
+
+    /** 药品通用名 */
+    private String medName;
+
+    /** 产品名称 */
+    private String productName;
+
+    /** 剂型 */
+    @Dict(dictCode = "dose_form_code")
+    private String doseFormCode;
+    private String doseFormCode_dictText;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 包装 */
+    private String packageUnit;
+
+    /** 计价单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 生产企业 */
+    private String manufacturerText;
+
+    /** 价格（每盒瓶/元） */
+    private BigDecimal price;
+
+    /** 是否医保患者使用 */
+    private String isUsed;
+
+    /** 患者参保地 */
+    private String  insuplcName;
+
+    /** 参保类型 */
+    private String ybType;
+
+    /** 使用数量（片袋支） */
+    private BigDecimal quantity;
+
+    /** 使用金额（片袋支） */
+    private BigDecimal totalPrice;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java
new file mode 100644
index 00000000..8a425f8e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportStockOutDetailDto.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.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 lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 报表例子:出库明细表初始化 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportStockOutDetailDto {
+
+    /** 单据号 */
+    private String supplyBusNo;
+
+    /** 出库类型 */
+    private String type;
+
+    /** 药品名称 */
+    private String medName;
+
+    /** 院内药品唯一码 */
+    private String busNo;
+
+    /** 药品类型 */
+    private String itemTableText;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 存放仓库（目的仓库） */
+    private String locationName;
+
+    /** 仓库货位 */
+    private String locationStoreName;
+
+    /** 计量单位 */
+    @Dict(dictCode = "unit_code")
+    private String unitCode;
+    private String unitCode_dictText;
+
+    /** 出库数量 */
+    private BigDecimal quantity;
+
+    /** 采购单价 */
+    private BigDecimal price;
+
+    /** 采购金额 */
+    private BigDecimal totalPrice;
+
+    /** 售价 */
+    private BigDecimal salePrice;
+
+    /** 售价金额 */
+    private BigDecimal totalSalePrice;
+
+    /** 出库科室 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    private String orgId_dictText;
+
+    /** 供应商 */
+    private String supplier;
+
+    /** 审核人 */
+    @Dict(dictCode = "id", dictText = "name", dictTable = "adm_practitioner")
+    private Long approverId;
+    private String approverId_dictText;
+
+    /** 审批日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date approvalTime;
+
+    /** 出库原因 */
+    private String reason;
+
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
new file mode 100644
index 00000000..648b2601
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/ReportThirtyDayCollectionRateDto.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.reportmanage.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 报表例子:30天回款率 dto
+ *
+ * @author liuhr
+ * @date 2025-11-06
+ */
+@Data
+@Accessors(chain = true)
+public class ReportThirtyDayCollectionRateDto {
+
+    /** 项目名称 */
+    private String name;
+
+    /** 医疗机构名 */
+    private String medinsName;
+
+    /** 药品通用名 */
+    private String drugGenname;
+
+    /** 30天回款率（%） */
+    private BigDecimal collectionRate;
+
+}
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
index 032986a3..a19fd7d5 100644
--- 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
@@ -40,7 +40,6 @@ public final class ExcelFillerUtil {
      * @param dataList DTO对象列表
      * @param headers 表头信息，key为DTO字段名，value为列标题
      * @param fileName 导出的文件名称
-     * @param outputPath 导出的文件所在文件夹
      * @param totalValues 表头上的数据，key为DTO字段名，value为值
      * @throws IOException IO异常
      * @throws IllegalAccessException 反射访问异常
@@ -194,7 +193,7 @@ public final class ExcelFillerUtil {
             // 根据值的类型设置单元格内容
             if (value instanceof BigDecimal) {
                 // 保留3位小数，使用HALF_UP模式四舍五入
-                BigDecimal scaled = ((BigDecimal)value).setScale(5, RoundingMode.HALF_UP);
+                BigDecimal scaled = ((BigDecimal)value).setScale(6, RoundingMode.HALF_UP);
                 String bdStr = scaled.toPlainString();
                 cell.setCellValue(bdStr); // 用字符串写入，避免科学计数法
             } else if (value instanceof Number) {
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
index f649f721..a0146333 100644
--- 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
@@ -21,6 +21,19 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.core.common.annotation.Anonymous;
+import com.openhis.web.ybmanage.dto.*;
+import com.openhis.yb.domain.InpatientDischarge;
+import com.openhis.yb.domain.InpatientReg;
+import com.openhis.yb.dto.Catalogue1312Output;
+import com.openhis.yb.dto.Clinic2208UnSetlInfoOutput;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -43,10 +56,6 @@ 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.FinancialHand3201WebParam;
-import com.openhis.web.ybmanage.dto.FinancialHand3203AWebParam;
-import com.openhis.web.ybmanage.dto.Yb5205SpecialDiseaseWebParam;
 import com.openhis.web.ybmanage.service.IYbService;
 import com.openhis.yb.domain.FinancialApplyRecord;
 import com.openhis.yb.domain.InfoPerson;
@@ -887,6 +896,116 @@ public class YbController {
         }
 
         return R.ok(yb5205OutputSpecialDiseases);
+    }
 
+    /**
+     * 【2208】医保门诊退费
+     *
+     * @param psnNo 医保人员编号
+     * @param mdtrtId 医保就诊id
+     * @param settleId 医保结算id
+     * @param insuplcAdmdvs 参保地
+     * @param contractNo 合同编号
+     * @return 结果
+     */
+    @GetMapping("/yb-return-settle")
+    @Anonymous
+    public R<?> ybReturnSettle(@RequestParam("psnNo") String psnNo, @RequestParam("mdtrtId") String mdtrtId,
+        @RequestParam("settleId") String settleId, @RequestParam("insuplcAdmdvs") String insuplcAdmdvs,
+        @RequestParam("contractNo") String contractNo){
+
+        Clinic2208UnSetlInfoParam clinicSetl = new Clinic2208UnSetlInfoParam();
+        clinicSetl.setPsnNo(psnNo).setMdtrtId(mdtrtId).setSetlId(settleId)
+                .setInsuplcAdmdvs(insuplcAdmdvs);
+
+        Clinic2208UnSetlInfoOutput clinic2208UnSetlInfoOutput = ybHttpUtils.unSettle(clinicSetl, iContractService.getContract(contractNo));
+
+        return R.ok(clinic2208UnSetlInfoOutput);
+    }
+
+    /**
+     * 【目录下载】
+     *
+     * @param address 接口
+     * @return 结果
+     */
+    @GetMapping("/query-catalog")
+    public R<?> queryCatalog(@RequestParam("address") String address, @RequestParam("v") String version) {
+
+        CatalogFileInput catalogFileInput = new CatalogFileInput();
+        catalogFileInput.setAddress(address);
+        catalogFileInput.setVer(version);
+
+        FileResult fileResult = ybHttpUtils.queryCatalog(catalogFileInput);
+
+        fileResult = ybHttpUtils.downLoadFile(fileResult);
+
+        if (fileResult == null) {
+            return R.fail("获取失败");
+        }
+
+        return R.ok(fileResult);
+    }
+
+    /**
+     * 【2401】入院办理
+     * @return
+     */
+    @PostMapping("/inpatient-reg")
+    public R<?> inpatientReg(Yb2401InpatientRegParamDto yb2401InpatientRegParamDto){
+
+        Yb2401InputInpatientMdtrtInfo yb2401InputInpatientMdtrtInfo = ybDao.getYb2401InputInpatientMdtrtInfo(yb2401InpatientRegParamDto.getEncounterId());
+
+        yb2401InputInpatientMdtrtInfo.setMdtrtCertType(yb2401InpatientRegParamDto.getYbMdtrtCertType());
+        yb2401InputInpatientMdtrtInfo.setMdtrtCertNo(yb2401InpatientRegParamDto.getBusiCardInfo());
+
+        InpatientReg inpatientReg = ybHttpUtils.inpatientReg(yb2401InputInpatientMdtrtInfo);
+
+        if(inpatientReg!=null){
+
+            inpatientReg.setInputParam(JSON.toJSONString(yb2401InputInpatientMdtrtInfo));
+            ybDao.save2401InpatientReg(inpatientReg);
+            return R.ok("医保入院办理成功！");
+
+        }
+        return R.fail("医保入院办理失败！");
+    }
+
+    /**
+     * 【2402】入院办理
+     * @return
+     */
+    @PostMapping("/inpatient-dis-charge")
+    public R<?> inpatientCheckOut(Long encounterId){
+
+        Contract contract = new Contract();
+        Yb2402InputParam yb2402InputInpatientDscgInfo = ybDao.getYb2402InputInpatientDscgInfo(encounterId,contract);
+
+        InpatientDischarge inpatientReg = ybHttpUtils.inpatientCheckOut(contract,yb2402InputInpatientDscgInfo);
+
+        if(inpatientReg!=null){
+
+            inpatientReg.setInputParam(JSON.toJSONString(yb2402InputInpatientDscgInfo));
+            ybDao.save2402InpatientDscg(inpatientReg);
+            return R.ok("医保出院办理成功！");
+
+        }
+        return R.fail("医保出院办理失败！");
+    }
+
+    /**
+     * 【2403】入院办理
+     * @return
+     */
+    @PostMapping("/update-inpatient-info")
+    public R<?> updateInpatientInfo(Long encounterId){
+
+        Yb2403InputParam yb2403InputParam = ybDao.getYb2403InputParam(encounterId);
+
+        ybHttpUtils.updateInpatientInfo(yb2403InputParam);
+
+        ybDao.save2403InputInpatient(yb2403InputParam);
+
+        return R.fail("医保出院办理失败！");
     }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
new file mode 100644
index 00000000..0c6c1658
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
@@ -0,0 +1,23 @@
+package com.openhis.web.ybmanage.dto;
+
+import lombok.Data;
+
+@Data
+public class Yb2401InpatientRegParamDto {
+
+    /**
+     * 密钥 医保挂号时使用
+     */
+    private String busiCardInfo;// 2025/05/16 前后端一致，前端大写，后端保持大写
+
+    /**
+     * 类型 医保挂号时使用
+     */
+    private String ybMdtrtCertType;
+
+    /**
+     * 就诊id
+     */
+    private Long encounterId;
+
+}
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
index e7050d0b..0d97916b 100644
--- 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
@@ -10,7 +10,7 @@ import com.openhis.yb.dto.*;
 /**
  * 医保Mapper
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Repository
 public interface YbMapper {
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
index f5fc7ab7..d4364a22 100644
--- 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
@@ -5,7 +5,7 @@ import com.core.common.core.domain.R;
 /**
  * 医保Service
  *
- * @author GuoRui
+ * @author Thanking
  */
 public interface IYbService {
 
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
index 20e20120..3d99c6b6 100644
--- 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
@@ -28,7 +28,7 @@ import com.openhis.yb.service.YbHttpUtils;
 /**
  * 医保ServiceImpl
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Service
 public class YbServiceImpl implements IYbService {
@@ -298,7 +298,7 @@ public class YbServiceImpl implements IYbService {
             // 医疗服务机构类型：参考字典表
             .setMedinsType(YbMedinsType.FIXMEDINS_TYPE1.getValue())
             // 医疗机构等级：参考字典表
-            .setMedinsLv(TenantOptionUtil.getOptionContent(TenantOptionDict.MEDINS_LV))
+            .setMedinsLv(TenantOptionUtil.getOptionContent(TenantOptionDict.YB_MEDINS_LV))
             // 入院日期
             .setAdmDate(encounterPatientInfo.getAdmDate())
             // 出院日期
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
index b4401162..ce841649 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application-test.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-test.yml
@@ -62,7 +62,11 @@ spring:
   # redis 配置
   redis:
     # 地址
+<<<<<<< HEAD:openhis-server-new/openhis-application/src/main/resources/application-test.yml
     host: 192.168.110.252
+=======
+    host: localhost
+>>>>>>> upstream/develop:openhis-server-new/openhis-application/src/main/resources/application-local.yml
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml
index a8228c06..35c92f6d 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application.yml
@@ -49,7 +49,11 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
+<<<<<<< HEAD
     active: dev
+=======
+    active: local  # （本地）local （生产）prod
+>>>>>>> upstream/develop
   # 文件上传
   servlet:
     multipart:
diff --git a/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties b/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
index 09a1d5b4..67955d33 100644
--- a/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
+++ b/openhis-server-new/openhis-application/src/main/resources/i18n/messages.properties
@@ -1,53 +1,55 @@
-#错误消息
-not.null=* 必须填写
-user.jcaptcha.error=验证码错误
-user.jcaptcha.expire=验证码已失效
-user.not.exists=用户不存在/密码错误
-user.password.not.match=用户不存在/密码错误
-user.password.retry.limit.count=密码输入错误{0}次
-user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
-user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，请联系管理员
-role.blocked=角色已封禁，请联系管理员
-login.blocked=很遗憾，访问IP已被列入系统黑名单
-user.logout.success=退出成功
-length.not.valid=长度必须在{min}到{max}个字符之间
-user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
-user.password.not.valid=* 5-50个字符
-user.email.not.valid=邮箱格式错误
-user.mobile.phone.number.not.valid=手机号格式错误
-user.login.success=登录成功
-user.register.success=注册成功
-user.notfound=请重新登录
-user.forcelogout=管理员强制退出，请重新登录
-user.unknown.error=未知错误，请重新登录
-##文件上传消息
-upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
-upload.filename.exceed.length=上传的文件名最长{0}个字符
-##权限
-no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
-no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
-no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
-no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
-no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
-no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
-apl.common.M00001={0}添加成功
-apl.common.M00002={0}保存成功
-apl.common.M00003={0}已经存在
-apl.common.M00004={0}操作成功
-apl.common.M00005={0}删除成功
-apl.common.M00006=操作失败,该数据已被他人删除,请刷新后重试
-apl.common.M00007=操作失败,该数据已被他人更改,请刷新后重试
-apl.common.M00008=请勿重复提交
-apl.common.M00009=查询成功
-apl.common.M00010=操作失败,请联系管理员
-apl.chargeRefund.M00001=该收费单相关{0}已经发出，请先退药后再进行退费
-apl.payment.M00001=各缴费渠道实收金额合计不等于实收金额
-apl.payment.M00002=实收金额合计不等于应收金额
-apl.payment.M00003=请选择支付方式
-apl.payment.M00004=查询成功
-apl.payment.M00005=操作失败,请联系管理员
-apl.payment.M00006=成功收费
-apl.payment.M00007=未查询到收费项目
-apl.payment.M00008=未查询到{0}账户信息
-apl.payment.M00009=未查询到收费项目，不需要转换账户
\ No newline at end of file
+#\u9519\u8BEF\u6D88\u606F
+not.null=* \u5FC5\u987B\u586B\u5199
+user.jcaptcha.error=\u9A8C\u8BC1\u7801\u9519\u8BEF
+user.jcaptcha.expire=\u9A8C\u8BC1\u7801\u5DF2\u5931\u6548
+user.not.exists=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF
+user.password.not.match=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF
+user.password.retry.limit.count=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21
+user.password.retry.limit.exceed=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21\uFF0C\u5E10\u6237\u9501\u5B9A{1}\u5206\u949F
+user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88AB\u5220\u9664
+user.blocked=\u7528\u6237\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+login.blocked=\u5F88\u9057\u61BE\uFF0C\u8BBF\u95EEIP\u5DF2\u88AB\u5217\u5165\u7CFB\u7EDF\u9ED1\u540D\u5355
+user.logout.success=\u9000\u51FA\u6210\u529F
+length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4
+user.username.not.valid=* 2\u523020\u4E2A\u6C49\u5B57\u3001\u5B57\u6BCD\u3001\u6570\u5B57\u6216\u4E0B\u5212\u7EBF\u7EC4\u6210\uFF0C\u4E14\u5FC5\u987B\u4EE5\u975E\u6570\u5B57\u5F00\u5934
+user.password.not.valid=* 5-50\u4E2A\u5B57\u7B26
+user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF
+user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF
+user.login.success=\u767B\u5F55\u6210\u529F
+user.register.success=\u6CE8\u518C\u6210\u529F
+user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55
+user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55
+user.unknown.error=\u672A\u77E5\u9519\u8BEF\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55
+##\u6587\u4EF6\u4E0A\u4F20\u6D88\u606F
+upload.exceed.maxSize=\u4E0A\u4F20\u7684\u6587\u4EF6\u5927\u5C0F\u8D85\u51FA\u9650\u5236\u7684\u6587\u4EF6\u5927\u5C0F\uFF01<br/>\u5141\u8BB8\u7684\u6587\u4EF6\u6700\u5927\u5927\u5C0F\u662F\uFF1A{0}MB\uFF01
+upload.filename.exceed.length=\u4E0A\u4F20\u7684\u6587\u4EF6\u540D\u6700\u957F{0}\u4E2A\u5B57\u7B26
+##\u6743\u9650
+no.permission=\u60A8\u6CA1\u6709\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.create.permission=\u60A8\u6CA1\u6709\u521B\u5EFA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.update.permission=\u60A8\u6CA1\u6709\u4FEE\u6539\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.delete.permission=\u60A8\u6CA1\u6709\u5220\u9664\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.export.permission=\u60A8\u6CA1\u6709\u5BFC\u51FA\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+no.view.permission=\u60A8\u6CA1\u6709\u67E5\u770B\u6570\u636E\u7684\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u6DFB\u52A0\u6743\u9650 [{0}]
+apl.common.M00001={0}\u6DFB\u52A0\u6210\u529F
+apl.common.M00002={0}\u4FDD\u5B58\u6210\u529F
+apl.common.M00003={0}\u5DF2\u7ECF\u5B58\u5728
+apl.common.M00004={0}\u64CD\u4F5C\u6210\u529F
+apl.common.M00005={0}\u5220\u9664\u6210\u529F
+apl.common.M00006=\u64CD\u4F5C\u5931\u8D25,\u8BE5\u6570\u636E\u5DF2\u88AB\u4ED6\u4EBA\u5220\u9664,\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5
+apl.common.M00007=\u64CD\u4F5C\u5931\u8D25,\u8BE5\u6570\u636E\u5DF2\u88AB\u4ED6\u4EBA\u66F4\u6539,\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5
+apl.common.M00008=\u8BF7\u52FF\u91CD\u590D\u63D0\u4EA4
+apl.common.M00009=\u67E5\u8BE2\u6210\u529F
+apl.common.M00010=\u64CD\u4F5C\u5931\u8D25,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+apl.chargeRefund.M00001=\u8BE5\u6536\u8D39\u5355\u76F8\u5173{0}\u5DF2\u7ECF\u53D1\u51FA\uFF0C\u8BF7\u5148\u9000\u836F\u540E\u518D\u8FDB\u884C\u9000\u8D39
+apl.payment.M00001=\u5404\u7F34\u8D39\u6E20\u9053\u5B9E\u6536\u91D1\u989D\u5408\u8BA1\u4E0D\u7B49\u4E8E\u5B9E\u6536\u91D1\u989D
+apl.payment.M00002=\u5B9E\u6536\u91D1\u989D\u5408\u8BA1\u4E0D\u7B49\u4E8E\u5E94\u6536\u91D1\u989D
+apl.payment.M00003=\u8BF7\u9009\u62E9\u652F\u4ED8\u65B9\u5F0F
+apl.payment.M00004=\u67E5\u8BE2\u6210\u529F
+apl.payment.M00005=\u64CD\u4F5C\u5931\u8D25,\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+apl.payment.M00006=\u6210\u529F\u6536\u8D39
+apl.payment.M00007=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE
+apl.payment.M00008=\u672A\u67E5\u8BE2\u5230{0}\u8D26\u6237\u4FE1\u606F
+apl.payment.M00009=\u672A\u67E5\u8BE2\u5230\u6536\u8D39\u9879\u76EE\uFF0C\u4E0D\u9700\u8981\u8F6C\u6362\u8D26\u6237
+apl.adjustPrice.M00001=\u6267\u884C\u5931\u8D25\uFF0C\u672A\u52A0\u8F7D\u5230\u4EFB\u4F55\u6570\u636E\uFF01
+apl.adjustPrice.M00002=\u6267\u884C\u5931\u8D25\uFF0C\u6539\u4EF7\u5355\u4E2D\u6709\u6B63\u5728\u5BA1\u6838\u4E2D\u7684\u8D27\u54C1\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u65B0\u63D0\u4EA4\uFF01
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
new file mode 100644
index 00000000..0c74ce55
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/InventoryAdjustPriceMapper.xml
@@ -0,0 +1,77 @@
+<?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.InventoryAdjustPriceMapper">
+
+    <select id="selectReceiptPageByAdjustPrice"
+            resultType="com.openhis.web.inventorymanage.dto.InventoryAdjustPriceDto">
+        SELECT T2.supply_bus_no,
+               T2.status_enum,
+               T2.type_enum,
+               T2.approver_id,
+               T2.approval_time,
+               T2.applicant_id,
+               T2.apply_time,
+               T2.practitioner_id,
+               T2.tenant_id,
+               T2.category_enum
+        FROM (SELECT T1.bus_no AS supply_bus_no,
+                     T1.status_enum,
+                     T1.type_enum,
+                     T1.approver_id,
+                     T1.approval_time,
+                     T1.applicant_id,
+                     T1.apply_time,
+                     T1.practitioner_id,
+                     T1.tenant_id,
+                     T1.category_enum
+              FROM wor_supply_request AS T1
+              WHERE T1.status_enum IN (#{approval}, #{agree}, #{reject})
+                AND T1.delete_flag != '1'
+                AND T1.type_enum IN (#{medTypeEnum}
+                  , #{deviceTypeEnum}
+                  , #{activityTypeEnum}
+                  , #{healthTypeEnum})
+              GROUP BY T1.bus_no,
+                  T1.status_enum,
+                  T1.type_enum,
+                  T1.approver_id,
+                  T1.approval_time,
+                  T1.applicant_id,
+                  T1.apply_time,
+                  T1.practitioner_id,
+                  T1.tenant_id,
+                  T1.category_enum
+              ORDER BY T1.apply_time desc) AS T2
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="searchPageByExamine" resultType="com.openhis.web.adjustprice.dto.ChangePricePageDto">
+        select t2.bus_no,
+               t2.status_enum,
+               t2.approver_id,
+               t2.approval_time,
+               t2.applicant_id,
+               t2.applicant_time,
+               t2.create_time,
+               t2.item_category_enum,
+               t2.tenant_id
+        from (select t1.bus_no,
+                     t1.status_enum,
+                     t1.approver_id,
+                     t1.approval_time,
+                     t1.applicant_id,
+                     min(t1.applicant_time) as applicant_time,
+                     min(t1.create_time)    as create_time,
+                     t1.item_category_enum,
+                     t1.tenant_id
+              FROM adm_change_price_record t1
+              where t1.delete_flag = '0'
+                AND t1.status_enum IN (#{approval}, #{agree}, #{reject})
+                AND t1.item_category_enum IN (#{medCategory}, #{deviceCategory}, #{activityCategory}, #{healthCategory})
+              GROUP BY t1.bus_no, t1.status_enum, t1.approver_id, t1.approval_time, t1.applicant_id,
+                       t1.item_category_enum, t1.tenant_id
+              ORDER BY t1.bus_no 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/Inventorymanage/ProductDetailAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
new file mode 100644
index 00000000..18aedec2
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailAppMapper.xml
@@ -0,0 +1,324 @@
+<?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.ProductDetailAppMapper">
+
+    <select id="selectProductDetailsPage"
+            resultType="com.openhis.web.inventorymanage.dto.ProductDetailPageDto">
+        SELECT ii.inventory_id,
+               ii.production_date,
+               ii.expiration_date,
+               ii.remaining_days,
+               ii.inventory_status_enum,
+               ii.location_id,
+               ii.location_store_id,
+               ii.lot_number,
+               ii.quantity,
+               ii.supplier_id,
+               ii.item_table,
+               ii.item_name,
+               ii.bus_no,
+               ii.dev_category_code,
+               ii.med_category_code,
+               ii.chrgitm_lv,
+               ii.manufacturer_text,
+               ii.yb_no,
+               ii.wb_str,
+               ii.py_str,
+               ii.unit_code,
+               ii.min_unit_code,
+               ii.part_percent,
+               ii.approval_number,
+               ii.dose_form_code,
+               ii.total_volume,
+               ii.sale_price,
+               ii.charge_item_def_id,
+               ii.purchase_price,
+               ii.location_name,
+               ii.location_store_name,
+               ii.supplier_name
+        FROM (SELECT wii.id                                     AS inventory_id,
+                     wii.production_date,
+                     wii.expiration_date,
+                     (wii.expiration_date::date - CURRENT_DATE) AS remaining_days,
+                     wii.inventory_status_enum,
+                     wii.location_id,
+                     wii.location_store_id,
+                     wii.lot_number,
+                     wii.quantity,
+                     wii.supplier_id,
+                     wii.tenant_id,
+                     #{medMedicationDefinition}                 AS item_table,
+                     mmd."name"                                 AS item_name,
+                     mmd.bus_no,
+                     NULL                                       AS dev_category_code,
+                     mmd.category_code                          AS med_category_code,
+                     mmd.chrgitm_lv,
+                     mmd.manufacturer_text,
+                     mmd.yb_no,
+                     mmd.wb_str,
+                     mmd.py_str,
+                     mmd.unit_code,
+                     mmd.min_unit_code,
+                     mmd.part_percent,
+                     mmd.approval_number,
+                     mm.dose_form_code,
+                     mm.total_volume,
+                     acid.price                                 AS sale_price,
+                     acid.id                                    AS charge_item_def_id,
+                     acidd.amount                               AS purchase_price,
+                     al."name"                                  AS location_name,
+                     al2."name"                                 AS location_store_name,
+                     as2."name"                                 AS supplier_name
+              FROM wor_inventory_item wii
+                       LEFT JOIN med_medication_definition mmd
+                                 ON wii.item_id = mmd.id
+                                     AND mmd.delete_flag = '0'
+                       LEFT JOIN med_medication mm
+                                 ON mmd.id = mm.medication_def_id
+                                     AND mm.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition acid
+                                 ON wii.item_id = acid.instance_id
+                                     AND acid.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail acidd
+                                 ON acid.id = acidd.definition_id
+                                     AND acidd.condition_value = wii.lot_number
+                                     AND acidd.delete_flag = '0'
+                       LEFT JOIN adm_location al
+                                 ON wii.location_id = al.id
+                                     AND al.delete_flag = '0'
+                       LEFT JOIN adm_location al2
+                                 ON wii.location_store_id = al2.id
+                                     AND al2.delete_flag = '0'
+                       LEFT JOIN adm_supplier as2
+                                 ON wii.supplier_id = as2.id
+                                     AND as2.delete_flag = '0'
+              WHERE wii.item_table = #{medMedicationDefinition}
+                AND acidd.condition_code = #{lotNumberCost}
+                AND wii.delete_flag = '0'
+              UNION
+              SELECT wii.id                                     AS inventory_id,
+                     wii.production_date,
+                     wii.expiration_date,
+                     (wii.expiration_date::date - CURRENT_DATE) AS remaining_days,
+                     wii.inventory_status_enum,
+                     wii.location_id,
+                     wii.location_store_id,
+                     wii.lot_number,
+                     wii.quantity,
+                     wii.supplier_id,
+                     wii.tenant_id,
+                     #{admDeviceDefinition}                     AS item_table,
+                     add2."name"                                AS item_name,
+                     add2.bus_no,
+                     add2.category_code                         AS dev_category_code,
+                     NULL                                       AS med_category_code,
+                     add2.chrgitm_lv,
+                     add2.manufacturer_text,
+                     add2.yb_no,
+                     add2.wb_str,
+                     add2.py_str,
+                     add2.unit_code,
+                     add2.min_unit_code,
+                     add2.part_percent,
+                     add2.approval_number,
+                     NULL                                       AS dose_form_code,
+                     add2.size                                  AS total_volume,
+                     acid.price                                 AS sale_price,
+                     acid.id                                    AS charge_item_def_id,
+                     acidd.amount                               AS purchase_price,
+                     al."name"                                  AS location_name,
+                     al2."name"                                 AS location_store_name,
+                     as2."name"                                 AS supplier_name
+              FROM wor_inventory_item wii
+                       LEFT JOIN adm_device_definition add2
+                                 ON wii.item_id = add2.id
+                                     AND add2.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition acid
+                                 ON wii.item_id = acid.instance_id
+                                     AND acid.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail acidd
+                                 ON acid.id = acidd.definition_id
+                                     AND acidd.condition_code = #{lotNumberCost}
+                                     AND acidd.condition_value = wii.lot_number
+                                     AND acidd.delete_flag = '0'
+                       LEFT JOIN adm_location al
+                                 ON wii.location_id = al.id
+                                     AND al.delete_flag = '0'
+                       LEFT JOIN adm_location al2
+                                 ON wii.location_store_id = al2.id
+                                     AND al2.delete_flag = '0'
+                       LEFT JOIN adm_supplier as2
+                                 ON wii.supplier_id = as2.id
+                                     AND as2.delete_flag = '0'
+              WHERE wii.item_table = #{admDeviceDefinition}
+                AND acidd.condition_code = #{lotNumberCost}
+                AND wii.delete_flag = '0') AS ii
+            ${ew.customSqlSegment}
+        ORDER BY ii.py_str
+    </select>
+
+    <select id="selectProductDetailsPageX"
+            resultType="com.openhis.web.inventorymanage.dto.ProductDetailPageDto">
+        SELECT DISTINCT ii.inventory_id,
+                        ii.production_date,
+                        ii.expiration_date,
+                        ii.remaining_days,
+                        ii.inventory_status_enum,
+                        ii.location_id,
+                        ii.location_store_id,
+                        ii.lot_number,
+                        ii.quantity,
+                        ii.supplier_id,
+                        ii.item_table,
+                        ii.item_name,
+                        ii.bus_no,
+                        ii.dev_category_code,
+                        ii.med_category_code,
+                        ii.chrgitm_lv,
+                        ii.manufacturer_text,
+                        ii.yb_no,
+                        ii.wb_str,
+                        ii.py_str,
+                        ii.unit_code,
+                        ii.min_unit_code,
+                        ii.part_percent,
+                        ii.approval_number,
+                        ii.dose_form_code,
+                        ii.total_volume,
+                        ii.sale_price,
+                        ii.charge_item_def_id,
+                        ii.purchase_price,
+                        ii.location_name,
+                        ii.location_store_name,
+                        ii.supplier_name,
+                        sdd.dict_label  AS unitCode_dictText,
+                        sdd2.dict_label AS minUnitCode_dictText,
+                        sdd3.dict_label AS devCategoryCode_dictText,
+                        sdd4.dict_label AS doseFormCode_dictText,
+                        sdd5.dict_label AS medCategoryCode_dictText
+        FROM (SELECT wii.id                                     AS inventory_id,
+                     wii.production_date,
+                     wii.expiration_date,
+                     (wii.expiration_date::date - CURRENT_DATE) AS remaining_days,
+                     wii.inventory_status_enum,
+                     wii.location_id,
+                     wii.location_store_id,
+                     wii.lot_number,
+                     wii.quantity,
+                     wii.supplier_id,
+                     wii.tenant_id,
+                     #{medMedicationDefinition}                 AS item_table,
+                     mmd."name"                                 AS item_name,
+                     mmd.bus_no,
+                     NULL                                       AS dev_category_code,
+                     mmd.category_code                          AS med_category_code,
+                     mmd.chrgitm_lv,
+                     mmd.manufacturer_text,
+                     mmd.yb_no,
+                     mmd.wb_str,
+                     mmd.py_str,
+                     mmd.unit_code,
+                     mmd.min_unit_code,
+                     mmd.part_percent,
+                     mmd.approval_number,
+                     mm.dose_form_code,
+                     mm.total_volume,
+                     acid.price                                 AS sale_price,
+                     acid.id                                    AS charge_item_def_id,
+                     acidd.amount                               AS purchase_price,
+                     al."name"                                  AS location_name,
+                     al2."name"                                 AS location_store_name,
+                     as2."name"                                 AS supplier_name
+              FROM wor_inventory_item wii
+                       LEFT JOIN med_medication_definition mmd
+                                 ON wii.item_id = mmd.id
+                                     AND mmd.delete_flag = '0'
+                       LEFT JOIN med_medication mm
+                                 ON mmd.id = mm.medication_def_id
+                                     AND mm.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition acid
+                                 ON wii.item_id = acid.instance_id
+                                     AND acid.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail acidd
+                                 ON acid.id = acidd.definition_id
+                                     AND acidd.condition_value = wii.lot_number
+                                     AND acidd.delete_flag = '0'
+                       LEFT JOIN adm_location al
+                                 ON wii.location_id = al.id
+                                     AND al.delete_flag = '0'
+                       LEFT JOIN adm_location al2
+                                 ON wii.location_store_id = al2.id
+                                     AND al2.delete_flag = '0'
+                       LEFT JOIN adm_supplier as2
+                                 ON wii.supplier_id = as2.id
+                                     AND as2.delete_flag = '0'
+              WHERE wii.item_table = #{medMedicationDefinition}
+                AND acidd.condition_code = #{lotNumberCost}
+                AND wii.delete_flag = '0'
+              UNION
+              SELECT wii.id                                     AS inventory_id,
+                     wii.production_date,
+                     wii.expiration_date,
+                     (wii.expiration_date::date - CURRENT_DATE) AS remaining_days,
+                     wii.inventory_status_enum,
+                     wii.location_id,
+                     wii.location_store_id,
+                     wii.lot_number,
+                     wii.quantity,
+                     wii.supplier_id,
+                     wii.tenant_id,
+                     #{admDeviceDefinition}                     AS item_table,
+                     add2."name"                                AS item_name,
+                     add2.bus_no,
+                     add2.category_code                         AS dev_category_code,
+                     NULL                                       AS med_category_code,
+                     add2.chrgitm_lv,
+                     add2.manufacturer_text,
+                     add2.yb_no,
+                     add2.wb_str,
+                     add2.py_str,
+                     add2.unit_code,
+                     add2.min_unit_code,
+                     add2.part_percent,
+                     add2.approval_number,
+                     NULL                                       AS dose_form_code,
+                     add2.size                                  AS total_volume,
+                     acid.price                                 AS sale_price,
+                     acid.id                                    AS charge_item_def_id,
+                     acidd.amount                               AS purchase_price,
+                     al."name"                                  AS location_name,
+                     al2."name"                                 AS location_store_name,
+                     as2."name"                                 AS supplier_name
+              FROM wor_inventory_item wii
+                       LEFT JOIN adm_device_definition add2
+                                 ON wii.item_id = add2.id
+                                     AND add2.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_definition acid
+                                 ON wii.item_id = acid.instance_id
+                                     AND acid.delete_flag = '0'
+                       LEFT JOIN adm_charge_item_def_detail acidd
+                                 ON acid.id = acidd.definition_id
+                                     AND acidd.condition_code = #{lotNumberCost}
+                                     AND acidd.condition_value = wii.lot_number
+                                     AND acidd.delete_flag = '0'
+                       LEFT JOIN adm_location al
+                                 ON wii.location_id = al.id
+                                     AND al.delete_flag = '0'
+                       LEFT JOIN adm_location al2
+                                 ON wii.location_store_id = al2.id
+                                     AND al2.delete_flag = '0'
+                       LEFT JOIN adm_supplier as2
+                                 ON wii.supplier_id = as2.id
+                                     AND as2.delete_flag = '0'
+              WHERE wii.item_table = #{admDeviceDefinition}
+                AND acidd.condition_code = #{lotNumberCost}
+                AND wii.delete_flag = '0') AS ii
+                 LEFT JOIN sys_dict_data sdd ON ii.unit_code = sdd.dict_value AND sdd.dict_type = 'unit_code'
+                 LEFT JOIN sys_dict_data sdd2 ON ii.min_unit_code = sdd2.dict_value AND sdd2.dict_type = 'unit_code'
+                 LEFT JOIN sys_dict_data sdd3 ON ii.dev_category_code = sdd3.dict_value AND sdd3.dict_type = 'device_category_code'
+                 LEFT JOIN sys_dict_data sdd4 ON ii.dose_form_code = sdd4.dict_value AND sdd4.dict_type = 'dose_form_code'
+                 LEFT JOIN sys_dict_data sdd5 ON ii.med_category_code = sdd5.dict_value AND sdd5.dict_type = 'med_category_code'
+              ${ew.customSqlSegment}
+        ORDER BY ii.py_str
+    </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
deleted file mode 100644
index a23c4b9b..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ProductDetailsMapper.xml
+++ /dev/null
@@ -1,523 +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">
-        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-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
index 819b9364..0bf5f91f 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
@@ -15,6 +15,7 @@
                T2.practitioner_id,
                T2.item_table,
                T2.purpose_type_enum,
+               T2.category_enum,
                CASE
                    WHEN EXISTS (
                            SELECT 1
@@ -36,7 +37,8 @@
                      T1.practitioner_id,
                      T1.item_table,
                      T1.purpose_type_enum,
-                     T1.tenant_id
+                     T1.tenant_id,
+                     T1.category_enum
               FROM wor_supply_request AS T1
               WHERE type_enum = #{purchaseInventory}
                 AND T1.delete_flag = '0'
@@ -50,10 +52,11 @@
                        T1.practitioner_id,
                        T1.item_table,
                        T1.purpose_type_enum,
-                       T1.tenant_id
+                       T1.tenant_id,
+                       T1.category_enum
               ORDER BY T1.bus_no desc
-            ) AS T2
-        ${ew.customSqlSegment}
+             ) AS T2
+            ${ew.customSqlSegment}
     </select>
     <select id="selectDetail" resultType="com.openhis.web.inventorymanage.dto.ReceiptDetailDto">
         SELECT T1.id,
@@ -74,7 +77,11 @@
                T2."name" AS item_name,
                T2.id AS item_id,
                T2.part_percent,
+<<<<<<< HEAD
                T2.manufacturer_text AS manufacturer_text,
+=======
+               T2.manufacturer_text,
+>>>>>>> upstream/develop
                T3.total_volume,
                T5."name" AS practitioner_name,
                T6."name" AS purpose_location_name,
@@ -84,11 +91,13 @@
                T10."name" AS supplier_name,
                T1.occurrence_time,
                (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_inventory_item T9
+                WHERE T9.item_id = T1.item_id
+                  AND T9.location_id = T1.purpose_location_id
+               ) AS total_quantity,
+               T10."name" AS supplier_name
         FROM wor_supply_request T1
+<<<<<<< HEAD
             INNER JOIN med_medication_definition T2
                 ON T1.item_id = T2.id
             LEFT JOIN med_medication T3
@@ -104,8 +113,32 @@
                     AND T1.purpose_location_id = T9.location_id
             LEFT JOIN adm_supplier T10
                 ON T1.supplier_id = T10.id
+=======
+                 INNER 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 adm_practitioner T5
+                           ON T1.practitioner_id = T5.id
+                               AND T5.delete_flag = '0'
+                 LEFT JOIN adm_location T6
+                           ON T1.purpose_location_id = T6.id
+                               AND T6.delete_flag = '0'
+                 LEFT JOIN adm_location T7
+                           ON T1.purpose_location_store_id  = T7.id
+                               AND T7.delete_flag = '0'
+                 LEFT JOIN wor_inventory_item T9
+                           ON T1.item_id = T9.item_id
+                               AND T1.purpose_location_id = T9.location_id
+                               AND T9.delete_flag = '0'
+                 LEFT JOIN adm_supplier T10
+                           ON T1.supplier_id = T10.id
+                               AND T10.delete_flag = '0'
+>>>>>>> upstream/develop
         WHERE T1.bus_no = #{busNo}
-            AND T1.delete_flag = '0'
+          AND T1.delete_flag = '0'
         UNION
         SELECT T1.id,
                T1.bus_no,
@@ -125,7 +158,11 @@
                T8."name" AS item_name,
                T8.id AS item_id,
                T8.part_percent,
+<<<<<<< HEAD
                T8.manufacturer_text AS manufacturer_text,
+=======
+               T8.manufacturer_text,
+>>>>>>> upstream/develop
                T8."size" AS total_volume,
                T5."name" AS practitioner_name,
                T6."name" AS purpose_location_name,
@@ -138,6 +175,7 @@
                 FROM wor_inventory_item T9
                 WHERE T9.item_id = T1.item_id
                   AND T9.location_id = T1.purpose_location_id
+<<<<<<< HEAD
                ) AS total_quantity
         FROM wor_supply_request T1
             INNER JOIN adm_device_definition T8
@@ -245,28 +283,141 @@
                 WHERE T9.item_id = T1.item_id
                   AND T9.location_id = T1.purpose_location_id
                ) AS total_quantity
+=======
+               ) AS total_quantity,
+               T10."name" AS supplier_name
+>>>>>>> upstream/develop
         FROM wor_supply_request T1
                  INNER JOIN adm_device_definition T8
                             ON T1.item_id = T8.id
+                              AND T8.delete_flag = '0'
                  LEFT JOIN adm_practitioner T5
                            ON T1.practitioner_id = T5.id
+                            AND T5.delete_flag = '0'
                  LEFT JOIN adm_location T6
                            ON T1.purpose_location_id = T6.id
+                            AND T6.delete_flag = '0'
                  LEFT JOIN adm_location T7
                            ON T1.purpose_location_store_id  = T7.id
+                               AND T7.delete_flag = '0'
                  LEFT JOIN wor_inventory_item T9
                            ON T1.item_id = T9.item_id
                                AND T1.purpose_location_id = T9.location_id
+<<<<<<< HEAD
                  LEFT JOIN adm_supplier T10
                            ON T1.supplier_id = T10.id
+=======
+                                AND T9.delete_flag = '0'
+                 LEFT JOIN adm_supplier T10
+                           ON T1.supplier_id = T10.id
+                               AND T10.delete_flag = '0'
+        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
+>>>>>>> upstream/develop
         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'
+        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-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
index 2729cbd2..a57b5d95 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
@@ -146,7 +146,10 @@
                T2.applicant_id,
                T2.apply_time,
                T2.practitioner_id,
-               T2.tenant_id
+               T2.tenant_id,
+               T2.supplier_id,
+               T2.purpose_location_id,
+               T2.total_amount
         FROM (SELECT T1.bus_no AS supply_bus_no,
                      T1.status_enum,
                      T1.type_enum,
@@ -155,19 +158,34 @@
                      T1.applicant_id,
                      T1.apply_time,
                      T1.practitioner_id,
-                     T1.tenant_id
+                     T1.tenant_id,
+                     T1.supplier_id,
+                     T1.purpose_location_id,
+                     SUM ( T1.total_price ) as total_amount
               FROM wor_supply_request AS T1
+                   LEFT JOIN adm_supplier T3
+                       ON T3.id = T1.supplier_id
+                            AND T3.delete_flag = '0'
+                   LEFT JOIN adm_location T4
+                       ON T4.id = T1.purpose_location_id
+                           AND T4.delete_flag = '0'
               WHERE T1.status_enum IN (#{approval},#{agree},#{reject})
-                    AND T1.delete_flag != '1'
-              GROUP BY T1.bus_no,
-                       T1.status_enum,
-                       T1.type_enum,
-                       T1.approver_id,
-                       T1.approval_time,
-                       T1.applicant_id,
-                       T1.apply_time,
-                       T1.practitioner_id,
-                       T1.tenant_id
+                    AND T1.type_enum IN (#{productBatchTransfer},#{productTransfer},#{productReturn},#{productStocktaking},
+                        #{productBatchStocktaking},#{purchaseInventory},#{lossReportForm},#{issueInventory},#{returnIssue})
+                    AND T1.delete_flag = '0'
+              GROUP BY
+                  T1.bus_no,
+                  T1.status_enum,
+                  T1.type_enum,
+                  T1.approver_id,
+                  T1.approval_time,
+                  T1.applicant_id,
+                  T1.apply_time,
+                  T1.practitioner_id,
+                  T1.tenant_id,
+                  T1.summary_id,
+                  T1.supplier_id,
+                  T1.purpose_location_id
               ORDER BY T1.apply_time desc
              ) AS T2
             ${ew.customSqlSegment}
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
new file mode 100644
index 00000000..fd67328d
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/AdjustPriceMapper.xml
@@ -0,0 +1,95 @@
+<?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.adjustprice.mapper.AdjustPriceMapper">
+
+    <select id="selectInventoryReceiptPage"
+            resultType="com.openhis.web.inventorymanage.dto.ReceiptPageDto">
+        SELECT T2.supply_bus_no,
+               T2.status_enum,
+               T2.type_enum,
+               T2.supplier_id,
+               T2.approver_id,
+               T2.approval_time,
+               T2.applicant_id,
+               T2.create_time,
+               T2.practitioner_id,
+               T2.item_table,
+               T2.purpose_type_enum,
+               T2.category_enum,
+               CASE
+                   WHEN EXISTS(
+                           SELECT 1
+                           FROM wor_supply_request AS T3
+                           WHERE T3.original_bus_no = T2.supply_bus_no
+                             AND T3.delete_flag = '0'
+                       ) THEN 1
+                   ELSE 0
+                   END AS return_status, --退库状态
+               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,
+                     MIN(T1.create_time) AS create_time,
+                     T1.practitioner_id,
+                     T1.item_table,
+                     T1.purpose_type_enum,
+                     T1.tenant_id,
+                     T1.category_enum
+              FROM wor_supply_request AS T1
+              WHERE type_enum = #{medTypeEnum}
+                 OR type_enum = #{deviceTypeEnum}
+                 OR type_enum = #{activityTypeEnum}
+                 OR type_enum = #{healthTypeEnum}
+                  AND T1.delete_flag = '0'
+              GROUP BY T1.bus_no,
+                       T1.status_enum,
+                       T1.type_enum,
+                       T1.supplier_id,
+                       T1.approver_id,
+                       T1.approval_time,
+                       T1.applicant_id,
+                       T1.practitioner_id,
+                       T1.item_table,
+                       T1.purpose_type_enum,
+                       T1.tenant_id,
+                       T1.category_enum
+              ORDER BY T1.bus_no desc) AS T2
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="searchChangePriceDataToPage" resultType="com.openhis.web.adjustprice.dto.ChangePricePageDto">
+        select t2.bus_no,
+               t2.status_enum,
+               t2.approver_id,
+               t2.approval_time,
+               t2.applicant_id,
+               t2.applicant_time,
+               t2.create_time,
+               t2.item_category_enum,
+               t2.tenant_id
+        from (select t1.bus_no,
+                     t1.status_enum,
+                     t1.approver_id,
+                     min(t1.approval_time) as approval_time,
+                     t1.applicant_id,
+                     min(t1.applicant_time) as applicant_time,
+                     min(t1.create_time) as create_time,
+                     t1.item_category_enum,
+                     t1.tenant_id
+              FROM adm_change_price_record t1
+              where t1.delete_flag = '0'
+                and t1.applicant_id = #{applicantId}
+                and (item_category_enum = #{medCategory}
+                  OR item_category_enum = #{deviceCategory}
+                  OR item_category_enum = #{activityCategory}
+                  OR item_category_enum = #{healthCategory})
+              GROUP BY t1.bus_no, t1.status_enum, t1.approver_id, t1.applicant_id, t1.item_category_enum, t1.tenant_id
+              ORDER BY t1.bus_no 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/adjustprice/SupplyMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/SupplyMapper.xml
deleted file mode 100644
index edc0a494..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/adjustprice/SupplyMapper.xml
+++ /dev/null
@@ -1,9 +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.adjustprice.mapper.SupplyMapper">
-
-    <select id="searchAllSupplyList" resultType="com.openhis.web.adjustprice.dto.SupplyListDto">
-        SELECT id as supplyId,name as supplyName
-        FROM adm_supplier
-    </select>
-</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
index 6ce5ac7e..7612803d 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
@@ -77,6 +77,11 @@
                T1.unit_price,
                T1.total_price,
                mmr.prescription_no,
+               mmr.prescription_no,
+               mmr.method_code,
+               mmr.rate_code,
+               mmr.dose,
+               mmr.dose_unit_code,
                T1.bus_no,
                T1.entered_date,
                T1.account_id,
@@ -84,6 +89,7 @@
                T1.service_id,
                T5.enterer_id,
                T5.bill_date,
+               T5.id AS payment_id,
                T6.contract_no,
                T7.med_type_code,
                T8.contract_name,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
index df6ed970..5d028643 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRefundAppMapper.xml
@@ -43,7 +43,7 @@
     </resultMap>
     <select id="selectEncounterPatientPayment"
             resultType="com.openhis.web.chargemanage.dto.EncounterPatientPaymentDto">
-        SELECT T1.id,
+        SELECT T1.id AS payment_id,
                T1.status_enum,
                T1.relation_id,
                T1.payment_no,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
index c915f408..9069e8d3 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
@@ -52,6 +52,7 @@
                T9.contract_name,
                T9.patient_id,
                T9.patient_name,
+               T9.phone,
                T9.gender_enum,
                T9.id_card,
                T9.status_enum,
@@ -81,6 +82,7 @@
                         T7.contract_name   AS contract_name,
                         T8.id              AS patient_id,
                         T8.NAME            AS patient_name,
+                        T8.phone           AS phone,
                         T8.gender_enum     AS gender_enum,
                         T8.id_card         AS id_card,
                         T1.status_enum     AS status_enum,
@@ -91,6 +93,7 @@
                         T13.charge_item_ids,
                         T13.id             AS payment_id,
                         ai.picture_url     AS picture_url,
+<<<<<<< HEAD
                         T8.birth_date     AS birth_date,
                         -- 退号相关信息
                         T14.bill_date      AS return_date,
@@ -100,21 +103,33 @@
                         ABS(T14.display_amount) AS refund_amount,
                         T6.contract_no     AS contract_no,
                         T16.refund_method  AS refund_method
+=======
+                        T8.birth_date      AS birth_date
+>>>>>>> upstream/develop
                  FROM adm_encounter AS T1
                           LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
                           LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
                           LEFT JOIN (
-                             SELECT *
-                             FROM (
-                                      SELECT *,
-                                             ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
-                                      FROM adm_encounter_participant
-                                      WHERE delete_flag = '0'
-                                        AND tenant_id = 1
-                                        AND type_code = #{participantType}
-                                  ) t
-                             WHERE rn = 1
-                         ) AS T4 ON T1.ID = T4.encounter_id
+                     SELECT *
+                     FROM (
+                              SELECT *,
+                                     ROW_NUMBER() OVER (PARTITION BY encounter_id ORDER BY create_time ASC) AS rn
+                              FROM adm_encounter_participant
+                              WHERE delete_flag = '0'
+                                AND (
+                                      (type_code = #{participantType1} AND EXISTS(SELECT 1
+                                                                                  FROM adm_encounter AS T1
+                                                                                  WHERE T1.status_enum = #{statusEnum}
+                                                                                    AND T1.ID = encounter_id))
+                                      OR
+                                      (type_code = #{participantType2} AND NOT EXISTS(SELECT 1
+                                                                                      FROM adm_encounter AS T1
+                                                                                      WHERE T1.status_enum = #{statusEnum}
+                                                                                        AND T1.ID = encounter_id))
+                                  )
+                          ) t
+                     WHERE rn = 1
+                 ) AS T4 ON T1.ID = T4.encounter_id
                           LEFT JOIN adm_practitioner AS T5 ON T5.ID = T4.practitioner_id AND T5.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'
@@ -158,8 +173,6 @@
                                     ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0'
                  WHERE T1.delete_flag = '0'
                    AND T1.class_enum = #{classEnum}
---                    AND T1.create_time
---                      > CURRENT_DATE
                    AND T10.context_enum = #{register}
              ) AS T9
             ${ew.customSqlSegment}
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
index ece486d1..0169f66a 100644
--- 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
@@ -67,7 +67,7 @@
         ii.product_name,
         ii.unit_code,
         ii.min_unit_code,
-        ii.manufacturer,
+        ii.manufacturer_text,
         ii.volume,
         ii.supplier,
         ii.item_table_name,
@@ -87,7 +87,7 @@
         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,
+        T1.manufacturer_text ,
         T2.total_volume AS volume,
         T3."name" AS supplier,
         <choose>
@@ -147,7 +147,7 @@
         '' AS product_name,
         T1.unit_code AS unit_code,
         T1.min_unit_code AS min_unit_code,
-        T1.manufacturer_text AS manufacturer,
+        T1.manufacturer_text ,
         T1."size" AS volume,
         T2."name" AS supplier,
         <choose>
@@ -228,7 +228,7 @@
         FROM adm_device_definition AS T8
         WHERE T1.item_id = T8.id
         AND T8.delete_flag = '0')
-        ELSE null END AS manufacturer,--生产厂家
+        ELSE null END AS manufacturer_text,--生产厂家
         T6.name AS supplier_name
         FROM wor_inventory_item AS T1
         LEFT JOIN adm_location AS T2
@@ -332,179 +332,194 @@
 
     <select id="selectPrescriptionPrintInfo" resultMap="PrescriptionPrintInfoMap">
         SELECT ae.yb_class_enum AS encounter_yb_class,
-               mmr.prescription_no ,
-               fc.contract_name ,
-               ap."name" AS patient_name,
-               ap.gender_enum ,
-               ap.birth_date ,
-               ae.bus_no AS encounter_no,
-               ao."name" AS department_name,
-               ccd."name" AS condition_name,
-               ap.phone ,
-               mmr.req_authored_time AS req_time,
-               ap2."name" AS doctor_name,
-               ap3."name" AS dispense_doctor_name,
-               ap4."name" AS charge_doctor_name,
-               ap5."name" AS preparer_doctor_name,
-               mmd2."name" AS item_name,
-               mm.total_volume ,
-               mmr.dose ,
-               mmr.method_code ,
-               aci.unit_price ,
-               aci.total_price ,
-               mmr.quantity,
-               mmr.rate_code ,
-               mmr.unit_code ,
-               mmr.dose_unit_code,
-               mmr.sort_number,
-               mmr.group_id
+        mmr.prescription_no ,
+        fc.contract_name ,
+        ap."name" AS patient_name,
+        ap.gender_enum ,
+        ap.birth_date ,
+        ae.bus_no AS encounter_no,
+        ao."name" AS department_name,
+        ccd."name" AS condition_name,
+        ap.phone ,
+        mmr.req_authored_time AS req_time,
+        ap2."name" AS doctor_name,
+        ap3."name" AS dispense_doctor_name,
+        ap4."name" AS charge_doctor_name,
+        ap5."name" AS preparer_doctor_name,
+        mmd2."name" AS item_name,
+        mm.total_volume ,
+        mmr.dose ,
+        mmr.method_code ,
+        aci.unit_price ,
+        aci.total_price ,
+        mmr.quantity,
+        mmr.rate_code ,
+        mmr.unit_code ,
+        mmr.dose_unit_code,
+        mmr.sort_number,
+        mmr.group_id
         FROM med_medication_request mmr
-            LEFT JOIN med_medication_dispense mmd
-                ON mmd.med_req_id = mmr.id
-                    AND mmd.delete_flag = '0'
-            LEFT JOIN med_medication_definition mmd2
-                ON mmr.medication_id = mmd2.id
-                    AND mmd2.delete_flag = '0'
-            LEFT JOIN med_medication mm
-                ON mmd2.id = mm.medication_def_id
-                    AND mm.delete_flag = '0'
-            LEFT JOIN adm_charge_item aci
-                ON aci.service_id = mmr.id
-                    AND aci.delete_flag = '0'
-            LEFT JOIN cli_condition AS cc
-                ON mmr.condition_id = cc.id
-                    AND cc.delete_flag = '0'
-            LEFT JOIN cli_condition_definition AS ccd
-                ON cc.definition_id = ccd.id
-                    AND ccd.delete_flag = '0'
-            LEFT JOIN adm_encounter ae
-                ON mmr.encounter_id = ae.id
-                    AND ae.delete_flag = '0'
-            LEFT JOIN adm_patient ap
-                ON ae.patient_id = ap.id
-                    AND ap.delete_flag = '0'
-            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'
-            LEFT JOIN adm_practitioner ap2
-                ON ap2.id = mmr.practitioner_id
-                    AND ap2.delete_flag = '0'
-            LEFT JOIN adm_practitioner ap3
-                ON ap3.id = mmd.practitioner_id
-                    AND ap3.delete_flag = '0'
-            LEFT JOIN adm_practitioner ap4
-                ON ap4.id = aci.performer_id
-                    AND ap4.delete_flag = '0'
-            LEFT JOIN adm_practitioner ap5
-                ON ap5.id = mmd.preparer_id
-                    AND ap5.delete_flag = '0'
+        LEFT JOIN med_medication_dispense mmd
+        ON mmd.med_req_id = mmr.id
+        AND mmd.delete_flag = '0'
+        LEFT JOIN med_medication_definition mmd2
+        ON mmr.medication_id = mmd2.id
+        AND mmd2.delete_flag = '0'
+        LEFT JOIN med_medication mm
+        ON mmd2.id = mm.medication_def_id
+        AND mm.delete_flag = '0'
+        LEFT JOIN adm_charge_item aci
+        ON aci.service_id = mmr.id
+        AND aci.delete_flag = '0'
+        LEFT JOIN cli_condition AS cc
+        ON mmr.condition_id = cc.id
+        AND cc.delete_flag = '0'
+        LEFT JOIN cli_condition_definition AS ccd
+        ON cc.definition_id = ccd.id
+        AND ccd.delete_flag = '0'
+        LEFT JOIN adm_encounter ae
+        ON mmr.encounter_id = ae.id
+        AND ae.delete_flag = '0'
+        LEFT JOIN adm_patient ap
+        ON ae.patient_id = ap.id
+        AND ap.delete_flag = '0'
+        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'
+        LEFT JOIN adm_practitioner ap2
+        ON ap2.id = mmr.practitioner_id
+        AND ap2.delete_flag = '0'
+        LEFT JOIN adm_practitioner ap3
+        ON ap3.id = mmd.practitioner_id
+        AND ap3.delete_flag = '0'
+        LEFT JOIN adm_practitioner ap4
+        ON ap4.id = aci.performer_id
+        AND ap4.delete_flag = '0'
+        LEFT JOIN adm_practitioner ap5
+        ON ap5.id = mmd.preparer_id
+        AND ap5.delete_flag = '0'
         WHERE mmr.delete_flag = '0'
-            AND mmr.id IN
-            <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
-                #{requestId}
-            </foreach>
+        AND mmr.id IN
+        <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
+            #{requestId}
+        </foreach>
     </select>
     <select id="selectTreatmentPrintInfo" resultMap="TreatmentPrintInfoMap">
         SELECT ae.yb_class_enum AS encounter_yb_class,
-               fc.contract_name ,
-               ap."name" AS patient_name,
-               ap.gender_enum ,
-               ap.birth_date ,
-               ae.bus_no AS encounter_no,
-               ao."name" AS department_name,
-               ap.phone ,
-               ae.reception_time  AS req_time,
-               ap2."name" AS doctor_name,
-               aci.unit_price ,
-               aci.total_price,
-               wdr.quantity ,
-               wdr.unit_code ,
-               add2."name" AS item_name
+        fc.contract_name ,
+        ap."name" AS patient_name,
+        ap.gender_enum ,
+        ap.birth_date ,
+        ae.bus_no AS encounter_no,
+        ao."name" AS department_name,
+        ap.phone ,
+        ae.reception_time AS req_time,
+        ap2."name" AS doctor_name,
+        aci.unit_price ,
+        aci.total_price,
+        wdr.quantity ,
+        wdr.unit_code ,
+        add2."name" AS item_name
         FROM wor_device_request wdr
-            LEFT JOIN adm_device_definition add2
-                ON wdr.device_def_id  = add2.id
-                    AND add2.delete_flag = '0'
-            LEFT JOIN adm_charge_item aci
-                ON aci.service_id = wdr.id
-                    AND aci.delete_flag = '0'
-            LEFT JOIN adm_encounter ae
-                ON wdr.encounter_id = ae.id
-                    AND ae.delete_flag = '0'
-            LEFT JOIN adm_patient ap
-                ON ae.patient_id = ap.id
-                    AND ap.delete_flag = '0'
-            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'
-            LEFT JOIN adm_practitioner ap2
-                ON ap2.id = wdr.requester_id
-                    AND ap2.delete_flag = '0'
+        LEFT JOIN adm_device_definition add2
+        ON wdr.device_def_id = add2.id
+        AND add2.delete_flag = '0'
+        LEFT JOIN adm_charge_item aci
+        ON aci.service_id = wdr.id
+        AND aci.delete_flag = '0'
+        LEFT JOIN adm_encounter ae
+        ON wdr.encounter_id = ae.id
+        AND ae.delete_flag = '0'
+        LEFT JOIN adm_patient ap
+        ON ae.patient_id = ap.id
+        AND ap.delete_flag = '0'
+        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'
+        LEFT JOIN adm_practitioner ap2
+        ON ap2.id = wdr.requester_id
+        AND ap2.delete_flag = '0'
         WHERE wdr.delete_flag = '0'
-            AND wdr.id IN
-            <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
-                #{requestId}
-            </foreach>
+        AND wdr.id IN
+        <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
+            #{requestId}
+        </foreach>
         UNION
         SELECT ae.yb_class_enum AS encounter_yb_class,
-               fc.contract_name ,
-               ap."name" AS patient_name,
-               ap.gender_enum ,
-               ap.birth_date ,
-               ae.bus_no AS encounter_no,
-               ao."name" AS department_name,
-               ap.phone ,
-               ae.reception_time  AS req_time,
-               ap2."name" AS doctor_name,
-               aci.unit_price ,
-               aci.total_price,
-               wsr.quantity ,
-               wsr.unit_code ,
-               wad."name" AS item_name
+        fc.contract_name ,
+        ap."name" AS patient_name,
+        ap.gender_enum ,
+        ap.birth_date ,
+        ae.bus_no AS encounter_no,
+        ao."name" AS department_name,
+        ap.phone ,
+        ae.reception_time AS req_time,
+        ap2."name" AS doctor_name,
+        aci.unit_price ,
+        aci.total_price,
+        wsr.quantity ,
+        wsr.unit_code ,
+        wad."name" AS item_name
         FROM wor_service_request wsr
-            LEFT JOIN wor_activity_definition wad
-                ON wsr.activity_id  = wad.id
-                    AND wad.delete_flag = '0'
-            LEFT JOIN adm_charge_item aci
-                ON aci.service_id = wsr.id
-                    AND aci.delete_flag = '0'
-            LEFT JOIN adm_encounter ae
-                ON wsr.encounter_id = ae.id
-                    AND ae.delete_flag = '0'
-            LEFT JOIN adm_patient ap
-                ON ae.patient_id = ap.id
-                    AND ap.delete_flag = '0'
-            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'
-            LEFT JOIN adm_practitioner ap2
-                ON ap2.id = wsr.requester_id
-                    AND ap2.delete_flag = '0'
+        LEFT JOIN wor_activity_definition wad
+        ON wsr.activity_id = wad.id
+        AND wad.delete_flag = '0'
+        LEFT JOIN adm_charge_item aci
+        ON aci.service_id = wsr.id
+        AND aci.delete_flag = '0'
+        LEFT JOIN adm_encounter ae
+        ON wsr.encounter_id = ae.id
+        AND ae.delete_flag = '0'
+        LEFT JOIN adm_patient ap
+        ON ae.patient_id = ap.id
+        AND ap.delete_flag = '0'
+        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'
+        LEFT JOIN adm_practitioner ap2
+        ON ap2.id = wsr.requester_id
+        AND ap2.delete_flag = '0'
         WHERE wsr.delete_flag = '0'
-            AND wsr.id IN
-            <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
-                #{requestId}
-            </foreach>
+        AND wsr.id IN
+        <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
+            #{requestId}
+        </foreach>
+    </select>
+
+    <select id="getPractitionerSignature" resultType="string">
+        SELECT signature
+        FROM adm_practitioner
+        WHERE id = #{practitionerId}
+    </select>
+
+    <select id="getActivityDefinition" resultType="com.openhis.web.common.dto.ActivityDefinitionDto">
+        SELECT ID   AS
+                       activity_definition_id,
+               NAME AS activity_definition_name
+        FROM wor_activity_definition
+        WHERE delete_flag = '0'
+          AND status_enum = #{statusEnum}
     </select>
 
 </mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
index c6cd4b42..ca161cf9 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
@@ -85,9 +85,12 @@
             (   SELECT T4.amount
                 FROM adm_charge_item_definition T5
                 LEFT JOIN  adm_charge_item_def_detail T4 ON  T4.definition_id = T5.id
-                WHERE   T4.condition_code = '2'--2:采购价
+                WHERE   T4.condition_code in ('1','2')--2:采购价
                 AND T5.instance_id = T1.id
                 AND T5.instance_table = 'adm_device_definition'
+                AND T4.delete_flag='0'
+                ORDER BY T4.create_time desc
+                LIMIT 1
             ) as purchase_price,--购入价
             (   SELECT T4.amount
                 FROM adm_charge_item_definition T5
@@ -101,6 +104,7 @@
         <where>
             T1.delete_flag = '0'
             AND  T2.instance_table = 'adm_device_definition'
+
         </where>
         ORDER BY T1.bus_no
     ) AS T3
@@ -151,9 +155,12 @@
         (   SELECT T4.amount
         FROM adm_charge_item_definition T5
         LEFT JOIN  adm_charge_item_def_detail T4 ON  T4.definition_id = T5.id
-        WHERE   T4.condition_code = '2'--2:采购价
+        WHERE   T4.condition_code in ('1','2')--2:采购价
         AND T5.instance_id = T1.id
         AND T5.instance_table = 'adm_device_definition'
+        AND T4.delete_flag='0'
+        ORDER BY T4.create_time desc
+        LIMIT 1
         ) as purchase_price,--购入价
         (   SELECT T4.amount
         FROM adm_charge_item_definition T5
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
new file mode 100644
index 00000000..23b85ee4
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml
@@ -0,0 +1,28 @@
+<?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.ICDCodeMapper">
+    <select id="getCode" parameterType="java.util.Map"
+            resultType="com.openhis.web.datadictionary.dto.ICDCodeDto">
+
+        SELECT
+        id,
+        gl_no,
+        tenant_id,
+        delete_flag,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        gl_name,
+        icd10_no,
+        icd10_name,
+        FROM cli_condition_no_definition
+        <where>
+            gl_no = #{glNo}
+        </where>
+
+    </select>
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
index 88142847..21ba1920 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
@@ -150,9 +150,12 @@
         (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:采购价
+        WHERE T7.condition_code in('1','2')
         AND T5.instance_id = T2.medication_def_id
         AND T5.instance_table = 'med_medication_definition'
+        AND T7.delete_flag='0'
+        ORDER BY T7.create_time desc
+        LIMIT 1
         ) as purchase_price,--购入价
         (
         SELECT T7.amount
@@ -164,7 +167,7 @@
         ) 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 AND T5.delete_flag = '0'
         <where>
             T1.delete_flag = '0'
             AND T5.instance_table = 'med_medication_definition'
@@ -241,15 +244,19 @@
         T1.rx_flag,--处方标志
         T1.item_min_quantity,--最小库存警戒数量(常规单位)
         T1.item_max_quantity,--最大库存警戒数量(常规单位)
+        T1.dosage_instruction,
         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:采购价
+        WHERE T4.condition_code in ('1','2')--2:采购价
         AND T3.instance_id = T2.medication_def_id
         AND T3.instance_table = 'med_medication_definition'
+        AND T4.delete_flag='0'
+        ORDER BY T4.create_time desc
+        LIMIT 1
         ) as purchase_price,--购入价
         (
         SELECT T4.amount
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index 711a26e3..8ed55751 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -7,6 +7,7 @@
     <select id="getAdviceBaseInfo" resultType="com.openhis.web.doctorstation.dto.AdviceBaseDto">
         SELECT abi.tenant_id,
         abi.advice_type,
+        abi.bus_no,
         abi.category_code,
         abi.pharmacology_category_code,
         abi.part_percent,
@@ -39,8 +40,10 @@
         abi.advice_table_name,
         abi.position_id,
         abi.restricted_flag,
-        abi.restricted_scope
+        abi.restricted_scope,
+        abi.dosage_instruction
         from (
+<<<<<<< HEAD
         <!-- 改进SQL逻辑，确保所有情况都能正确处理，避免空的FROM子查询 -->
         <!-- 当adviceTypes包含4或不在1-3范围内时，或者adviceTypes为空/null时，查询所有类型 -->
         <choose>
@@ -401,6 +404,206 @@
                 </if>
             </otherwise>
         </choose>
+=======
+        <if test="adviceTypes == null or adviceTypes.contains(1)">
+            (SELECT
+            DISTINCT ON (T1.ID)
+            T1.tenant_id,
+            1 AS advice_type,
+            T1.bus_no AS bus_no,
+            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,
+            T3.id AS supplier_id,
+            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,
+            T1.dosage_instruction AS dosage_instruction
+            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' AND T5.status_enum = #{statusEnum}
+            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="adviceTypes == null or adviceTypes.contains(1)">
+            <if test="adviceTypes == null or adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
+        </if>
+
+        <if test="adviceTypes == null or adviceTypes.contains(2)">
+            (SELECT
+            DISTINCT ON (T1.ID)
+            T1.tenant_id,
+            2 AS advice_type,
+            T1.bus_no AS bus_no,
+            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,
+            T2.id AS supplier_id,
+            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,
+            '' AS dosage_instruction
+            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' AND T4.status_enum = #{statusEnum}
+            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.status_enum = #{statusEnum}
+            )
+        </if>
+
+
+        <if test="adviceTypes == null or adviceTypes.contains(2)">
+            <if test="adviceTypes == null or adviceTypes.contains(3)">UNION ALL</if>
+        </if>
+
+        <if test="adviceTypes == null or adviceTypes.contains(3)">
+            (SELECT
+            DISTINCT ON (T1.ID)
+            T1.tenant_id,
+            3 AS advice_type,
+            T1.bus_no AS bus_no,
+            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,
+            null AS supplier_id,
+            '' 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,
+            '' AS dosage_instruction
+            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' AND T2.status_enum = #{statusEnum}
+            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>
+>>>>>>> upstream/develop
         ) AS abi
         ${ew.customSqlSegment}
     </select>
@@ -492,6 +695,17 @@
           AND (CURRENT_TIME :: TIME ( 6 ) BETWEEN aol.start_time AND aol.end_time)
     </select>
 
+    <select id="getTakeDeviceLocationId" resultType="long">
+        SELECT aol.def_location_id AS location_id
+        FROM adm_organization_location AS aol
+                 INNER JOIN adm_encounter AS ae ON ae.organization_id = aol.organization_id
+        WHERE aol.delete_flag = '0'
+          AND aol.distribution_category_code = #{distributionCategoryCode}
+          AND ae.ID = #{encounterId}
+          AND aol.start_time &lt;= CURRENT_TIME
+          AND aol.end_time >= CURRENT_TIME
+    </select>
+
     <select id="getChildCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
         SELECT
         T1.definition_id,
@@ -524,7 +738,7 @@
         FROM
         adm_charge_item_definition
         WHERE
-        delete_flag = '0'
+        delete_flag = '0' AND status_enum = #{statusEnum}
         <if test="chargeItemDefinitionIdList != null and !chargeItemDefinitionIdList.isEmpty()">
             AND id IN
             <foreach collection="chargeItemDefinitionIdList" item="itemId" open="(" separator="," close=")">
@@ -537,6 +751,7 @@
         (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,
@@ -573,7 +788,7 @@
         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
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 0 AND T1.generate_source_enum = #{generateSourceEnum}
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
@@ -586,6 +801,7 @@
         (SELECT 2 AS advice_type,
         T1.id AS request_id,
         T1.id || '-2' AS unique_key,
+        '' AS prescription_no,
         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,
@@ -619,7 +835,7 @@
         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'
+        WHERE T1.delete_flag = '0' AND T1.generate_source_enum = #{generateSourceEnum}
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
@@ -632,6 +848,7 @@
         (SELECT 3 AS advice_type,
         T1.id AS request_id,
         T1.id || '-3' AS unique_key,
+        '' AS prescription_no,
         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,
@@ -665,7 +882,7 @@
         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'
+        WHERE T1.delete_flag = '0' AND T1.generate_source_enum = #{generateSourceEnum}
         AND T1.based_on_table is null
         AND T1.parent_id IS NULL
         AND T1.refund_service_id IS NULL
@@ -690,16 +907,56 @@
     </select>
 
     <select id="getActivityBindDevice" resultType="com.openhis.web.doctorstation.dto.ActivityBindDeviceDetailDto">
-        SELECT item_no    AS activity_id,
-               dev_act_id AS device_id,
-               quantity,
-               unit_code
-        FROM tmp_activity_device
-        WHERE delete_flag = '0'
-          AND status_enum = #{status}
-          AND type_code = '2'
-          AND dev_act_table = #{tableName}
-          AND item_no = #{activityId}
+        SELECT tcd.item_no    AS activity_id,
+               tcd.dev_act_id AS device_id,
+               tcd.quantity,
+               tcd.unit_code,
+               CASE
+                   WHEN tcd.unit_code = adde.min_unit_code THEN
+                       tcd.quantity
+                   ELSE tcd.quantity * adde.part_percent
+                   END        AS min_unit_code_quantity,
+               CASE
+                   WHEN tcd.unit_code = adde.min_unit_code THEN
+                       tcd.unit_code
+                   ELSE adde.min_unit_code
+                   END        AS min_unit_code
+        FROM tmp_activity_device AS tcd
+                 LEFT JOIN adm_device_definition AS adde ON adde.ID = CAST(tcd.dev_act_id AS BIGINT)
+            AND adde.delete_flag = '0'
+        WHERE tcd.delete_flag = '0'
+          AND tcd.status_enum = #{status}
+          AND tcd.type_code = '2'
+          AND tcd.dev_act_table = #{tableName}
+          AND tcd.item_no = #{activityId}
+    </select>
+
+    <select id="getOrderBindInfo" resultType="com.openhis.web.doctorstation.dto.OrderBindInfoDto">
+        SELECT tad.dev_act_id AS order_definition_id,
+               tad.quantity   AS quantity,
+               tad.unit_code  AS unit_code,
+               sdd.dict_label AS unit_code_name,
+               CASE
+                   WHEN tad.dev_act_table = 'adm_device_definition' THEN
+                       adm.NAME
+                   WHEN tad.dev_act_table = 'wor_activity_definition' THEN
+                       wor.NAME
+                   ELSE NULL
+                   END        AS order_definition_name
+        FROM tmp_activity_device AS tad
+                 LEFT JOIN adm_device_definition AS adm ON tad.dev_act_table = 'adm_device_definition'
+            AND tad.dev_act_id = adm.
+                ID
+                 LEFT JOIN wor_activity_definition AS wor ON tad.dev_act_table = 'wor_activity_definition'
+            AND tad.dev_act_id = wor.
+                ID
+                 LEFT JOIN sys_dict_data AS sdd ON sdd.dict_value = tad.unit_code
+            AND sdd.dict_type = 'unit_code'
+            AND sdd.status = '0'
+        WHERE tad.delete_flag = '0'
+          AND tad.status_enum = #{status}
+          AND tad.type_code = #{typeCode}
+          AND tad.item_no = #{itemNo}
     </select>
 
 </mapper>
\ No newline at end of file
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
index 1a6eb91e..ace99456 100644
--- 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
@@ -57,6 +57,7 @@
         T1.dispense_per_duration AS dispense_per_duration,
         T1.chinese_herbs_dose_quantity AS chinese_herbs_dose_quantity,
         T1.suffering_flag AS suffering_flag,
+        T1.dosage_instruction AS dosage_instruction,
         T2.part_percent AS part_percent,
         ccd.name AS condition_definition_name
         FROM med_medication_request AS T1
@@ -69,7 +70,7 @@
         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
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 1 AND T1.generate_source_enum = #{generateSourceEnum}
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
@@ -122,7 +123,7 @@
         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
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 1 AND T1.generate_source_enum = #{generateSourceEnum}
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
index 43777621..2eb0ee24 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
@@ -23,7 +23,8 @@
         T10.register_time,
         T10.reception_time,
         T10.practitioner_user_id,
-        T10.jz_practitioner_user_id
+        T10.jz_practitioner_user_id,
+        T10.bus_no
         from
         (
         SELECT T1.tenant_id AS tenant_id,
@@ -48,6 +49,7 @@
         T1.create_time AS register_time,
         T1.reception_time AS reception_time,
         T1.organization_id AS org_id,
+        T8.bus_no AS bus_no,
         CASE
         WHEN T9.patient_id IS NOT NULL THEN 1
         ELSE 0
@@ -59,6 +61,7 @@
         ON T1.ID = T4.encounter_id AND T4.type_code = #{participantType}
         AND T4.status_enum = #{activityStatus}
         AND T4.delete_flag = '0'
+        AND T1.status_enum = #{encounterStatus}
         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}
@@ -75,8 +78,11 @@
         T1.delete_flag = '0'
         <!-- 当前登录账号ID 和 当前登录账号所属的科室ID 用于控制数据权限 -->
         <if test="userId != null and currentUserOrganizationId != null">
-            AND ( T5.user_id = #{userId}
-            OR (T1.organization_id = #{currentUserOrganizationId}) )
+            AND (
+            (T4.encounter_id IS NOT NULL AND T5.user_id = #{userId})
+            OR
+            (T4.encounter_id IS NULL AND T1.organization_id = #{currentUserOrganizationId})
+            )
         </if>
         <if test="pricingFlag ==1">
             AND T1.status_enum != #{encounterStatus}
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
index d504c505..8efadbbb 100644
--- 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
@@ -33,7 +33,7 @@
             </foreach>
         </if>
         <if test="organizationId != null and organizationId != 0">
-            AND ddo.organization_id = #{organizationId} OR dd.use_range_enum = 1
+            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},'%')
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
deleted file mode 100644
index 12e119a1..00000000
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/InpatientMedicineCollectionMapper.xml
+++ /dev/null
@@ -1,258 +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.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-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
new file mode 100644
index 00000000..1198aee0
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
@@ -0,0 +1,279 @@
+<?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.MedicineSummaryAppMapper">
+    <resultMap id="MedicineDispenseFormMap" type="com.openhis.web.inhospitalnursestation.dto.MedicineDispenseFormDto">
+        <result property="encounterId" column="encounter_id"/>
+        <result property="skinTestFlag" column="skin_test_flag"/>
+        <result property="injectFlag" column="inject_flag"/>
+        <result property="tcmFlag" column="tcm_flag"/>
+        <result property="chineseHerbsDoseQuantity" column="chinese_herbs_dose_quantity"/>
+        <result property="sufferingFlag" column="suffering_flag"/>
+        <result property="adviceId" column="advice_id"/>
+        <result property="adviceName" column="advice_name"/>
+        <result property="itemId" column="item_id"/>
+        <result property="volume" column="volume"/>
+        <result property="lotNumber" column="lot_number"/>
+        <result property="quantity" column="quantity"/>
+        <result property="unitCode" column="unit_code"/>
+        <result property="methodCode" column="method_code"/>
+        <result property="rateCode" column="rate_code"/>
+        <result property="dose" column="dose"/>
+        <result property="doseUnitCode" column="dose_unit_code"/>
+        <result property="positionId" column="position_id"/>
+        <result property="positionName" column="position_name"/>
+        <result property="conditionDefinitionName" column="condition_definition_name"/>
+        <result property="therapyEnum" column="therapy_enum"/>
+        <result property="sortNumber" column="sort_number"/>
+        <result property="busNo" column="bus_no"/>
+        <result property="patientName" column="patient_name"/>
+        <result property="bedName" column="bed_name"/>
+        <result property="genderEnum" column="gender_enum"/>
+        <result property="birthDate" column="birth_date"/>
+        <result property="contractName" column="contract_name"/>
+        <result property="conditionNames" column="condition_names"/>
+        <result property="admittingDoctorName" column="admitting_doctor_name"/>
+        <result property="balanceAmount" column="balance_amount"/>
+        <collection property="medicineSummaryParamList" ofType="com.openhis.web.inhospitalnursestation.dto.MedicineSummaryParam">
+            <result property="procedureId" column="procedure_id"/>
+            <result property="dispenseId" column="dispense_id"/>
+            <result property="dispenseTime" column="planned_dispense_time"/>
+            <result property="dispenseStatus" column="dispense_status"/>
+        </collection>
+    </resultMap>
+    <select id="selectMedicineDispenseFormPage" resultMap="MedicineDispenseFormMap">
+        SELECT ii.encounter_id,
+               ii.skin_test_flag,
+               ii.inject_flag,
+               ii.group_id,
+               ii.tcm_flag,
+               ii.chinese_herbs_dose_quantity,
+               ii.suffering_flag,
+               ii.advice_id,
+               ii.advice_name,
+               ii.item_id,
+               ii.volume,
+               ii.lot_number,
+               ii.quantity,
+               ii.unit_code,
+               ii.method_code,
+               ii.rate_code,
+               ii.dose,
+               ii.dose_unit_code,
+               ii.position_id,
+               ii.position_name,
+               ii.condition_definition_name,
+               ii.therapy_enum,
+               ii.sort_number,
+               ii.bus_no,
+               ii.patient_name,
+               ii.bed_name,
+               ii.gender_enum ,
+               ii.birth_date ,
+               ii.patient_id,
+               ii.contract_name ,
+               ii.condition_names,
+               ii.admitting_doctor_name,
+               ii.balance_amount,
+               ii.dispense_id,
+               ii.planned_dispense_time,
+               ii.procedure_id,
+               ii.dispense_status
+        FROM (( SELECT T1.encounter_id,
+                       T1.tenant_id,
+                       T1.skin_test_flag AS skin_test_flag,
+                       T1.infusion_flag AS inject_flag,
+                       T1.group_id AS group_id,
+                       T1.tcm_flag,
+                       T1.chinese_herbs_dose_quantity,
+                       T1.suffering_flag,
+                       T1.id AS advice_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.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,
+                       ccd."name" AS condition_definition_name,
+                       T1.therapy_enum AS therapy_enum,
+                       T1.sort_number AS sort_number,
+                       ae.bus_no,
+                       ap."name" AS patient_name,
+                       al2."name" AS bed_name,
+                       ap.gender_enum ,
+                       ap.birth_date ,
+                       ap.id AS patient_id,
+                       fc.contract_name ,
+                       diagnosis.condition_names,
+                       pra."name" AS admitting_doctor_name,
+                       personal_account.balance_amount,
+                       mmd.id AS dispense_id,
+                       mmd.planned_dispense_time,
+                       mmd.procedure_id,
+                       mmd.status_enum AS dispense_status
+                FROM med_medication_request AS T1
+                    LEFT JOIN med_medication_dispense AS mmd
+                         ON T1.id = mmd.med_req_id
+                             AND mmd.delete_flag = '0'
+                             AND mmd.status_enum != #{summarized}
+                         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_encounter ae
+                                   ON ae.id = T1.encounter_id
+                                       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.id,
+                                            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.id,
+                                              aa.encounter_id,
+                                              aa.balance_amount
+                ) AS personal_account
+                                   ON personal_account.encounter_id = ae.id
+                WHERE T1.delete_flag = '0'
+                    AND T1.status_enum = #{completed}
+                    AND T1.refund_medicine_id IS NULL
+                    AND mmd.procedure_id IS NOT NULL
+                ORDER BY mmd.planned_dispense_time )) AS ii
+            ${ew.customSqlSegment}
+    </select>
+    <select id="selectMedicineSummaryFormPage"
+            resultType="com.openhis.web.inhospitalnursestation.dto.MedicineSummaryFormDto">
+    SELECT T1.bus_no ,
+           T1.apply_time ,
+           T1.applicant_id,
+           T1.status_enum ,
+           T1.dispense_time,
+           T1.receiver_id,
+           T1.applicant_name,
+           T1.receiver_name,
+           T1.location_name
+    FROM (
+        SELECT wsr.tenant_id,
+               wsr.bus_no ,
+               wsr.apply_time ,
+               wsr.applicant_id,
+               wsd.status_enum ,
+               wsd.receive_time AS dispense_time,
+               wsd.receiver_id,
+               ap."name" AS applicant_name,
+               ap2."name" AS receiver_name,
+               al."name" AS location_name
+        FROM wor_supply_request wsr
+            LEFT JOIN wor_supply_delivery wsd
+                ON wsr.id = wsd.request_id
+                    AND wsd.delete_flag = '0'
+            LEFT JOIN adm_practitioner ap
+                ON wsr.applicant_id = ap.id
+                    AND ap.delete_flag = '0'
+            LEFT JOIN adm_practitioner ap2
+                ON wsd.receiver_id = ap.id
+                    AND ap.delete_flag = '0'
+            LEFT JOIN adm_location al
+                ON wsr.source_location_id = al.id
+                    AND al.delete_flag = '0'
+        WHERE wsr.delete_flag = '0'
+            AND wsd.status_enum IN (#{inProgress}, #{completed})
+            AND wsr.type_enum = #{summaryDispense}
+        GROUP BY wsr.tenant_id,
+                 wsr.bus_no ,
+                 wsr.apply_time ,
+                 wsr.applicant_id,
+                 wsd.status_enum ,
+                 wsd.receive_time,
+                 wsd.receiver_id,
+                 ap."name",
+                 ap2."name",
+                 al."name"
+        ORDER BY wsr.bus_no DESC ) AS T1
+    ${ew.customSqlSegment}
+    </select>
+    <select id="selectMedicineSummaryFormDetail"
+            resultType="com.openhis.web.inhospitalnursestation.dto.MedicineSummaryInfoDto">
+        SELECT mmd."name" AS item_name,
+               mmd.unit_code ,
+               mmd.min_unit_code ,
+               mmd.part_percent ,
+               mm.total_volume ,
+               wsr.lot_number,
+               wsr.item_quantity
+        FROM wor_supply_request wsr
+            LEFT JOIN wor_supply_delivery wsd
+                ON wsr.id = wsd.request_id
+                    AND wsd.delete_flag = '0'
+            LEFT JOIN med_medication_definition mmd
+                ON wsr.item_id = mmd.id
+                    AND mmd.delete_flag = '0'
+            LEFT JOIN med_medication mm
+                ON mmd.id = mm.medication_def_id
+                    AND mm.delete_flag = '0'
+        WHERE wsr.delete_flag = '0'
+            AND wsr.bus_no = #{summaryNo}
+    </select>
+</mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
new file mode 100644
index 00000000..e8c452a8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml
@@ -0,0 +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.inhospitalnursestation.mapper.NurseBillingAppMapper">
+
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
new file mode 100644
index 00000000..fd82cb3c
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml
@@ -0,0 +1,69 @@
+<?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.OrgDeviceStockTakeAppMapper">
+    <select id="selectOrgDeviceInfo" resultType="com.openhis.web.inhospitalnursestation.dto.OrgDeviceDto">
+        SELECT ii.bus_no,              --单据号
+               ii.request_id,          --供应请求id
+               ii.dispense_id,         --供应发放id
+               ii.item_name,           --项目名
+               ii.item_id,             --项目id
+               ii.total_volume,        --规格
+               ii.lot_number,          --批号
+               ii.quantity,            --请求数
+               ii.part_percent,        --拆零比
+               ii.unit_code,           --单位
+               ii.unit_price,          --单价
+               ii.max_unit_code,       --常规单位
+               ii.min_unit_code,       --最小单位
+               ii.source_location_id,  --发放地点
+               ii.source_location_name,--发放地点名称
+               ii.org_id,              --申请科室
+               ii.org_name,            --申请科室名称
+               ii.requester_id,        --申请人
+               ii.requester_name,      --申请人名字
+               ii.manufacturer,        --生产厂商
+               ii.apply_time,          --请求开始时间
+               ii.status_enum          --状态
+        FROM (SELECT T1.tenant_id,
+                     T1.bus_no,--单据号
+                     T1.ID                AS request_id,--供应请求id
+                     T2.ID                AS dispense_id,--供应发放id
+                     T3.NAME              AS item_name,--项目名
+                     T3.ID                AS item_id,--项目id
+                     T3.SIZE              AS total_volume,--规格
+                     T1.lot_number,--批号
+                     T1.quantity,--请求数
+                     T3.part_percent,--拆零比
+                     T1.unit_code,--单位
+                     T8.unit_price,--单价
+                     T3.unit_code         AS max_unit_code,--常规单位
+                     T3.min_unit_code,--最小单位
+                     T1.perform_location  AS source_location_id,--发放地点
+                     T5.NAME              AS source_location_name,--发放地点名称
+                     T1.org_id,--申请科室
+                     T6.NAME              AS org_name,--申请科室名称
+                     T1.requester_id,--申请人
+                     T7.NAME              AS requester_name,--申请人名字
+                     T3.manufacturer_text AS manufacturer,--生产厂商
+                     T1.req_authored_time AS apply_time,--请求开始时间
+                     T1.status_enum--状态
+              FROM wor_device_request T1
+                       LEFT JOIN wor_device_dispense AS T2 ON T2.device_req_id = T1.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'
+                       LEFT JOIN adm_location AS T5 ON T1.perform_location = T5.ID
+                  AND T5.delete_flag = '0'
+                       LEFT JOIN adm_organization AS T6 ON T1.org_id = T6.ID
+                  AND T6.delete_flag = '0'
+                       LEFT JOIN adm_practitioner AS T7 ON T1.requester_id = T7.ID
+                  AND T7.delete_flag = '0'
+                       LEFT JOIN adm_charge_item AS T8 ON T1.id = T8.service_id
+                  AND T8.delete_flag = '0'
+              WHERE T1.delete_flag = '0') AS ii
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
new file mode 100644
index 00000000..a8fa5050
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioApplicationRecordAppMapper.xml
@@ -0,0 +1,155 @@
+<?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.nenu.mapper.GfRatioApplicationRecordAppMapper">
+
+    <select id="selectGfRatioApplicationRecordPage" resultType="com.openhis.web.nenu.dto.GfRatioApplicationRecordDto">
+        SELECT T.id
+             , T.application_no
+             , T.item_type
+             , T.application_ratio
+             , T.twice_ratio
+             , T.start_date
+             , T.end_date
+             , T.application_status
+             , T.applicant
+             , T.application_time
+             , T.application_reason
+             , T.initial_approver
+             , T.initial_approval_result
+             , T.initial_approval_time
+             , T.initial_approval_opinion
+             , T.finance_approver
+             , T.finance_approval_result
+             , T.finance_approval_time
+             , T.finance_approval_opinion
+             , T.final_recorder
+             , T.final_approval_result
+             , T.final_record_time
+             , T.final_approval_opinion
+             , T.definition_id
+             , T.bus_no
+             , T.name
+             , T.py_str
+             , T.wb_str
+             , T.yb_no
+        from (SELECT T1.id
+                   , T1.bus_no       AS application_no
+                   , T1.item_type
+                   , T1.application_ratio
+                   , T1.twice_ratio
+                   , T1.start_date
+                   , T1.end_date
+                   , T1.application_status
+                   , T1.applicant
+                   , T1.application_time
+                   , T1.application_reason
+                   , T1.initial_approver
+                   , T1.initial_approval_result
+                   , T1.initial_approval_time
+                   , T1.initial_approval_opinion
+                   , T1.finance_approver
+                   , T1.finance_approval_result
+                   , T1.finance_approval_time
+                   , T1.finance_approval_opinion
+                   , T1.final_recorder
+                   , T1.final_approval_result
+                   , T1.final_record_time
+                   , T1.final_approval_opinion
+                   , T1.definition_id
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.bus_no
+                         WHEN T1.item_type = 2 THEN T3.bus_no
+                         ELSE '' END AS bus_no
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2."name"
+                         WHEN T1.item_type = 2 THEN T3."name"
+                         ELSE '' END AS "name"
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.py_str
+                         WHEN T1.item_type = 2 THEN T3.py_str
+                         ELSE '' END AS py_str
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.wb_str
+                         WHEN T1.item_type = 2 THEN T3.wb_str
+                         ELSE '' END AS wb_str
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.yb_no
+                         WHEN T1.item_type = 2 THEN T3.yb_no
+                         ELSE '' END AS yb_no
+                   , T1.tenant_id
+                   , T1.delete_flag
+                   , T1.create_by
+                   , T1.create_time
+                   , T1.update_by
+                   , T1.update_time
+              FROM nenu_gf_ratio_application T1
+                       LEFT JOIN med_medication_definition T2
+                                 ON T2.id = T1.definition_id
+                       LEFT JOIN wor_activity_definition T3
+                                 ON T3.id = T1.definition_id
+              WHERE T1.delete_flag = '0'
+              ORDER BY T1.id DESC) AS T
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectGfRatioApplicationDefinitionSelectPage"
+            resultType="com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto">
+        SELECT T.id
+        , T.bus_no
+        , T."name"
+        , T.yb_no
+        , T.chrgitm_lv
+        , T.py_str
+        , T.wb_str
+        , T.manufacturer_text
+        , T.total_volume
+        , T.tenant_id
+        , T.delete_flag
+        , T.create_by
+        , T.create_time
+        , T.update_by
+        , T.update_time
+        from (SELECT T1.id
+        , T1.bus_no
+        , T1."name"
+        , T1.yb_no
+        , T1.chrgitm_lv
+        , T1.py_str
+        , T1.wb_str
+        <choose>
+            <when test="itemType == 1">
+                , T1.manufacturer_text
+                , T2.total_volume
+            </when>
+            <otherwise>
+                , '' AS manufacturer_text
+                , '' AS total_volume
+            </otherwise>
+        </choose>
+        , T1.tenant_id
+        , T1.delete_flag
+        , T1.create_by
+        , T1.create_time
+        , T1.update_by
+        , T1.update_time
+        FROM
+        <choose>
+            <when test="itemType == 1">
+                med_medication_definition T1
+                LEFT JOIN med_medication T2
+                ON T2.medication_def_id = T1.id
+            </when>
+            <when test="itemType == 2">
+                wor_activity_definition T1
+            </when>
+            <otherwise>
+                wor_activity_definition T1
+            </otherwise>
+        </choose>
+        WHERE T1.delete_flag = '0'
+        ORDER BY T1.bus_no) AS T
+        ${ew.customSqlSegment}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
new file mode 100644
index 00000000..086edffc
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfRatioManageAppMapper.xml
@@ -0,0 +1,73 @@
+<?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.nenu.mapper.GfRatioManageAppMapper">
+
+    <select id="selectGfIndividualRatioPage" resultType="com.openhis.web.nenu.dto.GfIndividualRatioDto">
+        SELECT T.id
+             , T.item_type
+             , T.self_ratio
+             , T.twice_ratio
+             , T.start_date
+             , T.end_date
+             , T.bus_no
+             , T.name
+             , T.py_str
+             , T.wb_str
+             , T.yb_no
+             , T.chrgitm_lv
+             , T.tenant_id
+             , T.delete_flag
+             , T.create_by
+             , T.create_time
+             , T.update_by
+             , T.update_time
+        from (SELECT T1.id
+                   , T1.item_type
+                   , T1.self_ratio
+                   , T1.twice_ratio
+                   , T1.start_date
+                   , T1.end_date
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.bus_no
+                         WHEN T1.item_type = 2 THEN T3.bus_no
+                         ELSE '' END AS bus_no
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2."name"
+                         WHEN T1.item_type = 2 THEN T3."name"
+                         ELSE '' END AS "name"
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.py_str
+                         WHEN T1.item_type = 2 THEN T3.py_str
+                         ELSE '' END AS py_str
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.wb_str
+                         WHEN T1.item_type = 2 THEN T3.wb_str
+                         ELSE '' END AS wb_str
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.yb_no
+                         WHEN T1.item_type = 2 THEN T3.yb_no
+                         ELSE '' END AS yb_no
+                   , CASE
+                         WHEN T1.item_type = 1 THEN T2.chrgitm_lv
+                         WHEN T1.item_type = 2 THEN T3.chrgitm_lv
+                         ELSE 0 END  AS chrgitm_lv
+                   , T1.tenant_id
+                   , T1.delete_flag
+                   , T1.create_by
+                   , T1.create_time
+                   , T1.update_by
+                   , T1.update_time
+              FROM nenu_gf_ratio T1
+                       LEFT JOIN med_medication_definition T2
+                                 ON T2.id = T1.definition_id
+                       LEFT JOIN wor_activity_definition T3
+                                 ON T3.id = T1.definition_id
+              WHERE T1.delete_flag = '0'
+                AND T1.ratio_type = 2
+              ORDER BY T1.id DESC) AS T
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml
new file mode 100644
index 00000000..1af616d8
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.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.nenu.mapper.GfStudentListAppMapper">
+
+    <select id="selectGfStudentListPage" resultType="com.openhis.web.nenu.dto.GfStudentListDto">
+        SELECT T.id
+             , T.name
+             , T.py_str
+             , T.wb_str
+             , T.gender
+             , T.age
+             , T.student_id
+             , T.id_number
+             , T.phone
+             , T.college
+             , T.major
+             , T.education_level
+             , T.enrollment_date
+             , T.graduation_date
+             , T.grade
+             , T.study_mode
+             , T.student_status
+             , T.physical_exam_result
+             , T.counselor
+             , T.counselor_phone
+             , T.patient_id
+             , T.tenant_id
+             , T.delete_flag
+             , T.create_by
+             , T.create_time
+             , T.update_by
+             , T.update_time
+        from (SELECT T1.id
+                   , T1.name
+                   , T1.py_str
+                   , T1.wb_str
+                   , T1.gender
+                   , T1.age
+                   , T1.student_id
+                   , T1.id_number
+                   , T1.phone
+                   , T1.college
+                   , T1.major
+                   , T1.education_level
+                   , T1.enrollment_date
+                   , T1.graduation_date
+                   , T1.grade
+                   , T1.study_mode
+                   , T1.student_status
+                   , T1.physical_exam_result
+                   , T1.counselor
+                   , T1.counselor_phone
+                   , T1.patient_id
+                   , T1.tenant_id
+                   , T1.delete_flag
+                   , T1.create_by
+                   , T1.create_time
+                   , T1.update_by
+                   , T1.update_time
+              FROM adm_patient_student AS T1
+              WHERE T1.delete_flag = '0'
+              ORDER BY T1.id DESC) AS T
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
\ No newline at end of file
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
index 9aa0af87..d930e55c 100644
--- 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
@@ -10,8 +10,7 @@
                ii.patient_name,
                ii.patient_py_str,
                ii.patient_wb_str,
-               ii.birth_date,
-               ii.status_enum
+               ii.birth_date
         FROM (
                  SELECT T1.tenant_id,
                         T1.id     AS encounter_id,
@@ -21,8 +20,7 @@
                         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
+                        T2.birth_date
                  FROM adm_encounter AS T1
                           INNER JOIN adm_patient AS T2
                                      ON T1.patient_id = T2.id
@@ -32,6 +30,7 @@
                                          AND T3.refund_service_id IS NULL
                                          AND T3.delete_flag = '0'
                  WHERE T1.class_enum = #{amb}
+                   AND T3.status_enum IN (#{completed},#{cancelled})
                    AND T1.delete_flag = '0'
                  GROUP BY T1.tenant_id,
                           T1.id,
@@ -41,8 +40,7 @@
                           T2.name,
                           T2.py_str,
                           T2.wb_str,
-                          T2.birth_date,
-                          T3.status_enum
+                          T2.birth_date
                  ORDER BY T1.bus_no DESC
              ) AS ii
             ${ew.customSqlSegment}
@@ -245,7 +243,7 @@
                ap.gender_enum,
                ap.birth_date,
                wad.NAME                     AS activity_name,
-               SUBSTRING(wad.bus_no FROM 3) AS bus_no,
+               SUBSTRING(wsr.bus_no FROM 3) AS bus_no,
                aper.name                    AS practitioner_name,
                ao.name                      AS org_name
         FROM wor_service_request AS wsr
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
new file mode 100644
index 00000000..e351aa05
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/ChangePriceMapper.xml
@@ -0,0 +1,11 @@
+<?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.ChangePriceMapper">
+    <!-- 查询药品信息集合 -->
+    <select id="searchMedicationList" resultType="com.openhis.medication.domain.MedicationDefinition">
+        SELECT *
+        FROM med_medication_definition medication_def
+--                  INNER JOIN med_medication medication ON medication_def.id = medication.medication_def_id
+--         where medication.id = #{medicationId} and (name_en like '%ac%' or py_str like '%ac%');
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
index a0b6bf02..ee3cef8c 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/paymentmanage/PaymentMapper.xml
@@ -4,63 +4,65 @@
 
     <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,
-               T1.returned_amount,
-               T1.display_amount,
-               T1.print_count,
-               T1.bill_date,
-               T1.encounter_id,
-               T1.yb_clear_flag,
-               T1.yb_settle_ids,
-               T1.enterer_name,
-               T1.patient_name,
-               T1.invoice_id,
-               T1.bill_no as invoice_no,
-               T1.encounter_bus_no
+        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,
+        T1.returned_amount,
+        T1.display_amount,
+        T1.print_count,
+        T1.bill_date,
+        T1.encounter_id,
+        T1.yb_clear_flag,
+        T1.yb_settle_ids,
+        T1.enterer_name,
+        T1.patient_name,
+        T1.invoice_id,
+        T1.bill_no as invoice_no,
+        T1.invoice_status,
+        T1.encounter_bus_no
         FROM (SELECT t.id,
-                     t.relation_id,
-                     t.status_enum,
-                     t.payment_no,
-                     t.payment_enum,
-                     t.enterer_id,
-                     t.kind_enum,
-                     pra.name     AS enterer_name,
-                     t.patient_id,
-                     patient.name AS patient_name,
-                     t.outcome_enum,
-                     t.tendered_amount,
-                     t.returned_amount,
-                     t.display_amount,
-                     t.bill_date,
-                     t.print_count,
-                     t.encounter_id,
-                     invoice.id   AS invoice_id,
-                     invoice.bill_no,
-                     t.yb_clear_flag,
-                     t.yb_settle_ids,
-                     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'
-                AND t.kind_enum = #{kindEnum}
-              <if test="invoiceNo != null and !invoiceNo.empty">
-                AND invoice.bill_no = #{invoiceNo}
-              </if>
-              ORDER BY t.create_time DESC) as T1
-            ${ew.customSqlSegment}
+        t.relation_id,
+        t.status_enum,
+        t.payment_no,
+        t.payment_enum,
+        t.enterer_id,
+        t.kind_enum,
+        pra.name AS enterer_name,
+        t.patient_id,
+        patient.name AS patient_name,
+        t.outcome_enum,
+        t.tendered_amount,
+        t.returned_amount,
+        t.display_amount,
+        t.bill_date,
+        t.print_count,
+        t.encounter_id,
+        invoice.id AS invoice_id,
+        invoice.bill_no,
+        case when invoice.bill_no is not null then 1 else 0 end as invoice_status,
+        t.yb_clear_flag,
+        t.yb_settle_ids,
+        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'
+        AND t.kind_enum = #{kindEnum}
+        <if test="invoiceNo != null and !invoiceNo.empty">
+            AND invoice.bill_no = #{invoiceNo}
+        </if>
+        ORDER BY t.create_time DESC) as T1
+        ${ew.customSqlSegment}
     </select>
     <select id="getPaymentDetailList" resultType="com.openhis.yb.dto.PaymentDetailDto">
         SELECT id,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
index d950a6d6..496db5ea 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml
@@ -38,6 +38,12 @@
         togpd.quantity,
         togpd.unit_code,
         sdd.dict_label AS unit_code_name,
+        togpd.dose,
+        togpd.rate_code,
+        togpd.method_code,
+        togpd.dose_quantity,
+        togpd.group_id,
+        togpd.dispense_per_duration,
         CASE
         WHEN togpd.order_definition_table = 'med_medication_definition' THEN
         med.NAME
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
index 26ef59da..7e484898 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicalDeviceDispenseMapper.xml
@@ -19,43 +19,7 @@
                       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,
-                      T2.birth_date,
-                      T3.name AS department_name,
-                      T4.status_enum
-               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>
-               UNION
-               SELECT T1.tenant_id,
-                      T1.id AS encounter_id,
-                      T1.bus_no AS encounter_no,
-                      T1.reception_time,
-                      T1.organization_id AS department_id,
+                      T1.class_enum,
                       T2.gender_enum,
                       T2.name AS patient_name,
                       T2.wb_str AS patient_wb_str,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
index 8d1c3686..06741892 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/MedicationDetailsMapper.xml
@@ -25,7 +25,7 @@
                A.refund_unit_code,
                A.dispense_time,
                A.location_id,
-               A.tenant_id
+               A.item_table
         from (
                  WITH refund_info AS (
                      SELECT mmr.refund_medicine_id,
@@ -83,7 +83,8 @@
                         ri.total_price       AS refund_price,
                         wii.supplier_id,
                         sup.name             AS supplier_name,
-                        mmd.tenant_id
+                        mmd.tenant_id,
+                        #{medMedicationDefinition} AS item_table
                  FROM med_medication_dispense mmd
                           LEFT JOIN med_medication_request mmr
                                     ON mmd.med_req_id = mmr.id
@@ -117,7 +118,7 @@
                  WHERE mmd.status_enum = #{completed}
                    AND mmr.status_enum = #{agree}
                    <if test="flg != 1">
-                       AND mmd.dispense_enum = #{amb}
+                       AND ae.class_enum = #{amb}
                    </if>
                    AND mmd.delete_flag = '0'
                  UNION
@@ -145,7 +146,8 @@
                         ri.total_price       AS refund_price,
                         wii.supplier_id,
                         sup.name             AS supplier_name,
-                        mmd.tenant_id
+                        mmd.tenant_id,
+                        #{admDeviceDefinition} AS item_table
                  FROM wor_device_dispense mmd
                       LEFT JOIN wor_device_request mmr
                              ON mmd.device_req_id = mmr.id
@@ -179,17 +181,17 @@
                  WHERE mmd.status_enum = #{completed}
                    AND mmr.status_enum = #{agree}
                    <if test="flg != 1">
-                     AND mmd.dispense_category_enum = #{amb}
+                     AND ae.class_enum = #{amb}
                    </if>
                    AND mmd.delete_flag = '0'
              ) AS A
             ${ew.customSqlSegment}
         <choose>
             <when test="dispenseEnum == 1">
-                ORDER BY A.practitioner_name, A.dispense_time DESC
+                ORDER BY A.dispense_time DESC
             </when>
             <when test="dispenseEnum == 2">
-                ORDER BY A.outpatient_no, A.prescription_no
+                ORDER BY A.outpatient_no DESC, A.prescription_no DESC
             </when>
         </choose>
     </select>
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
index 40f6b351..a436d1c2 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/ReturnMedicineMapper.xml
@@ -63,7 +63,7 @@
         ORDER BY ii.reception_time DESC
     </select>
     <select id="selectInventoryInfoList"
-            resultType="com.openhis.web.pharmacymanage.dto.InventoryDto">
+            resultType="com.openhis.web.pharmacymanage.dto.UnDispenseInventoryDto">
         <choose>
         <when test="(medDispenseIdList != null and !medDispenseIdList.isEmpty())
                   or (devDispenseIdList != null and !devDispenseIdList.isEmpty())">
@@ -72,6 +72,8 @@
                 T1.id AS dispense_id,
                 T1.unit_code AS dispense_unit,
                 T1.quantity,
+                T1.location_id,
+                T1.lot_number,
                 T1.dispense_quantity,
                 T2.id AS inventory_id,
                 T2.unit_code AS inventory_unit_code,
@@ -106,6 +108,8 @@
                 T4.id AS dispense_id,
                 T4.unit_code AS dispense_unit,
                 T4.quantity,
+                T4.location_id,
+                T4.lot_number,
                 T4.dispense_quantity,
                 T2.id AS inventory_id,
                 T2.unit_code AS inventory_unit_code,
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
index cc5c866e..eb91104f 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/SummaryDispenseMedicineMapper.xml
@@ -88,9 +88,9 @@
                        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}
+              WHERE T1.item_table = 'med_medication_definition'
+                AND T1.type_enum = 23
+                AND T1.category_enum = 21
                 AND T1.delete_flag = '0'
               GROUP BY T1.tenant_id,
                        T1.bus_no,
@@ -113,325 +113,72 @@
                        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
+              ) 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.InpatientMedicineSummaryInfoDtoryInfoDto 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.MedicineSummaryInfoDtoECT 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>-->
-
+    <select id="selectOrderInfo" resultType="com.openhis.web.pharmacymanage.dto.MedicineSummaryDto">
+        SELECT
+            li.bus_no,--单据号
+            li.request_id,--供应请求id
+            li.delivery_id,--供应发放id
+            li.item_table,--项目表
+            li.item_name,--项目名
+            li.item_id,--项目id
+            li.total_volume,--规格
+            li.lot_number,--批号
+            li.quantity,--请求数
+            li.unit_code,--单位
+            li.max_unit_code,--常规单位
+            li.min_unit_code,--最小单位
+            li.source_location_id,--发放地点
+            li.source_location_name,
+            li.org_id,--申请科室
+            li.org_name,
+            li.applicant_id,--领药人
+            li.applicant_name,
+            li.apply_time,--申请时间
+            li.status_enum--状态
+        FROM
+            (
+                SELECT
+                    wsr.tenant_id,
+                    wsr.bus_no,--单据号
+                    wsd.request_id,--供应请求id
+                    wsd.id AS delivery_id,--供应发放id
+                    wsr.item_table,--项目表
+                    mmd.name AS item_name,--项目名
+                    wsr.item_id,--项目id
+                    mm.total_volume,--规格
+                    wsr.lot_number,--批号
+                    wsr.item_quantity AS quantity,--请求数
+                    wsr.unit_code,--单位
+                    mmd.unit_code AS max_unit_code,--常规单位
+                    mmd.min_unit_code,--最小单位
+                    wsr.source_location_id,--发放地点
+                    al.name AS source_location_name,
+                    ao.id AS org_id,--申请科室
+                    ao.name AS org_name,
+                    wsr.applicant_id,--领药人
+                    ap.name AS applicant_name,
+                    wsr.apply_time,--申请时间
+                    wsr.status_enum --状态
+                FROM
+                    wor_supply_request AS wsr
+                        LEFT JOIN adm_practitioner AS ap ON wsr.applicant_id = ap.ID
+                        AND ap.delete_flag = '0'
+                        LEFT JOIN wor_supply_delivery AS wsd ON wsd.request_id = wsr.ID
+                        AND wsd.delete_flag = '0'
+                        LEFT JOIN med_medication_definition AS mmd ON wsd.item_id = mmd.ID
+                        AND mmd.delete_flag = '0'
+                        LEFT JOIN med_medication AS mm ON mmd.ID = mm.medication_def_id
+                        AND mm.delete_flag = '0'
+                        LEFT JOIN adm_location AS al ON wsr.source_location_id = al.ID
+                        AND al.delete_flag = '0'
+                        LEFT JOIN adm_organization AS ao ON wsr.purpose_location_id = ao.ID
+                        AND ao.delete_flag = '0'
+                WHERE wsr.delete_flag = '0'
+            ) AS li
+            ${ew.customSqlSegment}
+    </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
index cc779a83..298dcbe6 100644
--- 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
@@ -50,43 +50,6 @@
               <if test="statusEnum == 4">
                   T4.status_enum = #{completed}
               </if>
-        UNION
-        SELECT T1.tenant_id,
-               T1.id AS encounter_id,
-               T1.bus_no AS encounter_no,
-               T1.reception_time,
-               T1.organization_id AS department_id,
-               T1.class_enum,
-               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,
-               T2.birth_date,
-               T3.name AS department_name,
-               T4.status_enum
-        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 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},#{prepared})
-              </if>
-              <if test="statusEnum == 4">
-                  T4.status_enum = #{completed}
-              </if>
         ) AS ii
         ${ew.customSqlSegment}
         GROUP BY ii.encounter_id,
@@ -105,6 +68,7 @@
     </select>
     <select id="selectMedicineDispenseOrderPage" resultType="com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto">
     SELECT ii.department_name,
+           ii.doctor_id,
            ii.doctor_name,
            ii.item_type,
            ii.condition_name,
@@ -138,6 +102,7 @@
            ii.manufacturer_text,
            ii.trace_no
         FROM ( SELECT T8."name" AS department_name,
+                      T9.id AS doctor_id,
                       T9."name" AS doctor_name,
                       T3.category_code AS item_type,
                       T7."name" AS condition_name,
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
index 68d22cb2..99ef6114 100644
--- 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
@@ -136,7 +136,7 @@
         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
+        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 0 AND T1.generate_source_enum = #{generateSourceEnum}
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
@@ -183,7 +183,7 @@
         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'
+        WHERE T1.delete_flag = '0' AND T1.generate_source_enum = #{generateSourceEnum}
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
@@ -230,7 +230,7 @@
         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'
+        WHERE T1.delete_flag = '0' AND T1.generate_source_enum = #{generateSourceEnum}
         AND T1.based_on_table is null
         AND T1.parent_id IS NULL
         <if test="historyFlag == '0'.toString()">
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
index 10c6d2b3..bf2d6768 100644
--- 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
@@ -37,4 +37,14 @@
           AND wsr.prescription_no = #{prescriptionNo}
     </select>
 
+    <select id="getActivityOrganizationConfig"
+            resultType="com.openhis.web.regdoctorstation.dto.ActivityOrganizationConfigDto">
+        SELECT organization_id,
+               activity_definition_id
+        FROM adm_organization_location
+        WHERE delete_flag = '0'
+          AND (CURRENT_TIME :: TIME ( 6 ) BETWEEN start_time AND end_time)
+          AND activity_category_code = #{activityCategoryCode}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
index ab40d692..8099a01b 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/ChargeReportMapper.xml
@@ -101,6 +101,7 @@
                        LEFT JOIN adm_encounter T2
                                  ON T2.id = T1.encounter_id
                                      AND T2.delete_flag = '0'
+                                     AND T2.class_enum = 2
                        LEFT JOIN adm_patient AS T15
                                  ON T1.patient_id = T15.id
                                      AND T15.delete_flag = '0'
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
index 51a5213b..b259f5bd 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml
@@ -4,6 +4,7 @@
 
     <select id="selectProductReportPage"
             resultType="com.openhis.web.reportmanage.dto.InventoryProductReportPageDto">
+<<<<<<< HEAD
         SELECT *
         FROM (
                SELECT T8.id,                                                --ID
@@ -155,5 +156,132 @@
                     </when>
                 </choose>
             </if>
+=======
+--         SELECT T8.id,                                                --ID
+--                T8.bus_no,                                            --药品编码
+--                T8.name,                                              --药品名称
+--                T8.lot_number,                                        --批次号
+--                T8.manufacturer_text,                                 --厂家
+--                T8.item_table,                                        --药品类型
+--                T8.item_quantity,                                     --库存数量
+--                T8.unit_code,                                         --计量单位
+--                T8.min_package_quantity,                              --小包装库存数
+--                T8.min_package_unit,                                  --小包装单位
+--                T8.price,                                             --进价
+--                T8.sale_price,                                        --售价
+--                T8.price * T8.part_percent       AS part_price,       --拆零进价
+--                T8.sale_price * T8.part_percent  AS part_sale_price,  --拆零售价
+--                T8.price * T8.item_quantity      AS total_price,      --进价金额（总价）
+--                T8.sale_price * T8.item_quantity AS total_sale_price, --售价金额（总价）
+--                T8.purpose_type_enum,                                 --仓库类型
+--                T8.location_name,                                     --仓库名称
+--                T8.location_store_name,                               --货位名称
+--                T8.expiration_date,                                   --有效期
+--                T8.yb_no,                                              --医保编码
+--                T8.tenant_id                -- 租户ID
+--         FROM (SELECT T1.id,                                                 --ID
+--                      T2.bus_no,                                             --药品编码
+--                      T2.name,                                               --药品名称
+--                      T1.lot_number,                                         --批次号
+--                      T2.manufacturer_text,                                  --厂家
+--                      T2.category_code              AS item_table,           --药品类型
+--                      T1.quantity AS item_quantity,                          --库存数量
+--                      T2.unit_code,                                          --计量单位
+--                      T1.quantity                   AS min_package_quantity, --小包装库存数
+--                      T2.min_unit_code              AS min_package_unit,     --小包装单位
+--                      CASE
+--                          WHEN T4.condition_code = #{lotNumber}
+--                              AND T4.condition_value = T1.lot_number
+--                              THEN T4.amount
+--                          ELSE T3.price END         AS sale_price,           --售价
+--                      T2.part_percent,                                       --拆零比
+--                      T6.form_enum AS purpose_type_enum,                     --仓库类型
+--                      T6.name                       AS location_name,        --仓库名称
+--                      T7.name                       AS location_store_name,  --货位名称
+--                      T1.expiration_date,                                    --有效期
+--                      T2.yb_no,                                               --医保编码
+--                      T1.tenant_id                -- 租户ID
+--               FROM wor_inventory_item AS T1
+--                        INNER JOIN med_medication_definition AS T2
+--                                   ON T2.id = T1.item_id
+--                                       AND T2.delete_flag = '0'
+--                        INNER JOIN adm_charge_item_definition AS T3
+--                                   ON T3.instance_id = T2.id
+--                                       AND T3.delete_flag = '0'
+--                        LEFT JOIN adm_charge_item_def_detail AS T4
+--                                  ON T4.definition_id = T3.id
+--                                      AND T4.delete_flag = '0'
+--                        LEFT JOIN adm_location T6
+--                                  ON T1.location_id = T6.id
+--                                      AND T6.delete_flag = '0'
+--                        LEFT JOIN adm_location T7
+--                                  ON T1.location_store_id = T7.id
+--                                      AND T7.delete_flag = '0'
+--               WHERE T1.delete_flag = '0') AS T8
+--         UNION
+--         SELECT T10.id,                                                 --ID
+--                T10.bus_no,                                             --器材编码
+--                T10.name,                                               --器材名称
+--                T10.lot_number,                                         --批次号
+--                T10.manufacturer_text,                                  --厂家
+--                T10.item_table,                                         --器材类型
+--                T10.item_quantity,                                      --库存数量
+--                T10.unit_code,                                          --计量单位
+--                T10.min_package_quantity,                               --小包装库存数
+--                T10.min_package_unit,                                   --小包装单位
+--                T10.price,                                              --进价
+--                T10.sale_price,                                         --售价
+--                T10.price * T10.part_percent       AS part_price,       --拆零进价
+--                T10.sale_price * T10.part_percent  AS part_sale_price,  --拆零售价
+--                T10.price * T10.item_quantity      AS total_price,      --进价金额（总价）
+--                T10.sale_price * T10.item_quantity AS total_sale_price, --售价金额（总价）
+--                T10.purpose_type_enum,                                  --仓库类型
+--                T10.location_name,                                      --仓库名称
+--                T10.location_store_name,                                --货位名称
+--                T10.expiration_date,                                    --有效期
+--                T10.yb_no,                                               --医保编码
+--                T10.tenant_id                -- 租户ID
+--         FROM (SELECT T1.id,                                                 --ID
+--                      T9.bus_no,                                           --药品编码
+--                      T9.name,                                               --药品名称
+--                      T1.lot_number,                                         --批次号
+--                      T9.manufacturer_text,                                  --厂家
+--                      T9.category_code              AS item_table,           --药品类型
+--                      T1.quantity AS item_quantity,                         --库存数量
+--                      T9.unit_code,                                          --计量单位
+--                      T1.quantity                   AS min_package_quantity, --小包装库存数
+--                      T9.min_unit_code              AS min_package_unit,     --小包装单位
+--                      T1.price,                                              --进价
+--                      CASE
+--                          WHEN T4.condition_code = #{lotNumber}
+--                              AND T4.condition_value = T1.lot_number
+--                              THEN T4.amount
+--                          ELSE T3.price END         AS sale_price,           --售价
+--                      T9.part_percent,                                       --拆零比
+--                      T6.form_enum AS purpose_type_enum,                     --仓库类型
+--                      T6.name                       AS location_name,        --仓库名称
+--                      T7.name                       AS location_store_name,  --货位名称
+--                      T1.expiration_date,                                    --有效期
+--                      T9.yb_no,                                               --医保编码
+--                      T1.tenant_id                -- 租户ID
+--               FROM wor_inventory_item AS T1
+--                        INNER JOIN adm_device_definition AS T9
+--                                   ON T9.id = T1.item_id
+--                                       AND T9.delete_flag = '0'
+--                        INNER JOIN adm_charge_item_definition AS T3
+--                                   ON T3.instance_id = T9.id
+--                                       AND T3.delete_flag = '0'
+--                        LEFT JOIN adm_charge_item_def_detail AS T4
+--                                  ON T4.definition_id = T3.id
+--                                      AND T4.delete_flag = '0'
+--                        LEFT JOIN adm_location T6
+--                                  ON T1.location_id = T6.id
+--                                      AND T6.delete_flag = '0'
+--                        LEFT JOIN adm_location T7
+--                                  ON T1.location_store_id = T7.id
+--                                      AND T7.delete_flag = '0'
+--               WHERE T1.delete_flag = '0') AS T10
+--             ${ew.customSqlSegment}
+>>>>>>> upstream/develop
     </select>
 </mapper>
diff --git a/openhis-server-new/openhis-common/pom.xml b/openhis-server-new/openhis-common/pom.xml
index aaafbc70..8cee3957 100644
--- a/openhis-server-new/openhis-common/pom.xml
+++ b/openhis-server-new/openhis-common/pom.xml
@@ -25,7 +25,8 @@
         <dependency>
             <groupId>com.core</groupId>
             <artifactId>core-admin</artifactId>
-        </dependency>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>       
 
     </dependencies>
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
new file mode 100644
index 00000000..1f3d13c4
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java
@@ -0,0 +1,194 @@
+
+package com.openhis.common.aspectj;
+
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson2.JSON;
+import com.core.common.core.domain.R;
+import com.core.common.utils.SecurityUtils;
+import com.core.system.domain.SysOperLog;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Aspect
+@Component
+@Slf4j
+public class OperLogAspect {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    // 线程局部变量，用于在方法调用前后传递数据
+    private final ThreadLocal<SysOperLog> operLogThreadLocal = new ThreadLocal<>();
+    private final ThreadLocal<Long> startTimeThreadLocal = new ThreadLocal<>();
+
+    /**
+     * 定义切点：所有Controller包下的方法，排除login接口
+     */
+    @Pointcut("execution(* com.openhis.web..controller..*.*(..)) "
+        + "&& !execution(* com.openhis.web..controller..*.login(..)) ")
+    public void operLogPointCut() {}
+
+    /**
+     * 前置通知：在方法执行前记录请求信息
+     */
+    @Before("operLogPointCut()")
+    public void doBefore(JoinPoint joinPoint) {
+        try {
+            ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+            if (attributes == null) {
+                return;
+            }
+
+            HttpServletRequest request = attributes.getRequest();
+            MethodSignature signature = (MethodSignature)joinPoint.getSignature();
+            Method method = signature.getMethod();
+
+            // 创建操作日志对象
+            SysOperLog operLog = new SysOperLog();
+            operLog.setOperTime(new Date());
+            operLog.setOperUrl(request.getRequestURI());
+            operLog.setRequestMethod(request.getMethod());
+
+            // 获取请求参数
+            String operParam = getRequestParams(joinPoint, request);
+            operLog.setOperParam(operParam);
+
+            // 设置操作方法名
+            String className = joinPoint.getTarget().getClass().getName();
+            String methodName = method.getName();
+            operLog.setMethod(className + "." + methodName + "()");
+
+            // 保存到线程局部变量
+            operLogThreadLocal.set(operLog);
+
+            // 记录开始时间
+            startTimeThreadLocal.set(System.currentTimeMillis());
+
+        } catch (Exception e) {
+            log.error("操作日志前置通知异常", e);
+        }
+    }
+
+    /**
+     * 返回通知：在方法成功执行后记录结果
+     */
+    @AfterReturning(pointcut = "operLogPointCut()", returning = "result")
+    public void doAfterReturning(JoinPoint joinPoint, Object result) {
+        try {
+            SysOperLog operLog = operLogThreadLocal.get();
+            if (operLog == null) {
+                return;
+            }
+
+            // 计算消耗时间
+            Long startTime = startTimeThreadLocal.get();
+            if (startTime != null) {
+                Long costTime = System.currentTimeMillis() - startTime;
+                operLog.setCostTime(costTime);
+            }
+
+            // 设置操作结果
+            if (result instanceof R) {
+                R<?> r = (R<?>)result;
+                operLog.setJsonResult(JSON.toJSONString(r));
+                // 根据R的code判断操作状态
+                if (r.getCode() != 200) { // 假设200是成功状态码
+                    operLog.setStatus(1); // 失败
+                    operLog.setErrorMsg(r.getMsg());
+                }
+            } else {
+                operLog.setJsonResult(result != null ? JSON.toJSONString(result) : "null");
+            }
+            // 插入数据库
+            insertOperLog(operLog);
+
+        } catch (Exception e) {
+            log.error("操作日志返回通知异常", e);
+        } finally {
+            // 清理线程局部变量
+            operLogThreadLocal.remove();
+        }
+    }
+
+    /**
+     * 获取请求参数
+     */
+    private String getRequestParams(JoinPoint joinPoint, HttpServletRequest request) {
+        Map<String, Object> params = new HashMap<>();
+
+        // 添加基本请求信息
+        params.put("url", request.getRequestURL().toString());
+        params.put("method", request.getMethod());
+
+        // 获取Query参数
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        if (!parameterMap.isEmpty()) {
+            Map<String, Object> queryParams = new HashMap<>();
+            parameterMap.forEach((key, values) -> {
+                if (values.length == 1) {
+                    queryParams.put(key, values[0]);
+                } else {
+                    queryParams.put(key, values);
+                }
+            });
+            params.put("query", queryParams);
+        }
+
+        // 获取Body参数（排除文件上传和响应对象）
+        Object[] args = joinPoint.getArgs();
+        if (args.length > 0) {
+            for (Object arg : args) {
+                if (isValidRequestBody(arg)) {
+                    params.put("body", arg);
+                    break; // 通常只有一个RequestBody
+                }
+            }
+        }
+        return JSON.toJSONString(params);
+    }
+
+    /**
+     * 判断是否为有效的请求体参数
+     */
+    private boolean isValidRequestBody(Object arg) {
+        return arg != null && !(arg instanceof HttpServletRequest) && !(arg instanceof HttpServletResponse)
+            && !(arg instanceof MultipartFile) && !(arg instanceof MultipartFile[]);
+    }
+
+    /**
+     * 插入操作日志到数据库
+     */
+    private void insertOperLog(SysOperLog operLog) {
+        String username = SecurityUtils.getLoginUser().getUsername();
+        String sql = "INSERT INTO sys_oper_log "
+            + "(title,oper_time,method,request_method,oper_name,oper_url,oper_param,json_result,error_msg,cost_time) "
+            + "VALUES (?, ?, ?,?, ?, ?, ?, ?,?, ?)";
+        try {
+            jdbcTemplate.update(sql, "OperLogAspect切面生成", operLog.getOperTime(), operLog.getMethod(),
+                operLog.getRequestMethod(), username, operLog.getOperUrl(), operLog.getOperParam(),
+                operLog.getJsonResult(), operLog.getErrorMsg(), operLog.getCostTime());
+        } catch (Exception e) {
+            log.error("插入操作日志失败", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index 49b8d5f0..2ea21400 100644
--- a/openhis-server-new/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
@@ -169,7 +169,7 @@ public class CommonConstants {
         /**
          * 身份证号
          */
-        String idCard = "id_card";
+        String IdCard = "id_card";
 
         /**
          * 拼音码
@@ -235,6 +235,7 @@ public class CommonConstants {
          * 请求基于什么的ID
          */
         String BasedOnTable = "based_on_table";
+
         /**
          * 药品id
          */
@@ -253,11 +254,12 @@ public class CommonConstants {
         /**
          * 支付流水
          */
-        String paymentNo = "payment_no";
+        String PaymentNo = "payment_no";
         /**
          * 拼音码
          */
         String PyStr = "py_str";
+
         /**
          * 五笔码
          */
@@ -279,14 +281,15 @@ public class CommonConstants {
         String PrescriptionNo = "prescription_no";
 
         /**
-         * 机构枚举
+         * 项目分类
          */
-        String TYPE_ENUM = "type_enum";
+        String MedCategoryCode = "med_category_code";
 
         /**
          * 门诊号
          */
         String IptOtpNo = "ipt_otp_no";
+
         /**
          * 医保号
          */
@@ -315,35 +318,80 @@ public class CommonConstants {
          * 费用项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 ItemId = "item_id";
+
+        /**
+         * 项目所在表
+         */
+        String ItemTable = "item_table";
+
+        /**
+         * 项目名
+         */
+        String ItemName = "item_name";
+
         /**
          * 申请时间
          */
-        String applyTime = "apply_time";
+        String ApplyTime = "apply_time";
 
         /**
          * 校对人Id
          */
         String PerformerCheckId = "performer_check_id";
+        /**
+         * 单位
+         */
+        String UnitCode = "unit_code";
+
+        /**
+         * 住院开始时间
+         */
+        String StartTime = "start_time";
+
+        /**
+         * 数量
+         */
+        String Quantity = "quantity";
+
+        /**
+         * 所在位置
+         */
+        String LocationId = "location_id";
+
+        /**
+         * 供应商
+         */
+        String SupplierId = "supplier_id";
+
+        /**
+         * 过期天数
+         */
+        String RemainingDays = "remaining_days";
     }
 
     /**
@@ -376,6 +424,16 @@ public class CommonConstants {
          */
         String DEFAULT_CONTRACT_NO = "0000";
 
+        /**
+         * 默认合同编码
+         */
+        String DEFAULT_STUDENT_CONTRACT_NO = "STUDENT0000";
+
+        /**
+         * 默认合同编码
+         */
+        String CONTRACT_STUDENT = "STUDENT";
+
         /**
          * 皮试检查
          */
diff --git a/openhis-server-new/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
index d56e5d7c..6a830da8 100644
--- a/openhis-server-new/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
@@ -253,4 +253,20 @@ public class PromptMsgConstant {
         String M00002 = "apl.report.M00002";
 
     }
+
+    /**
+     * 修改价格
+     */
+    public interface AdjustPrice {
+
+        /**
+         * 数据异常
+         */
+        String M00001 = "apl.adjustPrice.M00001";
+        /**
+         * 已经提交过正在审核中
+         */
+        String M00002 = "apl.adjustPrice.M00002";
+
+    }
 }
diff --git a/openhis-server-new/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
index 1b3e061e..8c478bb1 100644
--- a/openhis-server-new/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
@@ -194,26 +194,32 @@ public enum AssignSeqEnum {
      * 订货单单号
      */
     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"),
+
     /**
      * 药房盘点单单号
      */
@@ -222,6 +228,7 @@ public enum AssignSeqEnum {
      * 药房调入单单号
      */
     PURCHASE_TRANSFERIN("43", "药房调入单", "PTI"),
+
     /**
      * 药房调出单单号
      */
@@ -241,18 +248,22 @@ public enum AssignSeqEnum {
      * 物资进货单
      */
     MATERIAL_STOCKIN("47", "物资进货单", "MSI"),
+
     /**
      * 物资退货单
      */
     MATERIAL_RETURN("48", "物资退货单", "MRE"),
+
     /**
      * 物资出库单
      */
     MATERIAL_STOCKOUT("49", "物资出库单", "MSO"),
+
     /**
      * 物资退库单
      */
     MATERIAL_PRODUCT_RETURN("50", "物资退库单", "MPR"),
+
     /**
      * 物资损益单
      */
@@ -262,10 +273,12 @@ public enum AssignSeqEnum {
      * 物资盘点单
      */
     MATERIAL_STOCKTAKING("52", "物资盘点单", "MST"),
+
     /**
      * 物资调入单
      */
     MATERIAL_TRANSFERIN("53", "物资调入单", "MTI"),
+
     /**
      * 物资调出单
      */
@@ -275,43 +288,77 @@ public enum AssignSeqEnum {
      * 科室请领单单号
      */
     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
-     * 病历文书
+     * b 病历文书
      */
     PURCHASE_DOCUMENT("63", "病历文书", "DOC"),
+
     /**
      * 调价单
      */
-    CHANGE_PRICE_BUZ("64", "调整零售价", "CPB");
+    CHANGE_PRICE_BUZ("64", "调整零售价", "CPB"),
+
+    /**
+     * 药品汇总单号
+     */
+    MEDICINE_SUMMARY_NO("65", "药品汇总单号", "MSY"),
+
+    /**
+     * 公费医疗自付比例调整申请编号
+     */
+    GF_RATIO_APPLICATION("66", "公费医疗自付比例调整申请编号", "GRA"),
+
+    /**
+     * 参与者编码
+     */
+    PRACTITIONER_NO("67", "参与者编码", "PER"),
+
+    /**
+     * 号源编码
+     */
+    HEALTHCARE_SERVICE_NO("68", "号源编码", "HS"),
+
+    /**
+     * 耗材汇总单号
+     */
+    DEVICE_SUMMARY_NO("69", "耗材汇总单号", "DSN");
+
     private final String code;
     private final String info;
     private final String prefix;
diff --git a/openhis-server-new/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
index 85d8baf9..efd73d40 100644
--- a/openhis-server-new/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
@@ -33,7 +33,7 @@ public enum ConditionCode implements HisEnumInterface {
     LIMIT(4, "4", "限制"),
 
     /**
-     * 限制
+     * 产品批号售价
      */
     LOT_NUMBER_PRICE(5, "5", "产品批号售价");
 
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java
new file mode 100644
index 00000000..1f3f10ac
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java
@@ -0,0 +1,50 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 学历层次
+ * 
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Getter
+@AllArgsConstructor
+public enum EducationLevel implements HisEnumInterface {
+    /**
+     * 预科生
+     */
+    PREPARATORY(0, "0", "预科生"),
+    /**
+     * 本科生
+     */
+    UNDERGRADUATE(1, "1", "本科生"),
+    /**
+     * 硕士研究生
+     */
+    POSTGRADUATE(2, "2", "硕士研究生"),
+    /**
+     * 博士研究生
+     */
+    DOCTORAL(3, "3", "博士研究生");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static EducationLevel getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (EducationLevel 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/ChargeItemGenerateSource.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
similarity index 61%
rename from openhis-server-new/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/GenerateSource.java
index 0f69a707..8b21120d 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
@@ -7,14 +7,14 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * 账单生成来源
+ * 生成来源 | 适用医嘱请求和账单
  *
  * @author zwh
  * @date 2025-03-10
  */
 @Getter
 @AllArgsConstructor
-public enum ChargeItemGenerateSource implements HisEnumInterface {
+public enum GenerateSource implements HisEnumInterface {
 
     /**
      * 医生开立
@@ -27,19 +27,29 @@ public enum ChargeItemGenerateSource implements HisEnumInterface {
     NURSE_PRICING(2, "2", "护士划价"),
 
     /**
-     * 医嘱绑定
+     * 挂号登记
      */
-    MEDICAL_ORDER_BINDING(3, "3", "医嘱绑定");
+    REGISTRATION_REGISTER(3, "3", "挂号登记"),
+
+    /**
+     * 医嘱执行
+     */
+    ORDER_EXECUTE(4, "4", "医嘱执行"),
+
+    /**
+     * 自动滚费
+     */
+    AUTO_ROLL_FEES(5, "5", "自动滚费");
 
     private final Integer value;
     private final String code;
     private final String info;
 
-    public static ChargeItemGenerateSource getByValue(Integer value) {
+    public static GenerateSource getByValue(Integer value) {
         if (value == null) {
             return null;
         }
-        for (ChargeItemGenerateSource val : values()) {
+        for (GenerateSource val : values()) {
             if (val.getValue().equals(value)) {
                 return val;
             }
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java
new file mode 100644
index 00000000..89db9c9f
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java
@@ -0,0 +1,50 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 公费申请状态
+ * 
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Getter
+@AllArgsConstructor
+public enum GfApplicationStatus implements HisEnumInterface {
+    /**
+     * 处理中
+     */
+    PROCESSING(0, "0", "处理中"),
+    /**
+     * 通过
+     */
+    APPROVED(1, "1", "通过"),
+    /**
+     * 驳回
+     */
+    REJECTED(2, "2", "驳回"),
+    /**
+     * 取消
+     */
+    CANCELLED(3, "3", "取消");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static GfApplicationStatus getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (GfApplicationStatus 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/GfApprovalRole.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java
new file mode 100644
index 00000000..fbbcd0d8
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java
@@ -0,0 +1,46 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 公费申请处理角色
+ * 
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Getter
+@AllArgsConstructor
+public enum GfApprovalRole implements HisEnumInterface {
+    /**
+     * 测算盈亏人
+     */
+    INITIAL_APPROVER(1, "1", "测算盈亏人"),
+    /**
+     * 财务报批人
+     */
+    FINANCE_APPROVER(2, "2", "财务报批人"),
+    /**
+     * 会议结果录入人
+     */
+    FINAL_RECORDER(3, "3", "会议结果录入人");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static GfApprovalRole getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (GfApprovalRole 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/GfItemType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java
new file mode 100644
index 00000000..a3f5428b
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java
@@ -0,0 +1,42 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 公费项目分类
+ * 
+ * @author Thanking
+ * @date 2025-10-24
+ */
+@Getter
+@AllArgsConstructor
+public enum GfItemType implements HisEnumInterface {
+    /**
+     * 药品
+     */
+    MEDICATION(1, "1", "药品"),
+    /**
+     * 诊疗
+     */
+    ACTIVITY(2, "2", "诊疗");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static GfItemType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (GfItemType 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/GfRatioType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java
new file mode 100644
index 00000000..f82f6b61
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java
@@ -0,0 +1,42 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 公费比例类型
+ * 
+ * @author Thanking
+ * @date 2025-10-22
+ */
+@Getter
+@AllArgsConstructor
+public enum GfRatioType implements HisEnumInterface {
+    /**
+     * 大项比例
+     */
+    TYPE_RATIO(1, "1", "大项比例"),
+    /**
+     * 单项比例
+     */
+    INDIVIDUAL_RATIO(2, "2", "单项比例");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static GfRatioType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (GfRatioType 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/ItemCategoryCode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java
new file mode 100644
index 00000000..c9cdbe5d
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java
@@ -0,0 +1,63 @@
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 项目类型
+ */
+@Getter
+@AllArgsConstructor
+public enum ItemCategoryCode implements HisEnumInterface {
+
+    /**
+     * 中成药
+     */
+    CHINESE_PATENT_DRUG(1, "1", "中成药"),
+
+    /**
+     * 西药
+     */
+    WESTERN_MEDICINE(2, "2", "西药"),
+
+    /**
+     * 外购药品
+     */
+    EXTERNALLY_PROCURED_DRUGS(3, "3", "外购药品"),
+
+    /**
+     * 中草药
+     */
+    CHINESE_HERBAL_MEDICINE(4, "4", "中草药"),
+
+    /**
+     * 耗材
+     */
+    DEVICE(7, "7", "耗材"),
+
+    /**
+     * 诊疗
+     */
+    SERVICE(8, "8", "诊疗"),
+
+    /**
+     * 其他
+     */
+    OTHER(9, "9", "其他");
+
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static ItemCategoryCode getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (ItemCategoryCode 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/OrderPricingSource.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java
new file mode 100644
index 00000000..b991cdd5
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import com.core.common.utils.StringUtils;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 医嘱定价来源
+ *
+ * @author SunJQ
+ * @date 2025-04-28
+ */
+@Getter
+@AllArgsConstructor
+public enum OrderPricingSource {
+
+    /**
+     * 批次售价
+     */
+    BATCH_SELLING_PRICE(1,
+        "batchSellingPrice", "批次售价"),
+    /**
+     * 零售价
+     */
+    RETAIL_PRICE(2, "retailPrice", "零售价");
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static OrderPricingSource getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (OrderPricingSource val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+
+    public static OrderPricingSource getByCode(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return null;
+        }
+        for (OrderPricingSource val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}
diff --git a/openhis-server-new/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
index 9e376dda..7e1e8d7d 100644
--- a/openhis-server-new/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
@@ -25,14 +25,15 @@ public enum PaymentOutcome {
      * 完整
      */
     COMPLETED("1", 1, "完整"),
+    //2025/10/21 长大数据发现此处value和code没对应上，ERROR的value是2，code是3，PARTIAL是3和4.经确认这个枚举目前都是getCode，所以现在将value与code同步
     /**
      * 错误
      */
-    ERROR("2", 3,"错误"),
+    ERROR("3", 3,"错误"),
     /**
      * 部分
      */
-    PARTIAL("3", 4, "部分");
+    PARTIAL("4", 4, "部分");
 
     private String value;
     private Integer code;
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java
new file mode 100644
index 00000000..6a209877
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/PhysicalExamResult.java
@@ -0,0 +1,46 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 体检结果
+ * 
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Getter
+@AllArgsConstructor
+public enum PhysicalExamResult implements HisEnumInterface {
+    /**
+     * 未体检
+     */
+    NOT_EXAMINED(0, "0", "未体检"),
+    /**
+     * 体检不合格
+     */
+    EXAMINATION_FAILED(1, "1", "体检不合格"),
+    /**
+     * 体检合格
+     */
+    EXAMINATION_PASSED(2, "2", "体检合格");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static PhysicalExamResult getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (PhysicalExamResult 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/RequestFormType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java
deleted file mode 100644
index 4e646b4e..00000000
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java
new file mode 100644
index 00000000..7236a9c4
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudentStatus.java
@@ -0,0 +1,46 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 在校状态
+ * 
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Getter
+@AllArgsConstructor
+public enum StudentStatus implements HisEnumInterface {
+    /**
+     * 在校
+     */
+    IN_SCHOOL(0, "0", "在校"),
+    /**
+     * 休学
+     */
+    ON_LEAVE(1, "1", "休学"),
+    /**
+     * 离校
+     */
+    LEFT_SCHOOL(2, "2", "离校");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static StudentStatus getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (StudentStatus 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/StudyMode.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java
new file mode 100644
index 00000000..11ca5265
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java
@@ -0,0 +1,42 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 学习形式
+ * 
+ * @author Thanking
+ * @date 2025-10-21
+ */
+@Getter
+@AllArgsConstructor
+public enum StudyMode implements HisEnumInterface {
+    /**
+     * 全日制
+     */
+    FULL_TIME(1, "1", "全日制"),
+    /**
+     * 非全日制
+     */
+    PART_TIME(2, "2", "非全日制");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+    public static StudyMode getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (StudyMode 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/SupplierType.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
index 21fd4e5c..eb3c8c69 100644
--- a/openhis-server-new/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
@@ -8,9 +8,10 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum SupplierType implements HisEnumInterface {
-    DRAFT(1, "1", "生产商"),
 
-    ACTIVE(2, "2", "供应商");
+    MANUFACTURER(1, "1", "生产商"),
+
+    SUPPLIER(2, "2", "供应商");
 
     @EnumValue
     private final Integer value;
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
index 21ed9b57..1fec199b 100644
--- 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
@@ -14,113 +14,130 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum SupplyCategory implements HisEnumInterface{
+public enum SupplyCategory implements HisEnumInterface {
 
     /**
      * 库存供应
      */
-    STOCK_SUPPLY(1, "1","库存供应"),
+    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.视光材料");
+    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.视光材料"),
+    // /**
+    // * 调价分类 药品
+    // */
+    // REQUEST_CATEGORY_CHANGE_PRICE_MEDICATION(24, "24","药品调价单"),
+    // /**
+    // * 调价分类 耗材
+    // */
+    // REQUEST_CATEGORY_CHANGE_PRICE_DEVICE(25, "25","耗材调价单"),
+    // /**
+    // * 调价分类 诊疗
+    // */
+    // REQUEST_CATEGORY_CHANGE_PRICE_ACTIVITY(26, "26","诊疗调价单"),
+    // /**
+    // * 调价分类 挂号
+    // */
+    // REQUEST_CATEGORY_CHANGE_PRICE_HEALTH(27, "27","挂号调价单");
 
     private Integer value;
     private String code;
diff --git a/openhis-server-new/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
index 3e341092..240e3fb6 100644
--- a/openhis-server-new/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
@@ -45,6 +45,7 @@ public enum SupplyStatus implements HisEnumInterface {
      * 待审请
      */
     PENDING_REVIEW(10, "6", "待审请"),
+
     /**
      * 已失效
      */
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
index 22fee4c2..161a1e3c 100644
--- 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
@@ -29,7 +29,7 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 汇总发药
      */
-    DISPENSING_AGGREGATION(3, "3", "汇总发药"),
+    SUMMARY_DISPENSE(3, "3", "汇总发药"),
 
     /**
      * 商品盘点
@@ -73,7 +73,7 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 退药
      */
-    RETURN_MEDICATION(12, "12", "退药") ,
+    RETURN_MEDICATION(12, "12", "退药"),
 
     /**
      * 药库订货单
@@ -113,31 +113,31 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 药房入库单
      */
-    PURCHASE_STOCKIN(21,"21", "药房入库单" ),
+    PURCHASE_STOCKIN(21, "21", "药房入库单"),
     /**
      * 药房退库单
      */
-    PURCHASE_RETURN(22,"22", "药房退库单"),
+    PURCHASE_RETURN(22, "22", "药房退库单"),
     /**
      * 发药单
      */
-    DISPENSING_ORDER(23,"23", "发药单"),
+    DISPENSING_ORDER(23, "23", "发药单"),
     /**
      * 药房损益单
      */
-    PURCHASE_PRPFITLOSS(24,"24", "药房损益单"),
+    PURCHASE_PRPFITLOSS(24, "24", "药房损益单"),
     /**
      * 药房盘点单
      */
-    PURCHASE_STOCKTAKING(25,"25", "药房盘点单"),
+    PURCHASE_STOCKTAKING(25, "25", "药房盘点单"),
     /**
      * 药房调入单
      */
-    PURCHASE_TRANSFERIN(26,"26", "药房调入单"),
+    PURCHASE_TRANSFERIN(26, "26", "药房调入单"),
     /**
      * 药房调出单
      */
-    PURCHASE_TRANSFEROUT(27,"27", "药房调出单"),
+    PURCHASE_TRANSFEROUT(27, "27", "药房调出单"),
 
     /**
      * 物资订货单
@@ -172,11 +172,11 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 物资调入单
      */
-    MATERIAL_TRANSFERIN(35,"35", "物资调入单"),
+    MATERIAL_TRANSFERIN(35, "35", "物资调入单"),
     /**
      * 物资调出单
      */
-    MATERIAL_TRANSFEROUT(36,"36", "物资调出单"),
+    MATERIAL_TRANSFEROUT(36, "36", "物资调出单"),
 
     /**
      * 科室请领单
@@ -185,27 +185,27 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 科室入库单
      */
-    DEPARTMENT_STOCKIN(38,"38", "科室入库单" ),
+    DEPARTMENT_STOCKIN(38, "38", "科室入库单"),
     /**
      * 科室退库单
      */
-    DEPARTMENT_RETURN(39,"39", "科室退库单"),
+    DEPARTMENT_RETURN(39, "39", "科室退库单"),
     /**
      * 科室损益单
      */
-    DEPARTMENT_PRPFITLOSS(40,"40", "科室损益单"),
+    DEPARTMENT_PRPFITLOSS(40, "40", "科室损益单"),
     /**
      * 科室盘点单
      */
-    DEPARTMENT_STOCKTAKING(41,"41", "科室盘点单"),
+    DEPARTMENT_STOCKTAKING(41, "41", "科室盘点单"),
     /**
      * 科室调入单
      */
-    DEPARTMENT_TRANSFERIN(42,"42", "科室调入单"),
+    DEPARTMENT_TRANSFERIN(42, "42", "科室调入单"),
     /**
      * 科室调出单
      */
-    DEPARTMENT_TRANSFEROUT(43,"43", "科室调出单"),
+    DEPARTMENT_TRANSFEROUT(43, "43", "科室调出单"),
 
     /**
      * 自动盘点
@@ -215,7 +215,31 @@ public enum SupplyType implements HisEnumInterface {
     /**
      * 库存明细
      */
-    INVENTORY_PRODUCT(45, "45", "库存明细");
+    INVENTORY_PRODUCT(45, "45", "库存明细"),
+    /**
+     * 药品调价
+     */
+    REQUEST_MEDICATION_CHANGE_PRICE(46, "46", "药品调价"),
+    /**
+     * 耗材调价
+     */
+    REQUEST_DEVICE_CHANGE_PRICE(47, "47", "耗材调价"),
+    /**
+     * 诊疗调价
+     */
+    REQUEST_ACTIVITY_CHANGE_PRICE(48, "48", "诊疗调价"),
+    /**
+     * 挂号调价
+     */
+    REQUEST_HEALTH_CHANGE_PRICE(49, "49", "挂号调价"),
+    /**
+     * 挂号调价
+     */
+    REQUEST_CHANGE_PRICE(50, "50", "货品调价"),
+    /**
+     * 耗材盘点
+     */
+    DEVICE_STOCKTAKING(51, "51", "耗材盘点");
 
     private Integer value;
     private String code;
diff --git a/openhis-server-new/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
index 3b29ea19..f80c97bd 100644
--- a/openhis-server-new/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
@@ -4,6 +4,7 @@
 package com.openhis.common.enums.ybenums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.core.common.utils.StringUtils;
 import com.openhis.common.enums.HisEnumInterface;
 
 import lombok.AllArgsConstructor;
@@ -45,4 +46,16 @@ public enum YbChrgitmLv implements HisEnumInterface {
         return null;
     }
 
+    public static YbChrgitmLv getByCode(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return null;
+        }
+        for (YbChrgitmLv val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+
 }
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
index f7ce0902..7ec60362 100644
--- 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
@@ -8,7 +8,7 @@ import lombok.Getter;
 /**
  * 处理方式
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Getter
 @AllArgsConstructor
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
index e65be1e4..d4151c50 100644
--- 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
@@ -8,7 +8,7 @@ import lombok.Getter;
 /**
  * 医疗机构等级
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Getter
 @AllArgsConstructor
diff --git a/openhis-server-new/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
index 98b7762d..3fa16896 100644
--- a/openhis-server-new/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
@@ -4,6 +4,7 @@
 package com.openhis.common.enums.ybenums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -17,299 +18,297 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum YbPayment {
 
-    YB_FUND_PAY( 100000 ,1,null,"基金支付总额"),
+    YB_FUND_PAY(100000, 1, null, "基金支付总额"),
 
-    SELF_PAY(200000,1,null,"个人负担总金额"),
+    SELF_PAY(200000, 1, null, "个人负担总金额"),
 
-    OTHER_PAY(300000,1,null,"其他（如医院负担金额）"),
+    OTHER_PAY(300000, 1, null, "其他（如医院负担金额）"),
 
     /**
      * 基本医保统筹基金支出
      */
-    YB_TC_FUND_AMOUNT(110000,2,YB_FUND_PAY,"基本医保统筹基金支出"),
+    YB_TC_FUND_AMOUNT(110000, 2, YB_FUND_PAY, "基本医保统筹基金支出"),
     /**
      * 补充医疗保险基金支出
      */
-    YB_BC_FUND_AMOUNT(120000,2,YB_FUND_PAY,"补充医疗保险基金支出"),
+    YB_BC_FUND_AMOUNT(120000, 2, YB_FUND_PAY, "补充医疗保险基金支出"),
     /**
      * 医疗救助基金支出
      */
-    YB_JZ_FUND_AMOUNT(130000,2,YB_FUND_PAY,"医疗救助基金支出"),
+    YB_JZ_FUND_AMOUNT(130000, 2, YB_FUND_PAY, "医疗救助基金支出"),
     /**
      * 其他支出
      */
-    YB_OTHER_AMOUNT(140000,2,YB_FUND_PAY,"其他支出"),
+    YB_OTHER_AMOUNT(140000, 2, YB_FUND_PAY, "其他支出"),
     /**
      * 职工基本医疗保险
      */
-    YB_TC_ZG_FUND_VALUE(110100,3,YB_TC_FUND_AMOUNT,"职工基本医疗保险"),
+    YB_TC_ZG_FUND_VALUE(110100, 3, YB_TC_FUND_AMOUNT, "职工基本医疗保险"),
     /**
      * 居民基本医疗保险
      */
-    YB_TC_JM_FUND_VALUE(110200,3,YB_TC_FUND_AMOUNT,"居民基本医疗保险"),
+    YB_TC_JM_FUND_VALUE(110200, 3, YB_TC_FUND_AMOUNT, "居民基本医疗保险"),
     /**
      * 全体参保人的居民大病保险
      */
-    YB_BC_JM_DB_VALUE(120100,3,YB_BC_FUND_AMOUNT,"全体参保人的居民大病保险"),
+    YB_BC_JM_DB_VALUE(120100, 3, YB_BC_FUND_AMOUNT, "全体参保人的居民大病保险"),
     /**
      * 大额医疗费用补助
      */
-    YB_BC_DE_BZ_VALUE(120200,3,YB_BC_FUND_AMOUNT,"大额医疗费用补助"),
+    YB_BC_DE_BZ_VALUE(120200, 3, YB_BC_FUND_AMOUNT, "大额医疗费用补助"),
     /**
      * 企业职工大额医疗费用补助
      */
-    YB_BC_ZG_DE_BZ_VALUE(120300,3,YB_BC_FUND_AMOUNT,"企业职工大额医疗费用补助"),
+    YB_BC_ZG_DE_BZ_VALUE(120300, 3, YB_BC_FUND_AMOUNT, "企业职工大额医疗费用补助"),
     /**
      * 公务员医疗补助
      */
-    YB_BC_GWY_BZ_VALUE(120400,3,YB_BC_FUND_AMOUNT,"公务员医疗补助"),
+    YB_BC_GWY_BZ_VALUE(120400, 3, YB_BC_FUND_AMOUNT, "公务员医疗补助"),
     /**
      * 伤残人员医疗保障基金支出
      */
-    YB_OTHER_SC_BZ_FUND_VALUE(130100,3,YB_OTHER_AMOUNT,"伤残人员医疗保障基金支出"),
+    YB_OTHER_SC_BZ_FUND_VALUE(130100, 3, YB_OTHER_AMOUNT, "伤残人员医疗保障基金支出"),
     /**
      *
      */
-    SELF_YB_ZH_PAY(210000,2,SELF_PAY,"个人医保账户支付"),
+    SELF_YB_ZH_PAY(210000, 2, SELF_PAY, "个人医保账户支付"),
     /**
      *
      */
-    SELF_YB_ZH_GJ_VALUE(210100,3,SELF_YB_ZH_PAY,"账户共济支付金额"),
+    SELF_YB_ZH_GJ_VALUE(210100, 3, SELF_YB_ZH_PAY, "账户共济支付金额"),
     /**
      *
      */
-    SELF_CASH_PAY(220000,2,SELF_PAY,"个人现金支付金额"),
+    SELF_CASH_PAY(220000, 2, SELF_PAY, "个人现金支付金额"),
     /**
      *
      */
-    SELF_VX_PAY(230000,2,SELF_PAY,"微信支付金额"),
+    SELF_VX_PAY(230000, 2, SELF_PAY, "微信支付金额"),
     /**
      *
      */
-    SELF_ALI_PAY(240000,2,SELF_PAY,"阿里支付金额"),
+    SELF_ALI_PAY(240000, 2, SELF_PAY, "阿里支付金额"),
     /**
      *
      */
-    SELF_CASH_VALUE(220400,3,SELF_CASH_PAY,"个人现金支付金额(现金)"),
+    DISCOUNT_PAY(220500, 2, OTHER_PAY, "优惠金额"),
     /**
      *
      */
-    SELF_CASH_VX_VALUE(220100,3,SELF_CASH_PAY,"个人现金支付金额(微信)"),
+    SELF_CASH_VALUE(220400, 3, SELF_CASH_PAY, "个人现金支付金额(现金)"),
     /**
      *
      */
-    SELF_CASH_ALI_VALUE(220200,3,SELF_CASH_PAY,"个人现金支付金额(支付宝)"),
+    SELF_CASH_VX_VALUE(220100, 3, SELF_CASH_PAY, "个人现金支付金额(微信)"),
     /**
      *
      */
-    SELF_CASH_UNION_VALUE(220300,3,SELF_CASH_PAY,"个人现金支付金额(银联)"),
+    SELF_CASH_ALI_VALUE(220200, 3, SELF_CASH_PAY, "个人现金支付金额(支付宝)"),
+    /**
+     *
+     */
+    SELF_CASH_UNION_VALUE(220300, 3, SELF_CASH_PAY, "个人现金支付金额(银联)"),
     /**
      * 兜底基金支出
      */
-    OTHER_PAY_DD_FUND_VALUE(300001,2,OTHER_PAY,"兜底基金支出"),
+    OTHER_PAY_DD_FUND_VALUE(300001, 2, OTHER_PAY, "兜底基金支出"),
     /**
      * 意外伤害基金支出
      */
-    OTHER_PAY_YW_SH_FUND_VALUE(300002,2,OTHER_PAY,"意外伤害基金支出"),
+    OTHER_PAY_YW_SH_FUND_VALUE(300002, 2, OTHER_PAY, "意外伤害基金支出"),
     /**
      * 离休人员医疗保障金支出
      */
-    OTHER_PAY_LX_YL_FUND_VALUE(300003,2,OTHER_PAY,"离休人员医疗保障金支出"),
+    OTHER_PAY_LX_YL_FUND_VALUE(300003, 2, OTHER_PAY, "离休人员医疗保障金支出"),
     /**
      * 离休人员优惠金支出
      */
-    OTHER_PAY_LX_YH_FUND_VALUE(300004,2,OTHER_PAY,"离休人员优惠金支出"),
+    OTHER_PAY_LX_YH_FUND_VALUE(300004, 2, OTHER_PAY, "离休人员优惠金支出"),
     /**
      * 财政基金支出
      */
-    OTHER_PAY_CZ_FUND_VALUE(300005,2,OTHER_PAY,"财政基金支出"),
+    OTHER_PAY_CZ_FUND_VALUE(300005, 2, OTHER_PAY, "财政基金支出"),
     /**
      * 财政预支支出
      */
-    OTHER_PAY_CZ_YZ_FUND_VALUE(300006,2,OTHER_PAY,"财政预支支出"),
+    OTHER_PAY_CZ_YZ_FUND_VALUE(300006, 2, OTHER_PAY, "财政预支支出"),
     /**
      * 职工大病基金支出
      */
-    OTHER_PAY_ZG_DB_FUND_VALUE(300007,2,OTHER_PAY,"职工大病基金支出"),
+    OTHER_PAY_ZG_DB_FUND_VALUE(300007, 2, OTHER_PAY, "职工大病基金支出"),
     /**
      * 二乙基金支出
      */
-    OTHER_PAY_EY_FUND_VALUE(300008,2,OTHER_PAY,"二乙基金支出"),
+    OTHER_PAY_EY_FUND_VALUE(300008, 2, OTHER_PAY, "二乙基金支出"),
     /**
      * 倾斜救助支出
      */
-    OTHER_PAY_QX_JZ_FUND_VALUE(300009,2,OTHER_PAY,"倾斜救助支出"),
+    OTHER_PAY_QX_JZ_FUND_VALUE(300009, 2, OTHER_PAY, "倾斜救助支出"),
     /**
      * 医疗救助再救助基金
      */
-    OTHER_PAY_YL_JZ_FUND_VALUE(300010,2,OTHER_PAY,"医疗救助再救助基金"),
+    OTHER_PAY_YL_JZ_FUND_VALUE(300010, 2, OTHER_PAY, "医疗救助再救助基金"),
     /**
      * 医院负担金额
      */
-    HOSP_PART_AMT(300011,2,OTHER_PAY,"医院负担金额"),
+    HOSP_PART_AMT(300011, 2, OTHER_PAY, "医院负担金额"),
 
+    // 医保结算返回值记录枚举
+    FULAMT_OWNPAY_AMT(1, 2, null, "全自费金额"),
+    // PSN_PART_AMT(2,2,null,"个人负担总金额"),
+    OVERLMT_SELFPAY(3, 2, null, "超限价自费费用"), PRESELFPAY_AMT(4, 2, null, "先行自付金额"), INSCP_SCP_AMT(5, 2, null, "符合政策范围金额"),
+    ACT_PAY_DEDC(6, 2, null, "实际支付起付线"), POOL_PROP_SELFPAY(7, 2, null, "基本医疗保险统筹基金支付比例"), BALC(8, 2, null, "余额"),
 
-    //医保结算返回值记录枚举
-    FULAMT_OWNPAY_AMT(1,2,null,"全自费金额"),
-    //PSN_PART_AMT(2,2,null,"个人负担总金额"),
-    OVERLMT_SELFPAY(3,2,null,"超限价自费费用"),
-    PRESELFPAY_AMT(4,2,null,"先行自付金额"),
-    INSCP_SCP_AMT(5,2,null,"符合政策范围金额"),
-    ACT_PAY_DEDC(6,2,null,"实际支付起付线"),
-    POOL_PROP_SELFPAY(7,2,null,"基本医疗保险统筹基金支付比例"),
-    BALC(8,2,null,"余额"),
+    // 基金类型，下述仅作记录
+    BIRTH_FUND(510100, 2, YB_FUND_PAY, "生育基金"), RETIREE_MEDICAL(340100, 2, YB_FUND_PAY, "离休人员医疗保障基金"),
+    URBAN_BASIC_MEDICAL(390100, 2, YB_FUND_PAY, "城乡居民基本医疗保险基金"),
+    URBAN_SERIOUS_ILLNESS(390200, 2, YB_FUND_PAY, "城乡居民大病医疗保险基金"), MEDICAL_ASSISTANCE(610100, 2, YB_FUND_PAY, "医疗救助基金"),
+    GOVERNMENT_SUBSIDY(640100, 2, YB_FUND_PAY, "政府兜底基金"), ACCIDENT_INSURANCE(390400, 2, YB_FUND_PAY, "意外伤害基金"),
+    CARE_INSURANCE(620100, 2, YB_FUND_PAY, "照护保险基金"), 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(999981, 2, YB_FUND_PAY, "电子钱包"), HEALTHCARE_PREPAYMENT(360300, 2, YB_FUND_PAY, "保健预支基金"),
 
+    // 师大中银支付
+    BPC_PAY(500000, 2, SELF_PAY, "BPC支付"),
+    // 师大专属
+    SCHOOL_GF_PAY(400000, 1, null, "学校垫支");
 
-    //基金类型，下述仅作记录
-    BIRTH_FUND(510100,2,YB_FUND_PAY, "生育基金"),
-    RETIREE_MEDICAL(340100,2,YB_FUND_PAY, "离休人员医疗保障基金"),
-    URBAN_BASIC_MEDICAL(390100,2,YB_FUND_PAY, "城乡居民基本医疗保险基金"),
-    URBAN_SERIOUS_ILLNESS(390200,2,YB_FUND_PAY, "城乡居民大病医疗保险基金"),
-    MEDICAL_ASSISTANCE(610100,2,YB_FUND_PAY, "医疗救助基金"),
-    GOVERNMENT_SUBSIDY(640100,2,YB_FUND_PAY, "政府兜底基金"),
-    ACCIDENT_INSURANCE(390400,2,YB_FUND_PAY, "意外伤害基金"),
-    CARE_INSURANCE(620100,2,YB_FUND_PAY, "照护保险基金"),
-    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,"保健预支基金");
-//
-//
-//    /**
-//     * 现金支付
-//     */
-//    CASH(1, 1, "现金支付"),
-//
-//    /**
-//     * 微信支付
-//     */
-//    VX_PAY(2, 1, "微信支付"),
-//
-//    /**
-//     * 支付宝支付
-//     */
-//    ALI_PAY(3, 1, "支付宝支付"),
-//
-//    /**
-//     * 银联支付
-//     */
-//    UNION_PAY(4, 1, "银联支付"),
-//
-//    /**
-//     * 医保账户支付
-//     */
-//    YB_ZH_PAY(5, 1, "医保账户支付"),
-//
-//    /**
-//     * 医保统筹支付合计
-//     */
-//    YB_TC_SUM_PAY(6, 1, "医保统筹支付合计"),
-//
-//    /**
-//     * 医保统筹支付
-//     */
-//    YB_TC_PAY(7, 2, "医保统筹支付"),
-//
-//    /**
-//     * 医保公务员补助
-//     */
-//    YB_GWY_PAY(8, 2, "医保公务员补助"),
-//
-//    /**
-//     * 先行自付金额
-//     */
-//    XX_SELF_PAY(9, 2, "先行自付金额"),
-//
-//    /**
-//     * 全自费金额
-//     */
-//    ALL_SELF_PAY(10, 2, "先行自付金额"),
-//
-//    /**
-//     * 医疗工伤支付
-//     */
-//    YL_GS_PAY(11, 2, "医疗工伤支付"),
-//
-//    /**
-//     * 老红军支付
-//     */
-//    YB_HJ_PAY(12, 2, "老红军支付"),
-//
-//    /**
-//     * 离休人员医疗保障基金支付金额
-//     */
-//    YB_LTX_PAY(13, 2, "离休人员医疗保障基金支付金额"),
-//
-//    /**
-//     * 居民统筹
-//     */
-//    YB_JM_TC_PAY(14, 2, "居民统筹"),
-//    /**
-//     * 居民大病
-//     */
-//    YB_JM_DB_PAY(15, 2, "居民大病"),
-//    /**
-//     * 补充医疗补助基金支付金额
-//     */
-//    YB_BC_PAY(16, 2, "补充医疗补助基金支付金额"),
-//    /**
-//     * 其他扶贫报销金额
-//     */
-//    YB_OTHER_FP_PAY(17, 2, "其他扶贫报销金额"),
-//    /**
-//     * 健康扶贫医疗基金
-//     */
-//    YB_JK_FP_PAY(18, 2, "健康扶贫医疗基金"),
-//    /**
-//     * 精准脱贫保险金额
-//     */
-//    YB_JZ_TP_PAY(19, 2, "精准脱贫保险金额"),
-//    /**
-//     * 提交医保总额
-//     */
-//    YB_SUM_FEE(20, 2, "提交医保总额"),
-//    /**
-//     * 二乙医疗专项医疗基金支出
-//     */
-//    YB_EY_PAY(21, 2, "二乙医疗专项医疗基金支出"),
-//    /**
-//     * 慢特病支付
-//     */
-//    YB_TM_PAY(22, 2, "补充医疗补助基金支付金额"),
-//    /**
-//     * 定点医疗机构垫支
-//     */
-//    YB_ORG_PAY(23, 2, "定点医疗机构垫支"),
-//    /**
-//     * 起付线公务员返还
-//     */
-//    YB_RETURN_GWY_PAY(24, 2, "起付线公务员返还"),
-//    /**
-//     * 大额理赔金额
-//     */
-//    YB_DELP_PAY(25, 2, "大额理赔金额"),
-//    /**
-//     * 民政救助金额
-//     */
-//    YB_MZJZ_PAY(26, 2, "民政救助金额"),
-//    /**
-//     * 生育基金支付
-//     */
-//    BIRTH_TC_PAY_AMOUNT(27, 1, "生育基金支付"),
-//    /**
-//     * 生育账户支付
-//     */
-//    BIRTH_ZH_PAY_AMOUNT(28, 1, "生育账户支付"),
-//    /**
-//     * 符合范围金额
-//     */
-//    YB_FHFW_AMOUNT(29, 2, "符合范围金额"),
-//    /**
-//     * 财政兜底基金支出
-//     */
-//    YB_CZDD_AMOUNT(30, 2, "财政兜底基金支出");
+    //
+    //
+    // /**
+    // * 现金支付
+    // */
+    // CASH(1, 1, "现金支付"),
+    //
+    // /**
+    // * 微信支付
+    // */
+    // VX_PAY(2, 1, "微信支付"),
+    //
+    // /**
+    // * 支付宝支付
+    // */
+    // ALI_PAY(3, 1, "支付宝支付"),
+    //
+    // /**
+    // * 银联支付
+    // */
+    // UNION_PAY(4, 1, "银联支付"),
+    //
+    // /**
+    // * 医保账户支付
+    // */
+    // YB_ZH_PAY(5, 1, "医保账户支付"),
+    //
+    // /**
+    // * 医保统筹支付合计
+    // */
+    // YB_TC_SUM_PAY(6, 1, "医保统筹支付合计"),
+    //
+    // /**
+    // * 医保统筹支付
+    // */
+    // YB_TC_PAY(7, 2, "医保统筹支付"),
+    //
+    // /**
+    // * 医保公务员补助
+    // */
+    // YB_GWY_PAY(8, 2, "医保公务员补助"),
+    //
+    // /**
+    // * 先行自付金额
+    // */
+    // XX_SELF_PAY(9, 2, "先行自付金额"),
+    //
+    // /**
+    // * 全自费金额
+    // */
+    // ALL_SELF_PAY(10, 2, "先行自付金额"),
+    //
+    // /**
+    // * 医疗工伤支付
+    // */
+    // YL_GS_PAY(11, 2, "医疗工伤支付"),
+    //
+    // /**
+    // * 老红军支付
+    // */
+    // YB_HJ_PAY(12, 2, "老红军支付"),
+    //
+    // /**
+    // * 离休人员医疗保障基金支付金额
+    // */
+    // YB_LTX_PAY(13, 2, "离休人员医疗保障基金支付金额"),
+    //
+    // /**
+    // * 居民统筹
+    // */
+    // YB_JM_TC_PAY(14, 2, "居民统筹"),
+    // /**
+    // * 居民大病
+    // */
+    // YB_JM_DB_PAY(15, 2, "居民大病"),
+    // /**
+    // * 补充医疗补助基金支付金额
+    // */
+    // YB_BC_PAY(16, 2, "补充医疗补助基金支付金额"),
+    // /**
+    // * 其他扶贫报销金额
+    // */
+    // YB_OTHER_FP_PAY(17, 2, "其他扶贫报销金额"),
+    // /**
+    // * 健康扶贫医疗基金
+    // */
+    // YB_JK_FP_PAY(18, 2, "健康扶贫医疗基金"),
+    // /**
+    // * 精准脱贫保险金额
+    // */
+    // YB_JZ_TP_PAY(19, 2, "精准脱贫保险金额"),
+    // /**
+    // * 提交医保总额
+    // */
+    // YB_SUM_FEE(20, 2, "提交医保总额"),
+    // /**
+    // * 二乙医疗专项医疗基金支出
+    // */
+    // YB_EY_PAY(21, 2, "二乙医疗专项医疗基金支出"),
+    // /**
+    // * 慢特病支付
+    // */
+    // YB_TM_PAY(22, 2, "补充医疗补助基金支付金额"),
+    // /**
+    // * 定点医疗机构垫支
+    // */
+    // YB_ORG_PAY(23, 2, "定点医疗机构垫支"),
+    // /**
+    // * 起付线公务员返还
+    // */
+    // YB_RETURN_GWY_PAY(24, 2, "起付线公务员返还"),
+    // /**
+    // * 大额理赔金额
+    // */
+    // YB_DELP_PAY(25, 2, "大额理赔金额"),
+    // /**
+    // * 民政救助金额
+    // */
+    // YB_MZJZ_PAY(26, 2, "民政救助金额"),
+    // /**
+    // * 生育基金支付
+    // */
+    // BIRTH_TC_PAY_AMOUNT(27, 1, "生育基金支付"),
+    // /**
+    // * 生育账户支付
+    // */
+    // BIRTH_ZH_PAY_AMOUNT(28, 1, "生育账户支付"),
+    // /**
+    // * 符合范围金额
+    // */
+    // YB_FHFW_AMOUNT(29, 2, "符合范围金额"),
+    // /**
+    // * 财政兜底基金支出
+    // */
+    // YB_CZDD_AMOUNT(30, 2, "财政兜底基金支出");
     @EnumValue
     private Integer value;
     private Integer level;
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
index b765afa8..b1c72599 100644
--- 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
@@ -8,7 +8,7 @@ import lombok.Getter;
 /**
  * 触发场景
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Getter
 @AllArgsConstructor
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
index e6718269..cfc81a71 100644
--- 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
@@ -8,7 +8,7 @@ import lombok.Getter;
 /**
  * 反馈类型
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Getter
 @AllArgsConstructor
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/DateTimeUtils.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/DateTimeUtils.java
new file mode 100644
index 00000000..61fc8771
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/DateTimeUtils.java
@@ -0,0 +1,20 @@
+package com.openhis.common.utils;
+
+import java.util.Date;
+
+public class DateTimeUtils {
+
+    /**
+     * 判断时间是否重叠
+     *
+     * @param start1 开始时间1
+     * @param end1 开始时间1
+     * @param start2 开始时间2
+     * @param end2 开始时间2
+     * @return 是否重叠
+     */
+    public static boolean isOverlap(Date start1, Date end1, Date start2, Date end2) {
+        // 判断是否重叠：start1 < end2 && end1 > start2
+        return start1.before(end2) && end1.after(start2);
+    }
+}
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardAgeCalculator.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardAgeCalculator.java
new file mode 100644
index 00000000..2f6d8ed0
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/IdCardAgeCalculator.java
@@ -0,0 +1,110 @@
+package com.openhis.common.utils;
+
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+/**
+ * @ClassName IdCardAgeCalculator
+ * @Description  根据身份证号 计算年纪
+ * @Author raymond
+ * @Date 2025/11/4 10:32
+ * @Version 1.0
+ **/
+public class IdCardAgeCalculator {
+    /**
+     * 根据身份证号计算年龄（支持15/18位）
+     * @param idCard 身份证号
+     * @return 年龄（若身份证号非法，返回-1）
+     */
+    public static int calculateAge(String idCard) {
+        // 1. 校验身份证号合法性（基础校验：长度、非空）
+        if (!isValidIdCard(idCard)) {
+            System.out.println("身份证号格式非法！");
+            return -1;
+        }
+
+        // 2. 提取出生日期字符串（15位转18位格式）
+        String birthDateStr = extractBirthDateStr(idCard);
+
+        // 3. 解析出生日期为LocalDate（处理格式异常）
+        LocalDate birthDate;
+        try {
+            birthDate = LocalDate.parse(birthDateStr, DateTimeFormatter.ofPattern("yyyyMMdd"));
+        } catch (DateTimeParseException e) {
+            System.out.println("出生日期解析失败，身份证号可能非法！");
+            return -1;
+        }
+
+        // 4. 计算年龄（当前日期 - 出生日期）
+        LocalDate currentDate = LocalDate.now(); // 若需指定日期，替换为 LocalDate.of(2024, 5, 20)
+        return calculateAgeBetweenDates(birthDate, currentDate);
+    }
+
+    /**
+     * 基础校验身份证号（非空、长度15或18位、数字/最后一位X）
+     */
+    private static boolean isValidIdCard(String idCard) {
+        if (idCard == null || idCard.trim().isEmpty()) {
+            return false;
+        }
+        // 正则：15位纯数字，或18位数字（最后一位可大写X）
+        String regex = "^(\\d{15}|\\d{17}([0-9]|X))$";
+        return idCard.matches(regex);
+    }
+
+    /**
+     * 从身份证号中提取出生日期字符串（统一转为yyyyMMdd格式）
+     */
+    private static String extractBirthDateStr(String idCard) {
+        String birthDateStr;
+        if (idCard.length() == 18) {
+            // 18位：第7-14位（索引6-13）
+            birthDateStr = idCard.substring(6, 14);
+        } else {
+            // 15位：第7-12位（索引6-11），补前两位年份（19xx或20xx，这里简化为19xx，实际需根据规则判断）
+            String year = "19" + idCard.substring(6, 8);
+            String monthDay = idCard.substring(8, 12);
+            birthDateStr = year + monthDay;
+        }
+        return birthDateStr;
+    }
+
+    /**
+     * 根据出生日期和当前日期计算年龄（处理未过生日的情况）
+     */
+    private static int calculateAgeBetweenDates(LocalDate birthDate, LocalDate currentDate) {
+        // 计算年份差
+        Period period = Period.between(birthDate, currentDate);
+        int age = period.getYears();
+
+        // 检查当前日期是否已超过当年的出生日期（未超过则年龄减1）
+        LocalDate birthdayThisYear = birthDate.withYear(currentDate.getYear());
+        if (currentDate.isBefore(birthdayThisYear)) {
+            age--;
+        }
+
+        // 防止年龄为负数（如出生日期在当前日期之后，理论上身份证号不会出现此情况）
+        return Math.max(age, 0);
+    }
+
+    // 测试示例
+    public static void main(String[] args) {
+        // 测试1：18位身份证（出生日期2000-01-01，当前日期2024-05-20 → 年龄24）
+        String idCard18 = "110101200001011234";
+        System.out.println("18位身份证年龄：" + calculateAge(idCard18));
+
+        // 测试2：15位身份证（出生日期2000-01-01 → 15位表示为000101，补全后20000101）
+        String idCard15 = "110101000101123";
+        System.out.println("15位身份证年龄：" + calculateAge(idCard15));
+
+        // 测试3：未过生日的情况（出生日期2000-06-01，当前日期2024-05-20 → 年龄23）
+        String idCardNotBirthday = "110101200006011234";
+        System.out.println("未过生日的年龄：" + calculateAge(idCardNotBirthday));
+
+        // 测试4：非法身份证号（长度错误）
+        String idCardInvalid = "11010120000101123"; // 17位
+        System.out.println("非法身份证年龄：" + calculateAge(idCardInvalid));
+    }
+}
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
index c9cc729a..a0cff496 100644
--- 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
@@ -3,15 +3,16 @@
  */
 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.Calendar;
 import java.util.Date;
 import java.util.concurrent.ThreadLocalRandom;
 
+import com.openhis.common.constant.CommonConstants;
+
 /**
  * 身份证号生成工具类
  *
@@ -98,4 +99,74 @@ public class IdCardUtil {
             throw new IllegalArgumentException("无法解析生日日期: " + e.getMessage());
         }
     }
+
+    /**
+     * 根据身份证号计算年龄
+     *
+     * @param idCard 身份证号码（15位或18位）
+     * @return 计算得到的年龄（整数）
+     * @throws IllegalArgumentException 如果身份证号格式无效或包含非法字符
+     */
+    public static Integer calculateAgeFromIdCard(String idCard) {
+        // 验证身份证号基本格式
+        if (idCard == null || (idCard.length() != 15 && idCard.length() != 18)) {
+            throw new IllegalArgumentException("身份证号码长度无效，必须是15位或18位");
+        }
+
+        // 验证身份证号字符合法性（仅包含数字和X）
+        if (!idCard.matches("^[0-9Xx]+$")) {
+            throw new IllegalArgumentException("身份证号码包含非法字符");
+        }
+
+        try {
+            // 提取出生日期
+            String birthYearStr, birthMonthStr, birthDayStr;
+
+            if (idCard.length() == 15) {
+                // 15位身份证：7-8位为年份（后两位），9-10位为月份，11-12位为日期
+                birthYearStr = "19" + idCard.substring(6, 8);
+                birthMonthStr = idCard.substring(8, 10);
+                birthDayStr = idCard.substring(10, 12);
+            } else {
+                // 18位身份证：7-10位为年份，11-12位为月份，13-14位为日期
+                birthYearStr = idCard.substring(6, 10);
+                birthMonthStr = idCard.substring(10, 12);
+                birthDayStr = idCard.substring(12, 14);
+            }
+
+            // 转换为整数
+            int birthYear = Integer.parseInt(birthYearStr);
+            int birthMonth = Integer.parseInt(birthMonthStr);
+            int birthDay = Integer.parseInt(birthDayStr);
+
+            // 验证日期有效性
+            if (birthMonth < 1 || birthMonth > 12 || birthDay < 1 || birthDay > 31) {
+                throw new IllegalArgumentException("身份证中的出生日期无效");
+            }
+
+            // 获取当前日期
+            Calendar calendar = Calendar.getInstance();
+            int currentYear = calendar.get(Calendar.YEAR);
+            int currentMonth = calendar.get(Calendar.MONTH) + 1; // Calendar月份从0开始
+            int currentDay = calendar.get(Calendar.DAY_OF_MONTH);
+
+            // 计算年龄
+            int age = currentYear - birthYear;
+
+            // 判断是否已过生日
+            if (currentMonth < birthMonth || (currentMonth == birthMonth && currentDay < birthDay)) {
+                age--; // 未过生日，年龄减1
+            }
+
+            // 验证年龄合理性
+            if (age < 0 || age > 150) {
+                throw new IllegalArgumentException("计算得到的年龄超出合理范围");
+            }
+
+            return age;
+
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("身份证号码中的日期部分格式错误", e);
+        }
+    }
 }
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisKeys.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisKeys.java
new file mode 100644
index 00000000..359fe80a
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisKeys.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.openhis.common.utils;
+
+/**
+ * Redis所有Keys
+ */
+public class RedisKeys {
+
+
+    /**
+     * 商品缓存
+     * @param itemId
+     * @return
+     */
+    public static String getProductsKey(String itemId){
+        return "products_change_price:item_" + itemId + "_key";
+    }
+}
diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java
new file mode 100644
index 00000000..36d62655
--- /dev/null
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/RedisUtil.java
@@ -0,0 +1,612 @@
+package com.openhis.common.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-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java
new file mode 100644
index 00000000..6c52f479
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java
@@ -0,0 +1,96 @@
+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-10-31
+ */
+@Data
+@TableName("adm_change_price_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ChangePriceRecord extends HisBaseEntity {
+
+    /** 本表id */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 仓库位置 */
+    private Long locationId;
+
+    /** 改价申请人id */
+    private Long applicantId;
+
+    /** 目标枚举 药品、耗材、诊疗、挂号 */
+    private Integer itemCategoryEnum;
+
+    /** 药品ID、耗材ID、诊疗ID、挂号ID */
+    private Long itemId;
+
+    /** 原进货价 */
+    private BigDecimal originBuyingPrice;
+
+    /** 原新价格 */
+    private BigDecimal originRetailPrice;
+
+    /** 审批人ID */
+    private Long approverId;
+
+    /** 审批时间 */
+    private Date approvalTime;
+
+    /** 删除标识 默认 0 未删除 */
+    private String deleteFlag;
+
+    /** 当前品库存量 */
+    private BigDecimal itemQuantity;
+
+    /** 零售价盈负差*/
+    private BigDecimal differenceRetailPrice;
+    /**进货价盈负差*/
+    private BigDecimal differenceBuyingPrice;
+
+    /** 当前业务批次号 */
+    private String busNo;
+
+    /** 改价原因 */
+    private String description;
+
+    /** 改价申请时间 */
+    private Date applicantTime;
+
+    /** 业务表名药品、耗材、诊疗、挂号 */
+    private String itemTable;
+
+    /** 新进货价 */
+    private BigDecimal newBuyingPrice;
+
+    /** 新零售价 */
+    private BigDecimal newRetailPrice;
+
+    /** 物品计量单位 */
+    private String unitCode;
+
+    /** 审批状态 */
+    private Integer statusEnum;
+
+    /** 批次号 */
+    private String lotNumber;
+
+    /** 条件理由 */
+    private String reason;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index 7a35e522..f24816e1 100644
--- a/openhis-server-new/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
@@ -154,4 +154,10 @@ public class ChargeItem extends HisBaseEntity {
 
     /** 执行id */
     private Long procedureId;
+
+    /** 发放所在表 */
+    private String dispenseTable;
+
+    /** 发放ID */
+    private Long dispenseId;
 }
diff --git a/openhis-server-new/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
index 9c153422..fffcb643 100644
--- a/openhis-server-new/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
@@ -1,6 +1,7 @@
 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;
diff --git a/openhis-server-new/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
index 4febb00c..f4774a0a 100644
--- a/openhis-server-new/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
@@ -6,6 +6,7 @@ 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;
@@ -27,6 +28,11 @@ public class HealthcareService extends HisBaseEntity {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    /**
+     * 编码
+     */
+    private String busNo;
+
     /** 活动标记 */
     private Integer activeFlag;
 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java
new file mode 100644
index 00000000..b1062ad4
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java
@@ -0,0 +1,90 @@
+package com.openhis.administration.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-02-20
+ */
+@Data
+@TableName("adm_patient_student")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class PatientStudent extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 姓名 */
+    private String name;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 性别 */
+    private Integer gender;
+
+    /** 年龄 */
+    private Integer age;
+
+    /** 学号 */
+    private String studentId;
+
+    /** 身份证号 */
+    private String idNumber;
+
+    /** 电话 */
+    private String phone;
+
+    /** 学院 */
+    private String college;
+
+    /** 专业 */
+    private String major;
+
+    /** 学历层次（0预科生1本科生2硕士研究生3博士研究生） */
+    private Integer educationLevel;
+
+    /** 入校时间 */
+    private Date enrollmentDate;
+
+    /** 离校时间 */
+    private Date graduationDate;
+
+    /** 年级 */
+    private String grade;
+
+    /** 学习形式（1全日制2非全日制） */
+    private Integer studyMode;
+
+    /** 在校状态（0在校1休学2离校） */
+    private Integer studentStatus;
+
+    /** 体检结果（0未体检1体检不合格2体检合格） */
+    private Integer physicalExamResult;
+
+    /** 辅导员 */
+    private String counselor;
+
+    /** 辅导员电话 */
+    private String counselorPhone;
+
+    /** 患者ID */
+    private Long patientId;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index 819d4458..8a8910f2 100644
--- a/openhis-server-new/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
@@ -1,16 +1,14 @@
 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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.AdministrativeGender;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -90,7 +88,7 @@ public class Practitioner extends HisBaseEntity {
     private Long userId;
 
     /** 医生职称 */
-    private String drProfttlCode ;
+    private String drProfttlCode;
 
     /** 证件类型 */
     private String prscDrCertCode;
@@ -103,4 +101,7 @@ public class Practitioner extends HisBaseEntity {
 
     /** 签名图片 */
     private String signature;
+
+    /** pos机编号 */
+    private String posNo;
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java
new file mode 100644
index 00000000..67a38e3a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChangePriceDataDto.java
@@ -0,0 +1,96 @@
+package com.openhis.administration.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;
+
+/**
+ * @ClassName ChangePricePageDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/31 17:35
+ * @Version 1.0
+ **/
+@Data
+public class ChangePriceDataDto {
+
+    /** 批次号 */
+    private String originLotNumber;
+
+    /** 改价申请人id */
+    private Long applicantId;
+
+    /** 目标枚举 药品、耗材、诊疗、挂号 */
+    private Integer itemCategoryEnum;
+    private String itemCategoryEnum_Text;
+
+    /** 药品ID、耗材ID、诊疗ID、挂号ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+    /**
+     * 获取名称
+     */
+    private String itemName;
+    /** 原进货价 */
+    private BigDecimal originBuyingPrice;
+
+    /** 原零售价价格 */
+    private BigDecimal originRetailPrice;
+
+    /** 当前品库存量 */
+    private BigDecimal itemQuantity;
+
+    /** 当前业务批次号 */
+    private String busNo;
+
+    /** 改价申请时间 */
+    private Date applicantTime;
+
+    /** 新进货价 */
+    private BigDecimal newBuyingPrice;
+
+    /** 新零售价 */
+    private BigDecimal newRetailPrice;
+
+    /** 物品计量单位 */
+    private String unitCode;
+
+    /** 审批状态 */
+    private Integer statusEnum;
+    private Integer statusEnum_Text;
+
+    /** 批次号 */
+    private String lotNumber;
+
+    /** 条件理由 */
+    private String reason;
+
+    /** 零售价盈负差*/
+    private BigDecimal differenceRetailPrice;
+    /**进货价盈负差*/
+    private BigDecimal differenceBuyingPrice;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 价格主表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeId;
+    /**
+     * 调价表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long changePriceRecordId;
+
+    private String label;
+    /**
+     * 规格
+     */
+    private String totalVolume;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java
new file mode 100644
index 00000000..35501d06
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefDetailPriceDto.java
@@ -0,0 +1,24 @@
+package com.openhis.administration.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ChargeItemDefDetailPriceDto
+ * @Description 获取 药品或耗材 进货价和零售价的DTO
+ * @Author raymond
+ * @Date 2025/11/1 21:40
+ * @Version 1.0
+ **/
+@Data
+public class ChargeItemDefDetailPriceDto {
+    /**
+     * 进货价或者零售价
+     */
+    private BigDecimal price;
+    /**
+     * 拆零比
+     */
+    private BigDecimal partPercent;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java
new file mode 100644
index 00000000..ff7e203a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterDataDto.java
@@ -0,0 +1,27 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName EncounterDataDto
+ * @Description
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class EncounterDataDto {
+    /**
+     * 换着ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    /**
+     * 就诊表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java
new file mode 100644
index 00000000..89efa457
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/EncounterLocationDataDto.java
@@ -0,0 +1,27 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName EncounterLocationDataDto
+ * @Description
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class EncounterLocationDataDto {
+    /**
+     * 区域ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 就诊表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java
new file mode 100644
index 00000000..94d775fa
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/HealthcareDto.java
@@ -0,0 +1,39 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+/**
+ * @ClassName HealcareDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/18 14:59
+ * @Version 1.0
+ **/
+@Data
+public class HealthcareDto {
+
+    private Long itemId;
+    /**
+     * 科室id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 项目名称
+     */
+    private String name;
+    /**
+     * 分类
+     */
+    private String categoryCode;
+    /**
+     * 服务类型
+     */
+    private String typeCode;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java
new file mode 100644
index 00000000..0d3237a5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/LocationDataDto.java
@@ -0,0 +1,49 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName roleDataList
+ * @Description 权限集合
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class LocationDataDto {
+    /**
+     * 区域ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 状态
+     */
+    private Integer statusEnum;
+    /**
+     * 模式编码
+     */
+    private Integer modeEnum;
+    /**
+     * 操作状态
+     */
+    private Integer operationalEnum;
+    /**
+     * 岗位类型
+     */
+    private String busNo;
+    /**
+     * 区域名称
+     */
+    private String areaName;
+    /**
+     * 患者详细信息
+     */
+    private List<PatientBedInfoDto> patientBedInfoDtoList;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java
new file mode 100644
index 00000000..56f3ce3f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/OrgDataDto.java
@@ -0,0 +1,32 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OrgDataDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/22 09:44
+ * @Version 1.0
+ **/
+@Data
+public class OrgDataDto {
+    /**
+     * id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 挂号集合
+     */
+    private List<AdjustPriceMedListDto> healthDataList;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java
new file mode 100644
index 00000000..dc77e751
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientBedInfoDto.java
@@ -0,0 +1,58 @@
+package com.openhis.administration.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 java.util.Date;
+
+/**
+ * @ClassName PatientBedInfoDto
+ * @Description 患者详细信息
+ * @Author raymond
+ * @Date 2025/10/30 08:10
+ * @Version 1.0
+ **/
+@Data
+public class PatientBedInfoDto {
+
+    /**
+     * 床位
+     */
+    private String bedName;
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+    /**
+     * 患者编号ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    /**
+     * 患者性别
+     */
+    private String patientGenderText;
+    /**
+     * 患者编号
+     */
+    private String patientNumber;
+    /**
+     * 就诊号ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 床位ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long bedLocationId;
+    /** 生日 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthDate;
+    private String patientAgeText;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java
new file mode 100644
index 00000000..22aded41
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PatientDataDto.java
@@ -0,0 +1,26 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+/**
+ * @ClassName EncounterDataDto
+ * @Description
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class PatientDataDto {
+    /**
+     * 换着ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    private String patientName;
+    private Integer gender;
+    private String idCard;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java
new file mode 100644
index 00000000..41db68b6
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/RoleDataDto.java
@@ -0,0 +1,39 @@
+package com.openhis.administration.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+/**
+ * @ClassName roleDataList
+ * @Description 权限集合
+ * @Author raymond
+ * @Date 2025/10/27 16:01
+ * @Version 1.0
+ **/
+@Data
+public class RoleDataDto {
+    /**
+     * 权限表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long roleId;
+    /**
+     * 科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+    /**
+     * 区域ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+    /**
+     * 专业编码枚举
+     */
+    private Integer specialtyEnum;
+    /**
+     * 岗位类型
+     */
+    private String typeCode;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java
new file mode 100644
index 00000000..161db7bc
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChangePriceRecordMapper.java
@@ -0,0 +1,120 @@
+package com.openhis.administration.mapper;
+
+import com.openhis.administration.dto.ChangePriceDataDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.ChangePriceRecord;
+
+import java.util.List;
+
+/**
+ * 修改价格记录Mapper接口
+ *
+ * @author system
+ * @date 2025-10-15
+ */
+@Repository
+public interface ChangePriceRecordMapper extends BaseMapper<ChangePriceRecord> {
+    /**
+     * Desc: 根据条件 查询 药品调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchMedChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 药品调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:34 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchMedChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 耗材调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchDeviceChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 耗材调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:33 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchDeviceChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 诊疗调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchActivityChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 诊疗调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:32 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchActivityChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 挂号调价单
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchHealthChangePriceByBusNo(@Param("busNo") String busNo,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 挂号调价单
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:31 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchHealthChangePriceByItemId(@Param("itemId") Long itemId,@Param("categoryEnum") Integer categoryEnum,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据条件 查询 审批单 审核中的数据
+     * @param busNo
+     * @param statusEnum
+     * @Author raymond
+     * @Date 10:36 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchChangePriceRecordDataByBusNo(@Param("busNo") String busNo,@Param("statusEnum") Integer statusEnum);
+    /**
+     * Desc: 根据编号分组查询 数据
+     * @param busNo
+     * @Author raymond
+     * @Date 09:39 2025/11/5
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceRecord> searchChangePriceDataGroupByBusNo(@Param("busNo") String busNo);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java
new file mode 100644
index 00000000..c63c6041
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefDetailAppMapper.java
@@ -0,0 +1,30 @@
+package com.openhis.administration.mapper;
+
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 费用定价管理子Mapper接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Repository
+public interface ChargeItemDefDetailAppMapper extends BaseMapper<ChargeItemDefDetail> {
+
+    /**
+     * Desc: 根据 参数加载数据
+     * @param value
+     * @param code
+     * @Author raymond
+     * @Date 08:13 2025/10/29
+     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefDetail>
+     **/
+    List<ChargeItemDefDetail> searchChargeDetailDataByBusNo(@Param("value") String value, @Param("code") String code);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index a34e0486..44ba870b 100644
--- a/openhis-server-new/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
@@ -1,9 +1,11 @@
 package com.openhis.administration.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
 
 /**
  * 费用定价管理Mapper接口
@@ -13,5 +15,40 @@ import com.openhis.administration.domain.ChargeItemDefinition;
  */
 @Repository
 public interface ChargeItemDefinitionMapper extends BaseMapper<ChargeItemDefinition> {
+    /**
+     * Desc: 根据 conditionCode 和 药品ID 获取 原价和零售价
+     * 
+     * @param conditionCode
+     * @param instanceId
+     * @Author raymond
+     * @Date 21:44 2025/11/1
+     * @return com.openhis.administration.domain.ChargeItemDefinition
+     **/
+    ChargeItemDefDetailPriceDto getMedPriceByParam(@Param("conditionCode") String conditionCode,
+        @Param("instanceId") Long instanceId);
+
+    /**
+     * Desc: 根据 conditionCode 和 耗材ID 获取 原价和零售价
+     * 
+     * @param conditionCode
+     * @param instanceId
+     * @Author raymond
+     * @Date 07:23 2025/11/4
+     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     **/
+    ChargeItemDefDetailPriceDto getDevicePriceByParam(@Param("conditionCode") String conditionCode,
+        @Param("instanceId") Long instanceId);
+
+    /**
+     * Desc: 根据 状态和货品ID 加载诊疗或挂号的最新零售价
+     * 
+     * @param statusEnum
+     * @param instanceId
+     * @Author raymond
+     * @Date 22:02 2025/11/1
+     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     **/
+    ChargeItemDefDetailPriceDto getProductPrice(@Param("statusEnum") Integer statusEnum,
+        @Param("instanceId") Long instanceId);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 0971097d..19797f62 100644
--- a/openhis-server-new/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
@@ -1,10 +1,14 @@
 package com.openhis.administration.mapper;
 
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.administration.domain.DeviceDefinition;
 
+import java.util.List;
+
 /**
  * 器材定义管理Mapper接口
  *
@@ -13,5 +17,13 @@ import com.openhis.administration.domain.DeviceDefinition;
  */
 @Repository
 public interface DeviceDefinitionMapper extends BaseMapper<DeviceDefinition> {
+    /** 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * Desc:
+     * @param keyWord
+     * @Author raymond
+     * @Date 20:23 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchDeviceListByKeyWord(@Param("keyWord") String keyWord);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index fd67957f..e1752d16 100644
--- a/openhis-server-new/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
@@ -1,9 +1,11 @@
 package com.openhis.administration.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.administration.domain.EncounterLocation;
+import com.openhis.administration.dto.PatientBedInfoDto;
 
 /**
  * 就诊位置管理Mapper接口
@@ -14,4 +16,17 @@ import com.openhis.administration.domain.EncounterLocation;
 @Repository
 public interface EncounterLocationMapper extends BaseMapper<EncounterLocation> {
 
+    /**
+     * Desc: 根据区域ID查询所有 就诊信息
+     * 
+     * @param locationId
+     * @param statusEnum
+     * @param formEnum
+     * @Author raymond
+     * @Date 12:20 2025/10/28
+     * @return java.util.List<com.openhis.administration.dto.EncounterDataDto>
+     **/
+    PatientBedInfoDto searchEncounterDataByLocationId(@Param("locationId") Long locationId,
+        @Param("statusEnum") Integer statusEnum,@Param("formEnum") Integer formEnum);
+
 }
\ No newline at end of file
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
index 061911fb..1012ec4a 100644
--- 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
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.administration.domain.Encounter;
 import com.openhis.administration.dto.EncounterAccountDto;
+import com.openhis.administration.dto.EncounterDataDto;
 
 /**
  * 就诊管理Mapper接口
@@ -28,4 +29,26 @@ public interface EncounterMapper extends BaseMapper<Encounter> {
      */
     List<EncounterAccountDto> getEncounterInfoByTime(@Param("startDate") Date startDate,
         @Param("endDate") Date endDate);
+    /**
+     * Desc: 根据条件查询 encounter 数据
+     * @param imp
+     * @param amb
+     * @param encounterStatus
+     * @param encounterIds
+     * @Author raymond
+     * @Date 12:36 2025/10/28
+     * @return java.util.List<com.openhis.administration.dto.EncounterDataDto>
+     **/
+    List<EncounterDataDto> searchEncounterDataByIds(@Param("imp") Integer imp, @Param("amb") Integer amb,
+        @Param("encounterStatus") Long encounterStatus, @Param("encounterIds") List<Long> encounterIds);
+    /**
+     * Desc: 根据参数加载 患者记录信息
+     * @param classEnum
+     * @param encounterId
+     * @Author raymond
+     * @Date 12:34 2025/11/3
+     * @return com.openhis.administration.dto.EncounterDataDto
+     **/
+    EncounterDataDto getPatientIdByParam(@Param("classEnum") Integer classEnum,
+                                         @Param("encounterId") Long encounterId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index b666832f..31226fb3 100644
--- a/openhis-server-new/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
@@ -1,9 +1,14 @@
 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.HealthcareService;
+import com.openhis.administration.dto.HealthcareDto;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 
 /**
  * 服务项目管理Mapper接口
@@ -13,5 +18,22 @@ import com.openhis.administration.domain.HealthcareService;
  */
 @Repository
 public interface HealthcareServiceMapper extends BaseMapper<HealthcareService> {
+    /**
+     * Desc: 根据 项目id数组 加载 挂号数据集合
+     * 
+     * @param itemIds
+     * @Author raymond
+     * @Date 15:36 2025/10/18
+     * @return java.util.List<com.openhis.administration.dto.HealthcareDto>
+     **/
+    List<HealthcareDto> searchHealthByIds(@Param("itemIds") List<Long> itemIds);
+    /**
+     * Desc: 查询所有 挂号数据
+     * @param orgId
+     * @Author raymond
+     * @Date 08:32 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchAllHeathData(@Param("orgId") Long orgId,@Param("statusEnum") Integer statusEnum);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index b525c6b8..3e992935 100644
--- a/openhis-server-new/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
@@ -1,9 +1,14 @@
 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.Location;
+import com.openhis.administration.dto.LocationDataDto;
+import com.openhis.administration.dto.PatientBedInfoDto;
 
 /**
  * 位置管理Mapper接口
@@ -13,5 +18,22 @@ import com.openhis.administration.domain.Location;
  */
 @Repository
 public interface LocationMapper extends BaseMapper<Location> {
+    /**
+     * Desc: 根据区域id数组查询 区域表
+     * @param locationIds
+     * @Author raymond
+     * @Date 07:46 2025/10/28
+     * @return java.util.List<com.openhis.administration.dto.LocationDataDto>
+     **/
+    List<LocationDataDto> searchLocationDataByIds(@Param("locationIds") List<Long> locationIds);
+    /**
+     * Desc: 根据病区bus_no 查询病床
+     * @param busNo
+     * @param formEnum
+     * @Author raymond
+     * @Date 14:01 2025/10/28
+     * @return java.util.List<com.openhis.administration.dto.LocationDataDto>
+     **/
+    List<PatientBedInfoDto> searchLocationDataByBusNo(@Param("busNo") String busNo, @Param("formEnum") Integer formEnum, @Param("statusEnum") Integer statusEnum);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index c3622aca..c027796b 100644
--- a/openhis-server-new/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
@@ -1,10 +1,13 @@
 package com.openhis.administration.mapper;
 
+import com.openhis.administration.dto.OrgDataDto;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.administration.domain.Organization;
 
+import java.util.List;
+
 /**
  * 机构管理Mapper接口
  *
@@ -13,5 +16,13 @@ import com.openhis.administration.domain.Organization;
  */
 @Repository
 public interface OrganizationMapper extends BaseMapper<Organization> {
+    /**
+     * Desc:
+     * @param
+     * @Author raymond
+     * @Date 09:46 2025/10/22
+     * @return List<OrgDataDto>
+     **/
+    List<OrgDataDto> searchOrgDataByHealth();
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index dc2fde94..aac3507a 100644
--- a/openhis-server-new/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
@@ -1,10 +1,14 @@
 package com.openhis.administration.mapper;
 
+import com.openhis.administration.dto.PatientDataDto;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.administration.domain.Patient;
 
+import java.util.List;
+
 /**
  * 患者管理Mapper接口
  *
@@ -13,5 +17,14 @@ import com.openhis.administration.domain.Patient;
  */
 @Repository
 public interface PatientMapper extends BaseMapper<Patient> {
+    /**
+     * Desc: 根据属性查询用户信息
+     * @param patientId
+     * @param activeFlag
+     * @Author raymond
+     * @Date 12:53 2025/10/28
+     * @return java.util.List<com.openhis.administration.dto.PatientDataDto>
+     **/
+    List<PatientDataDto> searchPatientDataByPatientId(@Param("patientId") Long patientId,@Param("activeFlag") Integer activeFlag);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java
similarity index 54%
rename from openhis-server-new/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/PatientStudentMapper.java
index f1739704..957361cb 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemDefAppMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PatientStudentMapper.java
@@ -1,17 +1,17 @@
 package com.openhis.administration.mapper;
 
-import com.openhis.administration.domain.ChargeItemDefDetail;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.administration.domain.PatientStudent;
 
 /**
- * 费用定价管理子Mapper接口
+ * 公费医疗学生名单管理表Mapper接口
  *
  * @author system
  * @date 2025-02-20
  */
 @Repository
-public interface ChargeItemDefAppMapper extends BaseMapper<ChargeItemDefDetail> {
+public interface PatientStudentMapper extends BaseMapper<PatientStudent> {
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index f21fe449..37caa073 100644
--- a/openhis-server-new/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
@@ -1,9 +1,13 @@
 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.PractitionerRole;
+import com.openhis.administration.dto.RoleDataDto;
 
 /**
  * 岗位管理Mapper接口
@@ -13,5 +17,31 @@ import com.openhis.administration.domain.PractitionerRole;
  */
 @Repository
 public interface PractitionerRoleMapper extends BaseMapper<PractitionerRole> {
+    /**
+     * Desc: 根据员工ID 查询
+     * @param practitionerId
+     * @param roleCode
+     * @Author raymond
+     * @Date 16:43 2025/10/27
+     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     **/
+    List<RoleDataDto> searchPractitionerRoleByPractitionerId(@Param("practitionerId") Long practitionerId,@Param("roleCode") String roleCode);
+    /**
+     * Desc: 根据员工ID数组 查询
+     * @param practitionerIds
+     * @Author raymond
+     * @Date 16:49 2025/10/27
+     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     **/
+    List<RoleDataDto> searchPractitionerRoleByPractitionerIds(@Param("practitionerIds") Long practitionerIds);
+    /**
+     * Desc: 根据员工ID 查询 locationId数组
+     * @param practitionerId
+     * @param roleCode
+     * @Author raymond
+     * @Date 16:50 2025/10/27
+     * @return java.util.List<java.lang.Long>
+     **/
+    List<Long> searchPractitionerRoleLocationIds(@Param("practitionerId") Long practitionerId,@Param("roleCode") String roleCode);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 985e89d1..ba63524a 100644
--- a/openhis-server-new/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
@@ -84,4 +84,19 @@ public interface IAccountService extends IService<Account> {
      */
     List<Account> getAccountListByEncounter(Long encounterId);
 
+    /**
+     * 学生医保转学生自费
+     *
+     * @param encounterId 就诊id
+     * @return 账户id
+     */
+    Long getStudentSelfAccount(Long encounterId);
+
+    /**
+     * 学生自费转学生医保
+     *
+     * @param encounterId 就诊id
+     * @return 账户id
+     */
+    Long getStudentYbAccount(Long encounterId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java
new file mode 100644
index 00000000..57d40bde
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChangePriceRecordService.java
@@ -0,0 +1,175 @@
+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.ChangePriceRecord;
+import com.openhis.administration.dto.ChangePriceDataDto;
+
+/**
+ * 修改价格记录Service接口
+ *
+ * @author system
+ * @date 2025-10-15
+ */
+public interface IChangePriceRecordService extends IService<ChangePriceRecord> {
+    /**
+     * Desc: 根据单据号 进行提交审核操作
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 23:08 2025/11/1
+     * @return boolean
+     **/
+    boolean submitApproval(String busNo);
+
+    /**
+     * Desc: 根据单据号 查询列表
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 08:44 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceRecord> searchChangePriceDataForBusNo(String busNo);
+
+    /**
+     * Desc: 根据条件 查询 药品调价单
+     * 
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchMedChangePriceByBusNo(String busNo, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 药品调价单
+     * 
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:34 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchMedChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 耗材调价单
+     * 
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchDeviceChangePriceByBusNo(String busNo, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 耗材调价单
+     * 
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:33 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchDeviceChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 诊疗调价单
+     * 
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchActivityChangePriceByBusNo(String busNo, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 诊疗调价单
+     * 
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:32 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchActivityChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 挂号调价单
+     * 
+     * @param busNo
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 09:46 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchHealthChangePriceByBusNo(String busNo, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 根据条件 查询 挂号调价单
+     * 
+     * @param itemId
+     * @param categoryEnum
+     * @param statusEnum
+     * @Author raymond
+     * @Date 07:31 2025/11/4
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchHealthChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum);
+
+    /**
+     * Desc: 审核通过操作
+     * 
+     * @param busNo
+     * @param now
+     * @Author raymond
+     * @Date 10:13 2025/11/2
+     * @return void
+     **/
+    void agreeRequest(String busNo, Date now);
+
+    /**
+     * Desc: 审核驳回操作
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 18:43 2025/11/3
+     * @return boolean
+     **/
+    boolean rejectRequest(String busNo);
+
+    /**
+     * Desc: 根据条件 查询 审批单 审核中的数据
+     * 
+     * @param busNo
+     * @param statusEnum
+     * @Author raymond
+     * @Date 10:36 2025/11/2
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceDataDto> searchChangePriceRecordDataByBusNo(String busNo, Integer statusEnum);
+
+    /**
+     * Desc: 根据编号分组查询 数据
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 09:39 2025/11/5
+     * @return java.util.List<com.openhis.administration.dto.ChangePriceDataDto>
+     **/
+    List<ChangePriceRecord> searchChangePriceDataGroupByBusNo(String busNo);
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index ada5581f..805dd7ec 100644
--- a/openhis-server-new/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
@@ -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.ChargeItemDefDetail;
 
@@ -34,4 +36,33 @@ public interface IChargeItemDefDetailService extends IService<ChargeItemDefDetai
      * @return 新增结果
      */
     boolean deleteChargeItemDefApp(Long id);
+
+    /**
+     * Desc: 根据主表ID 数组加载 价格子表
+     * 
+     * @param chargeItemId
+     * @Author raymond
+     * @Date 22:56 2025/10/18
+     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefDetail>
+     **/
+    List<ChargeItemDefDetail> searchChargeItemDefDetailByIds(Long chargeItemId,String code,String lotNumber);
+
+    /**
+     * Desc: 根据 参数加载数据
+     * 
+     * @param value
+     * @param code
+     * @Author raymond
+     * @Date 08:13 2025/10/29
+     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefDetail>
+     **/
+    List<ChargeItemDefDetail> searchChargeDetailDataByBusNo(String value, String code);
+
+    /**
+     * 根据定价id查询批号售价
+     *
+     * @param chargeItemDefIdList 定价ids
+     * @return 批号售价信息
+     */
+    List<ChargeItemDefDetail> getLotNumberPriceByDefIds(List<Long> chargeItemDefIdList);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 90787307..86aff64c 100644
--- a/openhis-server-new/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
@@ -1,11 +1,13 @@
 package com.openhis.administration.service;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.domain.HealthcareService;
+import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
 
 /**
  * 费用定价管理Service接口
@@ -68,4 +70,59 @@ public interface IChargeItemDefinitionService extends IService<ChargeItemDefinit
     void addChargeItemDefinitionAndDetail(String chargeName, String typeCode, String ybCode, String unitCode,
         BigDecimal purchasePrice, BigDecimal retailPrice, BigDecimal maximumRetailPrice, Long orgId,
         String instanceTable, Long instanceId);
+
+    /**
+     * Desc: 根据 货品ID集合查询 价格主表 集合
+     * 
+     * @param itemIds
+     * @Author raymond
+     * @Date 22:39 2025/10/18
+     * @return java.util.List<com.openhis.administration.domain.ChargeItemDefinition>
+     **/
+    List<ChargeItemDefinition> searchChargeItemDefinitionByMedIds(List<Long> itemIds);
+
+    /**
+     * Desc: 根据参数加载对象
+     * 
+     * @param instanceId
+     * @param instanceTable
+     * @param statusEnum
+     * @Author raymond
+     * @Date 11:15 2025/10/30
+     * @return com.openhis.administration.domain.ChargeItemDefinition
+     **/
+    ChargeItemDefinition getChargeItemDefinitionEntity(Long instanceId, String instanceTable, Integer statusEnum);
+
+    /**
+     * Desc: 根据 conditionCode 和 货品ID 获取 原价和零售价
+     *
+     * @param conditionCode
+     * @param instanceId
+     * @Author raymond
+     * @Date 21:44 2025/11/1
+     * @return com.openhis.administration.domain.ChargeItemDefinition
+     **/
+    ChargeItemDefDetailPriceDto getMedPriceByParam(String conditionCode, Long instanceId);
+
+    /**
+     * Desc: 根据 conditionCode 和 耗材ID 获取 原价和零售价
+     *
+     * @param conditionCode
+     * @param instanceId
+     * @Author raymond
+     * @Date 07:23 2025/11/4
+     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     **/
+    ChargeItemDefDetailPriceDto getDevicePriceByParam(String conditionCode, Long instanceId);
+
+    /**
+     * Desc: 根据 状态和货品ID 加载诊疗或挂号的最新零售价
+     * 
+     * @param statusEnum
+     * @param instanceId
+     * @Author raymond
+     * @Date 22:02 2025/11/1
+     * @return com.openhis.administration.dto.ChargeItemDefDetailPriceDto
+     **/
+    ChargeItemDefDetailPriceDto getProductPrice(Integer statusEnum, Long instanceId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index a58092b2..f83a8f96 100644
--- a/openhis-server-new/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
@@ -101,6 +101,14 @@ public interface IChargeItemService extends IService<ChargeItem> {
      */
     List<ChargeItemDefInfo> getChargeItemDefInfoByIds(List<Long> chargeItemIds);
 
+    /**
+     * 收费项关联Def项目集合(带组套)
+     *
+     * @param chargeItemIds 集合
+     * @return 集合
+     */
+    List<ChargeItemDefInfo> getChargeItemDefInfoByIdList(List<Long> chargeItemIds);
+
     /**
      * 根据执行id查询收费项目信息
      *
diff --git a/openhis-server-new/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
index 01cb6631..3b2552eb 100644
--- a/openhis-server-new/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
@@ -1,7 +1,10 @@
 package com.openhis.administration.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.DeviceDefinition;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 
 /**
  * 器材定义管理Service接口
@@ -26,4 +29,13 @@ public interface IDeviceDefinitionService extends IService<DeviceDefinition> {
      * @return
      */
     boolean addYbDevice(DeviceDefinition deviceDefinition);
+
+    /** 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * Desc:
+     * @param keyWord
+     * @Author raymond
+     * @Date 20:23 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchDeviceListByKeyWord(String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 916b1e67..562a2eb5 100644
--- a/openhis-server-new/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
@@ -6,6 +6,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Encounter;
 import com.openhis.administration.dto.EncounterAccountDto;
+import com.openhis.administration.dto.EncounterDataDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 就诊管理Service接口
@@ -69,4 +71,14 @@ public interface IEncounterService extends IService<Encounter> {
      * @return 集合
      */
     List<EncounterAccountDto> getEncounterInfoByTime(Date startDate, Date endDate);
+
+    /**
+     * Desc: 根据参数加载 患者记录信息
+     * @param classEnum
+     * @param encounterId
+     * @Author raymond
+     * @Date 12:34 2025/11/3
+     * @return com.openhis.administration.dto.EncounterDataDto
+     **/
+    EncounterDataDto getPatientIdByParam(Integer classEnum,Long encounterId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 42a29755..c2d36201 100644
--- a/openhis-server-new/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
@@ -2,6 +2,12 @@ package com.openhis.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.HealthcareService;
+import com.openhis.administration.dto.HealthcareDto;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
+
+import java.util.List;
 
 /**
  * 服务项目管理Service接口
@@ -24,5 +30,23 @@ public interface IHealthcareServiceService extends IService<HealthcareService> {
      * @return 编辑结果
      */
     boolean updateHealthcareService(HealthcareService healthcareService);
+    /**
+     * Desc: 根据 项目id数组 加载 挂号数据集合
+     * @param itemIds
+     * @Author raymond
+     * @Date 15:36 2025/10/18
+     * @return java.util.List<com.openhis.administration.dto.HealthcareDto>
+     **/
+    List<HealthcareDto> searchHealthByIds(@Param("itemIds") List<Long> itemIds);
+
+    /**
+     * Desc: 查询所有 挂号数据
+     * @param
+     * @Author raymond
+     * @Date 08:32 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchAllHeathData(Long orgId,Integer statusEnum);
+
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index ab2c4e22..e27a53f7 100644
--- a/openhis-server-new/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
@@ -4,6 +4,8 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Location;
+import com.openhis.administration.dto.LocationDataDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 位置管理Service接口
@@ -99,4 +101,13 @@ public interface ILocationService extends IService<Location> {
      */
     boolean updateStatusById(Long id, Integer status);
 
+    /**
+     * Desc: 根据区域id数组查询 区域表
+     * @param locationIds
+     * @Author raymond
+     * @Date 07:46 2025/10/28
+     * @return java.util.List<com.openhis.administration.dto.LocationDataDto>
+     **/
+    List<LocationDataDto> searchLocationDataByIds(@Param("locationIds") List<Long> locationIds);
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 4103c375..d8dec26a 100644
--- a/openhis-server-new/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
@@ -3,6 +3,8 @@ package com.openhis.administration.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.OrganizationLocation;
 
+import java.util.List;
+
 /**
  * 机构位置关系管理Service接口
  *
@@ -28,4 +30,12 @@ public interface IOrganizationLocationService extends IService<OrganizationLocat
      */
     OrganizationLocation getOrgLocByOrgIdAndActivityDefinitionId(Long activityDefinitionId);
 
+    /**
+     * 查询诊疗的执行科室列表
+     *
+     * @param activityDefinitionId 诊疗定义id
+     * @return 诊疗的执行科室列表
+     */
+    List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long activityDefinitionId);
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index a4348d33..2bc6010f 100644
--- a/openhis-server-new/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
@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Organization;
+import com.openhis.administration.dto.OrgDataDto;
 
 /**
  * 机构管理Service接口
@@ -45,4 +46,13 @@ public interface IOrganizationService extends IService<Organization> {
      * @return 科室集合
      */
     List<Organization> getOrganizationListById(List<Long> collect);
+
+    /**
+     * Desc:
+     * @param
+     * @Author raymond
+     * @Date 09:46 2025/10/22
+     * @return List<OrgDataDto>
+     **/
+    List<OrgDataDto> searchOrgDataByHealth();
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientStudentService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientStudentService.java
new file mode 100644
index 00000000..e34a7236
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientStudentService.java
@@ -0,0 +1,14 @@
+package com.openhis.administration.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.PatientStudent;
+
+/**
+ * 公费医疗学生名单管理表Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IPatientStudentService extends IService<PatientStudent> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index d41d0316..a0b32868 100644
--- a/openhis-server-new/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
@@ -3,6 +3,8 @@ package com.openhis.administration.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.administration.domain.PractitionerRole;
+import com.openhis.administration.dto.RoleDataDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -54,4 +56,31 @@ public interface IPractitionerRoleService extends IService<PractitionerRole> {
      */
     List<PractitionerRole> getNurseList(Long orgId);
 
+    /**
+     * Desc: 根据员工ID 查询
+     * @param practitionerId
+     * @param roleCode
+     * @Author raymond
+     * @Date 16:43 2025/10/27
+     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     **/
+    List<RoleDataDto> searchPractitionerRoleByPractitionerId(@Param("practitionerId") Long practitionerId, @Param("roleCode") String roleCode);
+    /**
+     * Desc: 根据员工ID数组 查询
+     * @param practitionerIds
+     * @Author raymond
+     * @Date 16:49 2025/10/27
+     * @return java.util.List<com.openhis.administration.dto.RoleDataDto>
+     **/
+    List<RoleDataDto> searchPractitionerRoleByPractitionerIds(@Param("practitionerIds") Long practitionerIds);
+    /**
+     * Desc: 根据员工ID 查询 locationId数组
+     * @param practitionerId
+     * @param roleCode
+     * @Author raymond
+     * @Date 16:50 2025/10/27
+     * @return java.util.List<java.lang.Long>
+     **/
+    List<Long> searchPractitionerRoleLocationIds(@Param("practitionerId") Long practitionerId,@Param("roleCode") String roleCode);
+
 }
diff --git a/openhis-server-new/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
index a029ecc2..6803a6ce 100644
--- a/openhis-server-new/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
@@ -69,6 +69,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 .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)
+                .ne(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO)
                 .last(YbCommonConstants.sqlConst.LIMIT1));
         if (account != null) {
             return account.getId();
@@ -163,4 +164,47 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     public List<Account> getAccountListByEncounter(Long encounterId) {
         return baseMapper.selectList(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, encounterId));
     }
+
+    /**
+     * 学生医保转学生自费
+     *
+     * @param encounterId 就诊id
+     * @return 账户id
+     */
+    @Override
+    public Long getStudentSelfAccount(Long encounterId) {
+        Account account = baseMapper
+            .selectOne(new LambdaQueryWrapper<Account>().select(Account::getId).eq(Account::getEncounterId, encounterId)
+                .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)
+                .eq(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO)
+                .last(YbCommonConstants.sqlConst.LIMIT1));
+        if (account != null) {
+            return account.getId();
+        }
+        return null;
+    }
+
+    /**
+     * 学生自费转学生医保
+     *
+     * @param encounterId 就诊id
+     * @return 账户id
+     */
+    @Override
+    public Long getStudentYbAccount(Long encounterId) {
+        Account account = baseMapper
+            .selectOne(new LambdaQueryWrapper<Account>().select(Account::getId).eq(Account::getEncounterId, encounterId)
+                .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)
+                .ne(Account::getContractNo, CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO)
+                .like(Account::getContractNo, CommonConstants.BusinessName.CONTRACT_STUDENT)
+                .last(YbCommonConstants.sqlConst.LIMIT1));
+        if (account != null) {
+            return account.getId();
+        }
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java
new file mode 100644
index 00000000..0b0bb3b5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChangePriceRecordServiceImpl.java
@@ -0,0 +1,119 @@
+package com.openhis.administration.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.core.common.core.domain.entity.SysDictData;
+import com.openhis.common.constant.CommonConstants;
+import com.openhis.workflow.domain.SupplyRequest;
+import org.springframework.stereotype.Service;
+
+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.core.system.mapper.SysDictDataMapper;
+import com.openhis.administration.domain.ChangePriceRecord;
+import com.openhis.administration.dto.ChangePriceDataDto;
+import com.openhis.administration.mapper.ChangePriceRecordMapper;
+import com.openhis.administration.service.IChangePriceRecordService;
+import com.openhis.common.enums.SupplyStatus;
+
+/**
+ * 修改价格记录Service业务层处理
+ *
+ * @author system
+ * @date 2025-10-15
+ */
+@Service
+public class ChangePriceRecordServiceImpl extends ServiceImpl<ChangePriceRecordMapper, ChangePriceRecord>
+    implements IChangePriceRecordService {
+
+    @Resource
+    private SysDictDataMapper sysDictDataMapper;
+    @Override
+    public boolean submitApproval(String busNo) {
+        int updateCount = baseMapper.update(null,
+            new LambdaUpdateWrapper<ChangePriceRecord>().eq(ChangePriceRecord::getBusNo, busNo)
+                .set(ChangePriceRecord::getApplicantTime, DateUtils.getNowDate())
+                .set(ChangePriceRecord::getStatusEnum, SupplyStatus.APPROVAL.getValue()));
+        return updateCount > 0;
+    }
+
+    @Override
+    public List<ChangePriceRecord> searchChangePriceDataForBusNo(String busNo) {
+        return this.baseMapper.selectList(new LambdaUpdateWrapper<ChangePriceRecord>().eq(ChangePriceRecord::getBusNo,busNo));
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchMedChangePriceByBusNo(String busNo, Integer categoryEnum,Integer statusEnum) {
+        return this.baseMapper.searchMedChangePriceByBusNo(busNo, categoryEnum,statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchMedChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum) {
+        return this.baseMapper.searchMedChangePriceByItemId(itemId,categoryEnum,statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchDeviceChangePriceByBusNo(String busNo, Integer categoryEnum,Integer statusEnum) {
+        return this.baseMapper.searchDeviceChangePriceByBusNo(busNo,categoryEnum, statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchDeviceChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum) {
+        return this.baseMapper.searchDeviceChangePriceByItemId(itemId,categoryEnum,statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchActivityChangePriceByBusNo(String busNo, Integer categoryEnum,Integer statusEnum) {
+        return this.baseMapper.searchActivityChangePriceByBusNo(busNo,categoryEnum, statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchActivityChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum) {
+        return this.baseMapper.searchActivityChangePriceByItemId(itemId,categoryEnum,statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchHealthChangePriceByBusNo(String busNo, Integer categoryEnum,Integer statusEnum) {
+        return this.baseMapper.searchHealthChangePriceByBusNo(busNo,categoryEnum,statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchHealthChangePriceByItemId(Long itemId, Integer categoryEnum, Integer statusEnum) {
+        return this.baseMapper.searchHealthChangePriceByItemId(itemId,categoryEnum,statusEnum);
+    }
+
+    @Override
+    public void agreeRequest(String busNo, Date now) {
+        baseMapper.update(null,
+                new LambdaUpdateWrapper<ChangePriceRecord>().eq(ChangePriceRecord::getBusNo, busNo)
+                        .set(ChangePriceRecord::getApprovalTime, now)
+                        .set(ChangePriceRecord::getApproverId, SecurityUtils.getLoginUser().getPractitionerId())
+                        .set(ChangePriceRecord::getStatusEnum, SupplyStatus.AGREE.getValue()));
+    }
+
+    @Override
+    public boolean rejectRequest(String busNo) {
+        int updateCount = baseMapper.update(null,
+                new LambdaUpdateWrapper<ChangePriceRecord>().eq(ChangePriceRecord::getBusNo, busNo)
+                        .set(ChangePriceRecord::getApprovalTime, DateUtils.getNowDate())
+                        .set(ChangePriceRecord::getApproverId, SecurityUtils.getLoginUser().getPractitionerId())
+                        .set(ChangePriceRecord::getStatusEnum, SupplyStatus.REJECT.getValue()));
+        return updateCount > 0;
+    }
+
+    @Override
+    public List<ChangePriceDataDto> searchChangePriceRecordDataByBusNo(String busNo, Integer statusEnum) {
+        return this.baseMapper.searchChangePriceRecordDataByBusNo(busNo,statusEnum);
+    }
+
+    @Override
+    public List<ChangePriceRecord> searchChangePriceDataGroupByBusNo(String busNo) {
+        return this.baseMapper.searchChangePriceDataGroupByBusNo(busNo);
+    }
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index 6da90303..1bf1ea5a 100644
--- a/openhis-server-new/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
@@ -1,11 +1,16 @@
 package com.openhis.administration.service.impl;
 
-import com.openhis.administration.domain.ChargeItemDefDetail;
+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.administration.mapper.ChargeItemDefAppMapper;
+import com.openhis.administration.domain.ChargeItemDefDetail;
+import com.openhis.administration.mapper.ChargeItemDefDetailAppMapper;
 import com.openhis.administration.service.IChargeItemDefDetailService;
+import com.openhis.common.enums.ConditionCode;
+import com.openhis.common.enums.DelFlag;
 
 /**
  * 费用定价管理子Service业务层处理
@@ -14,7 +19,7 @@ import com.openhis.administration.service.IChargeItemDefDetailService;
  * @date 2025-02-20
  */
 @Service
-public class ChargeItemDefDetailServiceImpl extends ServiceImpl<ChargeItemDefAppMapper, ChargeItemDefDetail>
+public class ChargeItemDefDetailServiceImpl extends ServiceImpl<ChargeItemDefDetailAppMapper, ChargeItemDefDetail>
     implements IChargeItemDefDetailService {
 
     /**
@@ -31,7 +36,7 @@ public class ChargeItemDefDetailServiceImpl extends ServiceImpl<ChargeItemDefApp
             if (baseMapper.selectById(chargeItemDefDetail.getId()) == null) {
                 return false;
             } else {
-                //todo deleteFlag=1
+                // todo deleteFlag=1
                 return baseMapper.updateById(chargeItemDefDetail) > 0;
             }
         } else {
@@ -69,4 +74,33 @@ public class ChargeItemDefDetailServiceImpl extends ServiceImpl<ChargeItemDefApp
             return baseMapper.deleteById(id) > 0;
         }
     }
+
+    @Override
+    public List<ChargeItemDefDetail> searchChargeItemDefDetailByIds(Long chargeItemId, String code, String lotNumber) {
+        LambdaQueryWrapper<ChargeItemDefDetail> queryWrapper = new LambdaQueryWrapper<ChargeItemDefDetail>()
+            .eq(ChargeItemDefDetail::getDefinitionId, chargeItemId).eq(ChargeItemDefDetail::getConditionCode, code);
+        if (lotNumber != null) {
+            queryWrapper.eq(ChargeItemDefDetail::getConditionValue, lotNumber);
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<ChargeItemDefDetail> searchChargeDetailDataByBusNo(String value, String code) {
+        return this.baseMapper.searchChargeDetailDataByBusNo(value, code);
+    }
+
+    /**
+     * 根据定价id查询批号售价
+     *
+     * @param chargeItemDefIdList 定价ids
+     * @return 批号售价信息
+     */
+    @Override
+    public List<ChargeItemDefDetail> getLotNumberPriceByDefIds(List<Long> chargeItemDefIdList) {
+        return baseMapper.selectList(
+            new LambdaQueryWrapper<ChargeItemDefDetail>().in(ChargeItemDefDetail::getDefinitionId, chargeItemDefIdList)
+                .eq(ChargeItemDefDetail::getConditionCode, ConditionCode.LOT_NUMBER_PRICE.getCode())
+                .eq(ChargeItemDefDetail::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index a17e3c05..f2f45630 100644
--- a/openhis-server-new/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
@@ -14,6 +14,7 @@ import com.core.common.utils.DateUtils;
 import com.openhis.administration.domain.ChargeItemDefDetail;
 import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.domain.HealthcareService;
+import com.openhis.administration.dto.ChargeItemDefDetailPriceDto;
 import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
 import com.openhis.administration.service.IChargeItemDefDetailService;
 import com.openhis.administration.service.IChargeItemDefinitionService;
@@ -154,4 +155,34 @@ public class ChargeItemDefinitionServiceImpl extends ServiceImpl<ChargeItemDefin
         chargeItemDefDetailService.saveBatch(chargeItemDefDetailList);
     }
 
+    @Override
+    public List<ChargeItemDefinition> searchChargeItemDefinitionByMedIds(List<Long> itemIds) {
+        return baseMapper.selectList(
+            new LambdaQueryWrapper<ChargeItemDefinition>().in(ChargeItemDefinition::getInstanceId, itemIds));
+    }
+
+    @Override
+    public ChargeItemDefinition getChargeItemDefinitionEntity(Long instanceId, String instanceTable,
+        Integer statusEnum) {
+        return baseMapper.selectOne(
+            new LambdaQueryWrapper<ChargeItemDefinition>().eq(ChargeItemDefinition::getInstanceId, instanceId)
+                .eq(ChargeItemDefinition::getInstanceTable, instanceTable)
+                .eq(ChargeItemDefinition::getStatusEnum, statusEnum));
+    }
+
+    @Override
+    public ChargeItemDefDetailPriceDto getMedPriceByParam(String conditionCode, Long instanceId) {
+        return this.baseMapper.getMedPriceByParam(conditionCode, instanceId);
+    }
+
+    @Override
+    public ChargeItemDefDetailPriceDto getDevicePriceByParam(String conditionCode, Long instanceId) {
+        return this.baseMapper.getDevicePriceByParam(conditionCode,instanceId);
+    }
+
+    @Override
+    public ChargeItemDefDetailPriceDto getProductPrice(Integer statusEnum, Long instanceId) {
+        return this.baseMapper.getProductPrice(statusEnum, instanceId);
+    }
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 2bfded66..513c7a7e 100644
--- a/openhis-server-new/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
@@ -4,15 +4,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
 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.exception.ServiceException;
 import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
 import com.openhis.administration.domain.ChargeItem;
+import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.dto.ChargeItemBaseInfoDto;
 import com.openhis.administration.dto.ChargeItemDefInfo;
+import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
 import com.openhis.administration.mapper.ChargeItemMapper;
 import com.openhis.administration.service.IChargeItemService;
 import com.openhis.common.enums.ChargeItemContext;
@@ -31,6 +38,9 @@ import lombok.AllArgsConstructor;
 @AllArgsConstructor
 public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeItem> implements IChargeItemService {
 
+    @Autowired
+    ChargeItemDefinitionMapper chargeItemDefinitionMapper;
+
     /**
      * 创建已计费的采购账单
      *
@@ -177,6 +187,47 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
         return baseMapper.getChargeItemDefInfoByIds(chargeItemIds);
     }
 
+    /**
+     * 收费项关联Def项目集合(带组套)
+     *
+     * @param chargeItemIds 集合
+     * @return 集合
+     */
+    @Override
+    public List<ChargeItemDefInfo> getChargeItemDefInfoByIdList(List<Long> chargeItemIds) {
+        List<ChargeItemDefInfo> chargeItemDefInfos = baseMapper.getChargeItemDefInfoByIds(chargeItemIds);
+        List<ChargeItemDefInfo> chargeItemDefInfoChildren = new ArrayList<>();
+        ChargeItemDefInfo chargeItemDefInfo;
+        for (ChargeItemDefInfo chargeItemDefInfoById : chargeItemDefInfos) {
+
+            if (!StringUtils.isEmpty(chargeItemDefInfoById.getChildrenJson())) {
+                List<ChargeItem> childrenList =
+                    JSON.parseArray(chargeItemDefInfoById.getChildrenJson(), ChargeItem.class);
+                for (ChargeItem chargeItem : childrenList) {
+
+                    ChargeItemDefinition chargeItemDefinition =
+                        chargeItemDefinitionMapper.selectById(chargeItem.getDefinitionId());
+
+                    if (chargeItemDefinition == null) {
+                        throw new ServiceException("未查询到定价信息！提示信息：" + chargeItemDefInfoById.getChargeName() + "子项信息--"
+                            + chargeItem.getDefinitionId());
+                    }
+                    chargeItemDefInfo = new ChargeItemDefInfo();
+
+                    BeanUtils.copyProperties(chargeItem, chargeItemDefInfo);
+                    BeanUtils.copyProperties(chargeItemDefinition, chargeItemDefInfo);
+
+                    chargeItemDefInfoChildren.add(chargeItemDefInfo);
+                }
+
+            }
+        }
+        if (!chargeItemDefInfoChildren.isEmpty()) {
+            chargeItemDefInfos.addAll(chargeItemDefInfoChildren);
+        }
+        return chargeItemDefInfos;
+    }
+
     /**
      * 根据执行id查询收费项目信息
      *
diff --git a/openhis-server-new/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
index daefd57e..1c9b458d 100644
--- a/openhis-server-new/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
@@ -2,6 +2,7 @@ package com.openhis.administration.service.impl;
 
 import java.util.List;
 
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -47,4 +48,9 @@ public class DeviceDefinitionServiceImpl extends ServiceImpl<DeviceDefinitionMap
     public boolean addYbDevice(DeviceDefinition deviceDefinition) {
         return false;
     }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchDeviceListByKeyWord(String keyWord) {
+        return this.deviceDefinitionMapper.searchDeviceListByKeyWord(keyWord);
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 6aab137a..7114d714 100644
--- a/openhis-server-new/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
@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.openhis.administration.dto.EncounterDataDto;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -145,4 +146,9 @@ public class EncounterServiceImpl extends ServiceImpl<EncounterMapper, Encounter
     public List<EncounterAccountDto> getEncounterInfoByTime(Date startDate, Date endDate) {
         return baseMapper.getEncounterInfoByTime(startDate, endDate);
     }
+
+    @Override
+    public EncounterDataDto getPatientIdByParam(Integer classEnum, Long encounterId) {
+        return this.baseMapper.getPatientIdByParam(classEnum,encounterId);
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 7868e289..e427e2d4 100644
--- a/openhis-server-new/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
@@ -2,11 +2,16 @@ package com.openhis.administration.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.HealthcareService;
+import com.openhis.administration.dto.HealthcareDto;
 import com.openhis.administration.mapper.HealthcareServiceMapper;
 import com.openhis.administration.service.IHealthcareServiceService;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 服务项目管理Service业务层处理
  *
@@ -14,8 +19,11 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2025-02-20
  */
 @Service
+@AllArgsConstructor
 public class HealthcareServiceServiceImpl extends ServiceImpl<HealthcareServiceMapper, HealthcareService> implements IHealthcareServiceService {
 
+    private final HealthcareServiceMapper healthcareServiceMapper;
+
 
     /**
      * 服务管理 新增
@@ -45,4 +53,14 @@ public class HealthcareServiceServiceImpl extends ServiceImpl<HealthcareServiceM
         }
     }
 
+    @Override
+    public List<HealthcareDto> searchHealthByIds(List<Long> itemIds) {
+        return this.healthcareServiceMapper.searchHealthByIds(itemIds);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchAllHeathData(Long orgId,Integer statusEnum) {
+        return this.healthcareServiceMapper.searchAllHeathData(orgId,statusEnum);
+    }
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index c9992bdf..eb117fe5 100644
--- a/openhis-server-new/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
@@ -2,6 +2,7 @@ package com.openhis.administration.service.impl;
 
 import java.util.List;
 
+import com.openhis.administration.dto.LocationDataDto;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,6 +15,8 @@ import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.LocationForm;
 import com.openhis.common.enums.LocationStatus;
 
+import javax.annotation.Resource;
+
 /**
  * 位置管理Service业务层处理
  *
@@ -22,6 +25,8 @@ import com.openhis.common.enums.LocationStatus;
  */
 @Service
 public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements ILocationService {
+    @Resource
+    private LocationMapper locationMapper;
 
     /**
      * 获取药房列表
@@ -180,4 +185,9 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
         return baseMapper.updateById(location) > 0;
     }
 
+    @Override
+    public List<LocationDataDto> searchLocationDataByIds(List<Long> locationIds) {
+        return this.locationMapper.searchLocationDataByIds(locationIds);
+    }
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index cb1f8aa4..9306e255 100644
--- a/openhis-server-new/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
@@ -1,6 +1,7 @@
 package com.openhis.administration.service.impl;
 
 import java.sql.Time;
+import java.util.List;
 
 import org.springframework.stereotype.Service;
 
@@ -50,4 +51,16 @@ public class OrganizationLocationServiceImpl extends ServiceImpl<OrganizationLoc
             .lt(OrganizationLocation::getStartTime, time).gt(OrganizationLocation::getEndTime, time));
     }
 
+    /**
+     * 查询诊疗的执行科室列表
+     *
+     * @param activityDefinitionId 诊疗定义id
+     * @return 诊疗的执行科室列表
+     */
+    @Override
+    public List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long activityDefinitionId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<OrganizationLocation>()
+            .eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
+    }
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index e42b784b..c0dbd63b 100644
--- a/openhis-server-new/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
@@ -3,6 +3,7 @@ package com.openhis.administration.service.impl;
 import java.util.List;
 
 import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.dto.OrgDataDto;
 import com.openhis.common.enums.DelFlag;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +15,8 @@ import com.openhis.administration.mapper.OrganizationMapper;
 import com.openhis.administration.service.IOrganizationService;
 import com.openhis.common.enums.AccountStatus;
 
+import javax.annotation.Resource;
+
 /**
  * 机构管理Service业务层处理
  *
@@ -23,7 +26,8 @@ import com.openhis.common.enums.AccountStatus;
 @Service
 public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization>
     implements IOrganizationService {
-
+    @Resource
+    private OrganizationMapper organizationMapper;
     /**
      * 机构启用
      *
@@ -75,4 +79,9 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
         return baseMapper.selectList(new LambdaQueryWrapper<Organization>().in(Organization::getId, collect)
                 .eq(Organization::getDeleteFlag, DelFlag.NO.getCode()));
     }
+
+    @Override
+    public List<OrgDataDto> searchOrgDataByHealth() {
+        return this.organizationMapper.searchOrgDataByHealth();
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java
new file mode 100644
index 00000000..f9e2033b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientStudentServiceImpl.java
@@ -0,0 +1,61 @@
+package com.openhis.administration.service.impl;
+
+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.extension.service.impl.ServiceImpl;
+import com.core.common.exception.ServiceException;
+import com.openhis.administration.domain.Patient;
+import com.openhis.administration.domain.PatientStudent;
+import com.openhis.administration.mapper.PatientStudentMapper;
+import com.openhis.administration.service.IPatientStudentService;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.PhysicalExamResult;
+
+/**
+ * 公费医疗学生名单管理表Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Service
+public class PatientStudentServiceImpl extends ServiceImpl<PatientStudentMapper, PatientStudent>
+    implements IPatientStudentService {
+
+    /**
+     * 校验学生公费资格
+     * 
+     * @param patient
+     */
+    public void checkStatus(Patient patient) {
+
+        String idCard = patient.getIdCard();
+        Date date = new Date();
+
+        List<PatientStudent> patientStudents = baseMapper.selectList(new LambdaQueryWrapper<PatientStudent>()
+            .eq(PatientStudent::getIdNumber, idCard).eq(PatientStudent::getDeleteFlag, DelFlag.NO.getCode())
+            .eq(PatientStudent::getPatientId, patient.getId()));
+
+        if (patientStudents == null || patientStudents.isEmpty()) {
+            throw new ServiceException("该患者不是学生，请更换费用性质类型！");
+        }
+
+        PatientStudent patientStudent = null;
+        for (PatientStudent item : patientStudents) {
+            if (date.after(item.getEnrollmentDate()) && date.before(item.getGraduationDate())) {
+                patientStudent = item;
+            }
+        }
+
+        if (patientStudent == null) {
+            throw new ServiceException("该患者公费资格未生效或已失效！！不可以享受公费");
+        }
+
+        if (!PhysicalExamResult.EXAMINATION_PASSED.getValue().equals(patientStudent.getPhysicalExamResult())) {
+            throw new ServiceException("该患者体检不合格不可以享受公费");
+        }
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/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
index 3119f51d..3577facc 100644
--- a/openhis-server-new/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
@@ -3,6 +3,7 @@ package com.openhis.administration.service.impl;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.openhis.administration.dto.RoleDataDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -113,4 +114,19 @@ public class PractitionerRoleServiceImpl extends ServiceImpl<PractitionerRoleMap
             // 身份类型是护士
             .eq(PractitionerRole::getRoleCode, PractitionerRoles.NURSE.getCode()));
     }
+
+    @Override
+    public List<RoleDataDto> searchPractitionerRoleByPractitionerId(Long practitionerId, String roleCode) {
+        return this.practitionerRoleMapper.searchPractitionerRoleByPractitionerId(practitionerId,roleCode);
+    }
+
+    @Override
+    public List<RoleDataDto> searchPractitionerRoleByPractitionerIds(Long practitionerIds) {
+        return this.practitionerRoleMapper.searchPractitionerRoleByPractitionerIds(practitionerIds);
+    }
+
+    @Override
+    public List<Long> searchPractitionerRoleLocationIds(Long practitionerId, String roleCode) {
+        return this.practitionerRoleMapper.searchPractitionerRoleLocationIds(practitionerId,roleCode);
+    }
 }
diff --git a/openhis-server-new/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
index fab16126..2a008d51 100644
--- a/openhis-server-new/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
@@ -2,8 +2,6 @@ package com.openhis.administration.service.impl;
 
 import java.util.List;
 
-import com.openhis.common.enums.DelFlag;
-import com.openhis.common.enums.Whether;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -12,7 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.Supplier;
 import com.openhis.administration.mapper.SupplierMapper;
 import com.openhis.administration.service.ISupplierService;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.SupplierType;
+import com.openhis.common.enums.Whether;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -58,9 +58,10 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
      */
     @Override
     public List<Supplier> getList() {
-        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()));
+        return baseMapper.selectList(
+            new LambdaQueryWrapper<Supplier>().select(Supplier::getId, Supplier::getName, Supplier::getPhone)
+                .eq(Supplier::getTypeEnum, SupplierType.SUPPLIER.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/clinical/domain/ConditionNoDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java
new file mode 100644
index 00000000..6e544862
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java
@@ -0,0 +1,40 @@
+package com.openhis.clinical.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 ws
+ * @date 2025-10-15
+ */
+@Data
+@TableName("cli_condition_no_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ConditionNoDefinition extends HisBaseEntity {
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 国临编码 */
+    private String glNo;
+
+    /** 国临name */
+    private String glName;
+
+    /** 医保编码 */
+    private String icd10No;
+
+    /** 医保name */
+    private String icd10Name;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java
new file mode 100644
index 00000000..dfb9b66d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java
@@ -0,0 +1,16 @@
+package com.openhis.clinical.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.clinical.domain.Condition;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Repository
+public interface ConditionNoDefinitionMapper extends BaseMapper<ConditionNoDefinition> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java
new file mode 100644
index 00000000..76b027bb
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java
@@ -0,0 +1,14 @@
+package com.openhis.clinical.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+public interface IConditionNoDefinitionService extends IService<ConditionNoDefinition> {
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
new file mode 100644
index 00000000..95d2a51c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
@@ -0,0 +1,25 @@
+package com.openhis.clinical.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.clinical.domain.ConditionDefinition;
+import com.openhis.clinical.mapper.ConditionDefinitionMapper;
+import com.openhis.clinical.service.IConditionDefinitionService;
+import com.openhis.clinical.service.IConditionNoDefinitionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.openhis.clinical.mapper.ConditionNoDefinitionMapper;
+import com.openhis.clinical.domain.ConditionNoDefinition;
+/**
+ * 新增国临码功能单表增删改查
+ * @author ws
+ * @date 2025-10-15
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ConditionNoDefinitionServiceImpl extends ServiceImpl<ConditionNoDefinitionMapper, ConditionNoDefinition>
+    implements IConditionNoDefinitionService {
+    private final ConditionNoDefinitionMapper conditionNoDefinitionMapper;
+
+}
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
index 5c0bf240..3d9fed78 100644
--- 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
@@ -32,7 +32,7 @@ import lombok.extern.slf4j.Slf4j;
 /**
  * 跨系统发送申请工具类
  *
- * @author GuoRui
+ * @author Thanking
  * @date 2025-06-25
  */
 @Slf4j
@@ -128,6 +128,7 @@ public class CrossSystemSendApplyUtil {
             // 获取结果CODE
             String code = String.valueOf(object.getInnerMap().get("code"));
             if (!"100000".equals(code)) {
+                log.error("LIS失败申请报文：" + s);
                 throw new ServiceException("LIS申请返回失败信息：" + object);
             }
         } catch (Exception e) {
@@ -230,6 +231,7 @@ public class CrossSystemSendApplyUtil {
             // 获取结果CODE
             String code = String.valueOf(object.getInnerMap().get("code"));
             if (!"100000".equals(code)) {
+                log.error("PACS失败申请报文：" + s);
                 throw new ServiceException("PACS申请返回失败信息：" + object);
             }
         } catch (Exception e) {
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
new file mode 100644
index 00000000..bd378663
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.document.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;
+
+/**
+ * 历史库存静态记录表
+ *
+ * @author zwh
+ * @date 2025-11-04
+ */
+@Data
+@TableName("doc_inventory_item_static")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DocInventoryItemStatic extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 物品类别 */
+    private String categoryCode;
+
+    /** 名称 */
+    private String name;
+
+    /** 库存状态 */
+    private Integer inventoryStatusEnum;
+
+    /** 供应商id */
+    private Long supplierId;
+
+    /** 说明书 */
+    private String descriptionText;
+
+    /** 最小单位 */
+    private String unitCode;
+
+    /** 当前库存数量(最小单位数量) */
+    private BigDecimal quantity;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 生产日期 */
+    private Date productionDate;
+
+    /** 失效日期 */
+    private Date expirationDate;
+
+    /** 库位 */
+    private Long locationStoreId;
+
+    /** 仓库 */
+    private Long locationId;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码包装层级 */
+    private Integer packagingLevels;
+
+    /** 项目 */
+    private String itemTable;
+
+    /** 物品编码 */
+    private Long itemId;
+
+    /** 采购单价(包装单位) */
+    private BigDecimal price;
+
+    /** 销售单价(包装单位) */
+    private BigDecimal salePrice;
+
+    /** 项目编号 */
+    private String busNo;
+
+    /** 最小单位 */
+    private String minUnitCode;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 供应商名称 */
+    private String supplierName;
+
+    /** 库房名称 */
+    private String locationName;
+
+    /** 货位名称 */
+    private String locationStoreName;
+
+    /** 生产厂商文本 */
+    private String manufacturerText;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 规格 */
+    private String totalVolume;
+
+    /** 药品名称拼音码 */
+    private String pyStr;
+
+    /** 药品五笔码 */
+    private String wbStr;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java
new file mode 100644
index 00000000..e1a9b714
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.document.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.document.domain.DocInventoryItemStatic;
+
+/**
+ * 历史库存静态记录 mapper
+ *
+ * @author zwh
+ * @date 2025-11-04
+ */
+@Repository
+public interface DocInventoryItemStaticMapper extends BaseMapper<DocInventoryItemStatic> {}
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
index 85c3836f..2d570d29 100644
--- 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
@@ -1,7 +1,6 @@
 package com.openhis.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocDefinition;
 import com.openhis.document.domain.DocDefinitionOrganization;
 
 /**
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
index f8f467a5..65cc13d7 100644
--- 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
@@ -2,7 +2,6 @@ package com.openhis.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.document.domain.DocDefinition;
-import com.openhis.document.domain.EmrTemplate;
 
 /**
  * 病历定义服务接口
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
new file mode 100644
index 00000000..88066375
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.document.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.document.domain.DocInventoryItemStatic;
+
+/**
+ * 历史库存静态记录接口
+ *
+ * @author zwh
+ * @date 2025-11-04
+ */
+public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {}
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
index c3c81661..84df5973 100644
--- 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
@@ -1,7 +1,6 @@
 package com.openhis.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocStatisticsDefinition;
 import com.openhis.document.domain.DocStatisticsDefinitionOption;
 
 /**
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
index 9e727aac..339a317e 100644
--- 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
@@ -1,7 +1,6 @@
 package com.openhis.document.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.openhis.document.domain.DocStatistics;
 import com.openhis.document.domain.DocStatisticsDefinition;
 
 /**
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
index 6b65be3d..349b1f54 100644
--- 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
@@ -1,14 +1,13 @@
 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;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocDefinitionOrganization;
+import com.openhis.document.mapper.DocDefinitionOrganizationMapper;
+import com.openhis.document.service.IDocDefinitionOrganizationService;
+
 @Service
-public class DocDefinitionOrganizationServiceImpl extends ServiceImpl<DocDefinitionOrganizationMapper, DocDefinitionOrganization> implements IDocDefinitionOrganizationService {
-}
+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
index f64c4ad4..fc194738 100644
--- 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
@@ -1,15 +1,12 @@
 package com.openhis.document.service.impl;
 
+import org.springframework.stereotype.Service;
+
 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 {
-}
+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/DocInventoryItemStaticServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
new file mode 100644
index 00000000..33017c3a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.document.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocInventoryItemStatic;
+import com.openhis.document.mapper.DocInventoryItemStaticMapper;
+import com.openhis.document.service.IDocInventoryItemStaticService;
+
+/**
+ * 历史库存静态记录接口实现类
+ *
+ * @author zwh
+ * @date 2025-11-04
+ */
+@Service
+public class DocInventoryItemStaticServiceImpl extends ServiceImpl<DocInventoryItemStaticMapper, DocInventoryItemStatic>
+    implements IDocInventoryItemStaticService {}
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
index 166614c0..e2cbf9b0 100644
--- 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
@@ -1,14 +1,11 @@
 package com.openhis.document.service.impl;
 
+import org.springframework.stereotype.Service;
+
 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 {
-}
+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
index a4f888f9..09e26000 100644
--- 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
@@ -1,14 +1,13 @@
 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;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocStatisticsDefinitionOption;
+import com.openhis.document.mapper.DocStatisticsDefinitionOptionMapper;
+import com.openhis.document.service.IDocStatisticsDefinitionOptionService;
+
 @Service
-public class DocStatisticsDefinitionOptionServiceImpl extends ServiceImpl<DocStatisticsDefinitionOptionMapper, DocStatisticsDefinitionOption> implements IDocStatisticsDefinitionOptionService {
-}
+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
index 2c2c9dda..9fbb7d87 100644
--- 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
@@ -1,14 +1,12 @@
 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;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocStatisticsDefinition;
+import com.openhis.document.mapper.DocStatisticsDefinitionMapper;
+import com.openhis.document.service.IDocStatisticsDefinitionService;
+
 @Service
-public class DocStatisticsDefinitionServiceImpl extends ServiceImpl<DocStatisticsDefinitionMapper, DocStatisticsDefinition> implements IDocStatisticsDefinitionService {
-}
+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
index afea5e36..6243aec8 100644
--- 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
@@ -1,14 +1,12 @@
 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;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.document.domain.DocStatistics;
+import com.openhis.document.mapper.DocStatisticsMapper;
+import com.openhis.document.service.IDocStatisticsService;
+
 @Service
-public class DocStatisticsServiceImpl extends ServiceImpl<DocStatisticsMapper, DocStatistics> implements IDocStatisticsService {
-}
+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
index 57b9fc0f..ec6ea20f 100644
--- 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
@@ -1,11 +1,12 @@
 package com.openhis.document.service.impl;
 
+import org.springframework.stereotype.Service;
+
 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 {
-}
+public class DocTemplateServiceImpl extends ServiceImpl<DocTemplateMapper, DocTemplate>
+    implements IDocTemplateService {}
diff --git a/openhis-server-new/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
index a51833b5..847f20d2 100644
--- a/openhis-server-new/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
@@ -81,7 +81,7 @@ public class PaymentReconciliation extends HisBaseEntity {
     private Integer printCount;
 
     /** 合同编码 */
-    private String contractNo;//2025/05/08李：自付和医保同时付费时只生成一条payment，故此该字段在insert时先为null
+    private String contractNo;// 2025/05/08李：自付和医保同时付费时只生成一条payment，故此该字段在insert时先为null
 
     /** 处方号集合 */
     private String chargeItemIds;
@@ -96,15 +96,19 @@ public class PaymentReconciliation extends HisBaseEntity {
     private Long invoiceId;
 
     /** 关联账户Id */
-    private Long accountId;//2025/05/08李：自付和医保同时付费时只生成一条payment，故此该字段在insert时先为null
+    private Long accountId;// 2025/05/08李：自付和医保同时付费时只生成一条payment，故此该字段在insert时先为null
 
     /** 医保结算id */
-    private String ybSettleIds;//记录医保结算id
+    private String ybSettleIds;// 记录医保结算id
 
     /** 医保清算标志 */
+<<<<<<< HEAD
     private Integer ybClearFlag;//默认值0 未清算
 
     /** 退号/退费原因 */
     @TableField("refund_reason")
     private String refundReason;
+=======
+    private Integer ybClearFlag;// 默认值0 未清算
+>>>>>>> upstream/develop
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
new file mode 100644
index 00000000..a6bd5ffc
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
@@ -0,0 +1,144 @@
+package com.openhis.financial.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.math.BigDecimal;
+
+/**
+ * 第三方支付回调实体（下方备注信息以中银支付为模板）
+ */
+@Data
+@TableName("fin_three_part_pay_call_back")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ThreePartPayCallBack {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private BigDecimal id;
+
+    /**
+     * 响应码：（枚举RespCode）00 表示成功，其它表示失败
+     */
+    private String respCode;
+
+    /**
+     * 响应码解释信息（需要Base64解密）
+     */
+    private String respMsg;
+
+    /**
+     * 交易类型：（枚举TranType）
+     */
+    private String tranType;
+
+    /**
+     * 交易金额
+     */
+    private String txnAmt;
+
+    /**
+     * 支付方式：
+     */
+    private String payType;
+
+    /**
+     * 终端流水号：终端号系统跟踪号，同请求报文原值返回，客户端收到应答报文需要验证traceNo字段值，需与请求报文值一致，如果不一致则丢包交易失败
+     */
+    private String traceNo;
+
+    /**
+     * 交易时间：（yyyyMMddHHmmss）
+     */
+    private String txnTime;
+
+    /**
+     * 支付订单号：银行返回系统订单号，需要保存该支付交易订单号
+     */
+    private String tradeNo;
+
+    /**
+     * 第三方支付订单号
+     */
+    private String transNo;
+
+    /**
+     * 商户号
+     */
+    private String mid;
+
+    /**
+     * 商户名称
+     */
+    private String merName;
+
+    /**
+     * 终端号
+     */
+    private String tid;
+
+    /**
+     * 商户系统订单号：同请求一致
+     */
+    private String merTradeNo;
+
+    /**
+     * 商户系统退款授权单号：同请求一致
+     */
+    private String vfTradeNo;
+
+    /**
+     * 优惠金额
+     */
+    private String discountAmt;
+
+    /**
+     * 有效时间：二维码本身的有效时间，是相对时间，单位为秒，以接收方收到报文时间为起始点计时。不同类型的订单以及不同的订单状况会对应不同的默认有效时间和最大有效时间（可以为空）
+     */
+    private String qrValidTime;
+
+    /**
+     * 二维码信息：主扫支付二维码，以二维码形式显示，手机APP扫二维码码消费
+     */
+    private String scanCode;
+
+    /**
+     * 原交易类型：1、订单查询类交易填写原交易类型（被扫交易必填）2、非订单查询填写交易类型与tranType一致（可以为空）
+     */
+    private String orgTranType;
+
+    /**
+     * 原交易名称：订单查询类交易填写原交易名称，非订单查询填写交易名称（被扫交易必填）
+     */
+    private String orgTxnName;
+
+    /**
+     * 订单数据：当tranType为F时，payType 值为ZFBA或WEIX时支付宝返回的tradeNo 或者微信返回的prepayId
+     */
+    private String payData;
+
+    /**
+     * POS机号
+     */
+    private String posNo;
+
+    /**
+     * 付款主键ID
+     */
+    private Long paymentId;
+
+    /**
+     * 前台UI序号
+     */
+    private Long index;
+
+    /**
+     * 时间戳（中银建议）
+     */
+    private Long time;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java
new file mode 100644
index 00000000..288c692e
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java
@@ -0,0 +1,10 @@
+package com.openhis.financial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.financial.domain.ClaimResponse;
+import com.openhis.financial.domain.ThreePartPayCallBack;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ThreePartPayCallBackMapper extends BaseMapper<ThreePartPayCallBack> {
+}
diff --git a/openhis-server-new/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
index 99c3e24a..99f420c2 100644
--- a/openhis-server-new/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
@@ -1,8 +1,9 @@
 package com.openhis.financial.model;
-import com.openhis.administration.domain.ChargeItem;
-import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
 
 @Data
 public class PaymentedItemModel {
@@ -21,4 +22,37 @@ public class PaymentedItemModel {
     /** 总价 */
     private Long chargeItemId;
 
+    /** 医疗服务所在表 */
+    private String serviceTable;
+
+    /** 医疗服务ID */
+    private Long serviceId;
+
+    /** 产品所在表 */
+    private String productTable;
+
+    /** 产品ID */
+    private Long productId;
+
+    /** 开立人ID */
+    private Long entererId;
+
+    /** 开立科室 */
+    private Long requestingOrgId;
+
+    /** 开立时间 */
+    private Date enteredDate;
+
+    /** 数量 */
+    private BigDecimal quantityValue;
+
+    /** 单位 */
+    private String quantityUnit;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** chargeItem定义id */
+    private Long definitionId;
+
 }
diff --git a/openhis-server-new/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
index 6e55c0f2..d0cbe50f 100644
--- a/openhis-server-new/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
@@ -1,12 +1,13 @@
 package com.openhis.financial.model;
 
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
-import lombok.Data;
-
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+
+import lombok.Data;
+
 @Data
 public class PrePaymentResult {
 
@@ -82,4 +83,6 @@ public class PrePaymentResult {
     private String busNo; // 挂号采访码
 
     private Long accountId; // 账号ID码
+
+    private BigDecimal gfRatio;// 学校垫付金额
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java
new file mode 100644
index 00000000..5eb03d1b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java
@@ -0,0 +1,49 @@
+package com.openhis.financial.model;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+
+@Data
+public class StudentPaymentItemModel extends PaymentedItemModel {
+
+    /**
+     * 医保等级
+     */
+    private Integer chrgitmLv;
+
+    /**
+     * 医保分类
+     */
+    private String ybType;
+
+    /**
+     * 自付比例
+     */
+    private BigDecimal selfRatio;
+
+    /**
+     * 公费一次报销金额
+     */
+    private BigDecimal oncePrice;
+
+    /**
+     * 医保折扣部分金额
+     */
+    private BigDecimal ybRatio;
+
+    /**
+     * 学校垫付部分金额
+     */
+    private BigDecimal studentRatio;
+
+    /**
+     * 自付比例
+     */
+    private BigDecimal twiceRatio;
+
+    /**
+     * 公费二次报销金额
+     */
+    private BigDecimal twicePrice;
+}
diff --git a/openhis-server-new/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
index 6e4954c5..c13e9b63 100644
--- a/openhis-server-new/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
@@ -98,6 +98,14 @@ public interface IPaymentReconciliationService extends IService<PaymentReconcili
      */
     PaymentReconciliation getByEncounterId(Long encounterId, PaymentKind kindEnum);
 
+    /**
+     * 查询付款实体
+     *
+     * @param encounterId 就诊id
+     * @return 付款实体
+     */
+    List<PaymentReconciliation> getListByEncounterId(Long encounterId, PaymentKind paymentKind);
+
     /**
      * 判断是否已退费
      * 
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
new file mode 100644
index 00000000..35138711
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
@@ -0,0 +1,7 @@
+package com.openhis.financial.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.financial.domain.ThreePartPayCallBack;
+
+public interface ThreePartPayCallBackService extends IService<ThreePartPayCallBack> {
+}
diff --git a/openhis-server-new/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
index 3cb23e95..21526634 100644
--- a/openhis-server-new/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
@@ -1,6 +1,7 @@
 package com.openhis.financial.service.impl;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -16,25 +17,41 @@ 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.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.SecurityUtils;
 import com.core.common.utils.StringUtils;
+import com.openhis.administration.domain.ChargeItemDefinition;
+import com.openhis.administration.domain.DeviceDefinition;
+import com.openhis.administration.domain.HealthcareService;
+import com.openhis.administration.service.IChargeItemDefinitionService;
+import com.openhis.administration.service.IChargeItemService;
+import com.openhis.administration.service.IDeviceDefinitionService;
+import com.openhis.administration.service.IHealthcareServiceService;
+import com.openhis.administration.service.impl.PatientServiceImpl;
+import com.openhis.administration.service.impl.PatientStudentServiceImpl;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.YbCommonConstants;
 import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.ItemType;
 import com.openhis.common.enums.PaymentKind;
 import com.openhis.common.enums.PaymentStatus;
+import com.openhis.common.enums.ybenums.YbChrgitmLv;
 import com.openhis.common.enums.ybenums.YbMdtrtCertType;
+import com.openhis.common.enums.ybenums.YbMedChrgItmType;
 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.PaymentReconciliationAccountDel;
-import com.openhis.financial.model.PaymentResult;
-import com.openhis.financial.model.PaymentedItemModel;
-import com.openhis.financial.model.PrePaymentResult;
+import com.openhis.financial.model.*;
 import com.openhis.financial.service.IContractService;
 import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.medication.service.IMedicationDefinitionService;
+import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.openhis.nenu.service.impl.GfRatioServiceImpl;
+import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.service.IActivityDefinitionService;
 import com.openhis.yb.dto.Clinic2206OrderOutput;
 import com.openhis.yb.dto.ClinicReg2201Output;
 import com.openhis.yb.dto.PaymentInpatientDto;
@@ -57,6 +74,24 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
     private IContractService iContractService;
     @Autowired
     private YbManager ybManager;
+    @Autowired
+    private GfRatioServiceImpl gfRatioService;
+    @Autowired
+    private PatientServiceImpl patientService;
+    @Autowired
+    private PatientStudentServiceImpl patientStudentService;
+    @Autowired
+    private IChargeItemService chargeItemService;
+    @Autowired
+    private IChargeItemDefinitionService chargeItemDefinitionService;
+    @Autowired
+    private IDeviceDefinitionService deviceDefinitionService;
+    @Autowired
+    private IActivityDefinitionService activityDefinitionService;
+    @Autowired
+    private IMedicationDefinitionService medicationDefinitionService;
+    @Autowired
+    private IHealthcareServiceService healthcareServiceService;
 
     /**
      * 根据支付id获取对应收费项目的id列表
@@ -143,6 +178,9 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
             case "220100":// 长春市医保(长大)
                 Map<String, List<PaymentedItemModel>> collect =
                     paymentedItemList.stream().collect(Collectors.groupingBy(PaymentedItemModel::getMedType));
+                if (collect.entrySet().size() > 1) {
+                    throw new ServiceException("医保只接受同种医疗类型结算（普通门诊与慢病等不可以同时结算）！");
+                }
                 PrePaymentResult result;
                 for (Map.Entry<String, List<PaymentedItemModel>> medTypeKV : collect.entrySet()) {
                     Clinic2206OrderOutput clinic2206OrderOutput = null;
@@ -161,19 +199,108 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
                     }
                     // 调用预结算
                     clinic2206OrderOutput = ybManager.preSettle(contract, medTypeKV.getValue().get(0).getEncounterId(),
-                        ybMdtrtCertType, busiCardInfo, reg2201Output, "01", medTypeKV.getValue().stream()
-                            .map(PaymentedItemModel::getChargeItemId).collect(Collectors.toList()),
+                        ybMdtrtCertType, busiCardInfo, reg2201Output, "01", medTypeKV.getValue(),
                         YbMedType.getByValue(medTypeKV.getKey()));
                     prePaymentResult = new PrePaymentResult();
                     BeanUtils.copyProperties(clinic2206OrderOutput, prePaymentResult);
                 }
                 break;
+            case "STUDENT0000":
+                prePaymentResult = this.studentSelfPay(paymentedItemList);
+                break;
+            case "STUDENT220100":
+            case "STUDENT229900":
+            case "STUDENT220199":
+                prePaymentResult = this.studentYbPay(contract, ybMdtrtCertType, busiCardInfo, "01", paymentedItemList);
+                break;
             default:
                 break;
         }
         return prePaymentResult;
     }
 
+    /**
+     * 学生二次报销
+     * 
+     * @param contract 合同
+     * @param ybMdtrtCertType 医疗类别
+     * @param busiCardInfo 电子码
+     * @param s 按项目收费还是按病种收费（该字段目前在系统里面没用上，默认都是01）
+     * @param paymentedItemList 收费项
+     * @return 预结算结果
+     */
+    private PrePaymentResult studentYbPay(Contract contract, YbMdtrtCertType ybMdtrtCertType, String busiCardInfo,
+        String s, List<PaymentedItemModel> paymentedItemList) {
+
+        // 查比例及分类信息(PaymentedItemModel在chargeItem表中不是一定存在的所以此处改用单独查询)
+        List<StudentPaymentItemModel> allPaymentItemList = getStudentPaymentItemModelList(paymentedItemList);
+
+        // 拟定使用公费医疗的情况下实收金额
+        BigDecimal onceReceivedAmount = BigDecimal.ZERO;
+        for (StudentPaymentItemModel studentPaymentItemModel : allPaymentItemList) {
+            // 获取折扣比例
+            BigDecimal ratio = studentPaymentItemModel.getTwiceRatio() == null ? studentPaymentItemModel.getSelfRatio()
+                : studentPaymentItemModel.getTwiceRatio();
+
+            // 计算金额
+            onceReceivedAmount = onceReceivedAmount.add(studentPaymentItemModel.getTotalPrice()
+                .multiply(ratio.divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP)));
+        }
+
+        // 医保结算
+        PrePaymentResult prePaymentResult =
+            this.studentPreSettleYb(contract, ybMdtrtCertType, busiCardInfo, paymentedItemList);
+        if (prePaymentResult == null) {
+            throw new ServiceException("医生开具的收费项未分配对应的医疗类型！");
+        }
+
+        BigDecimal psnPartAmt = prePaymentResult.getPsnPartAmt();
+
+        if (psnPartAmt.compareTo(onceReceivedAmount) > 0) {
+            prePaymentResult.setGfRatio(psnPartAmt.subtract(onceReceivedAmount));
+            prePaymentResult.setPsnCashPay(onceReceivedAmount);
+        } else {
+            prePaymentResult.setGfRatio(BigDecimal.ZERO);
+        }
+
+        return prePaymentResult;
+    }
+
+    /**
+     * 学生一次报销
+     * 
+     * @param paymentedItemList 收费项
+     * @return 预结算结果
+     */
+    private PrePaymentResult studentSelfPay(List<PaymentedItemModel> paymentedItemList) {
+
+        List<StudentPaymentItemModel> allPaymentItemList = getStudentPaymentItemModelList(paymentedItemList);
+
+        // 拟定使用公费医疗的情况下实收金额
+        BigDecimal onceReceivedAmount = BigDecimal.ZERO;
+        for (StudentPaymentItemModel studentPaymentItemModel : allPaymentItemList) {
+            // 获取折扣比例
+            BigDecimal ratio = studentPaymentItemModel.getTwiceRatio() == null ? studentPaymentItemModel.getSelfRatio()
+                : studentPaymentItemModel.getTwiceRatio();
+
+            // 计算金额
+            onceReceivedAmount = onceReceivedAmount.add(studentPaymentItemModel.getTotalPrice().multiply(ratio));
+        }
+
+        PrePaymentResult prePaymentResult = new PrePaymentResult();
+        BigDecimal sumAmount = BigDecimal.ZERO;
+        for (PaymentedItemModel item : paymentedItemList) {
+            sumAmount = sumAmount.add(item.getTotalPrice());
+        }
+        prePaymentResult.setMedfeeSumamt(sumAmount);
+        prePaymentResult.setFulamtOwnpayAmt(sumAmount);
+        prePaymentResult.setPsnPartAmt(sumAmount);
+        prePaymentResult.setPsnCashPay(onceReceivedAmount.divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP));
+        prePaymentResult.setGfRatio(sumAmount.subtract(prePaymentResult.getPsnCashPay()));
+        prePaymentResult.setChrgBchno(CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO);
+        return prePaymentResult;
+    }
+
     /**
      * 【门诊结算】
      * 
@@ -189,7 +316,8 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
     public PaymentResult settle(Contract contract, String payTransNo, YbMdtrtCertType ybMdtrtCertType,
         String busiCardInfo, Integer minpacuntDrugTracCnt, Integer mcsTracCnt) {
         PaymentResult paymentResult = null;
-        if (!CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(payTransNo)) {
+        if (!(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(payTransNo)
+            || CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO.equals(payTransNo))) {
             // 医保支付 todo：支付的详细信息在于结算中已经存好了，但是还没有存储卡余额
             Clinic2207OrderModel clinic2207OrderModel =
                 ybManager.settle(contract, payTransNo, busiCardInfo, ybMdtrtCertType, minpacuntDrugTracCnt, mcsTracCnt);
@@ -272,6 +400,21 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
             .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode()).last(YbCommonConstants.sqlConst.LIMIT1));
     }
 
+    /**
+     * 查询已收费付款实体
+     *
+     * @param encounterId 就诊id
+     * @return 付款实体
+     */
+    @Override
+    public List<PaymentReconciliation> getListByEncounterId(Long encounterId, PaymentKind paymentKind) {
+        return baseMapper.selectList(new LambdaQueryWrapper<PaymentReconciliation>()
+                .eq(PaymentReconciliation::getEncounterId, encounterId)
+                .in(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue(),PaymentStatus.REFUNDING.getValue())
+                .eq(PaymentReconciliation::getKindEnum, PaymentKind.HOSPITAL_DEPOSIT.getValue())
+                .eq(PaymentReconciliation::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
     /**
      * 判断是否已退费
      *
@@ -309,4 +452,181 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
         return baseMapper.getPaymentAccountContract(startTime, endTime, entererId, contractNo, success, returnAll,
             clinic);
     }
+
+    /**
+     * 查询自付比例等
+     * 
+     * @param paymentedItemList 收款明细
+     * @return 学生付款实体
+     */
+    private List<StudentPaymentItemModel> getStudentPaymentItemModelList(List<PaymentedItemModel> paymentedItemList) {
+
+        // 大项比例
+        List<GfTypeRatioDto> typeRatioList = gfRatioService.getTypeRatioList();
+        Map<String, Map<String, List<GfTypeRatioDto>>> result = typeRatioList.stream().collect(
+            // 第一次分组：按 ybClass 分组（外层 key 为 ybClass）
+            Collectors.groupingBy(GfTypeRatioDto::getYbClass,
+                // 第二次分组：对每个分组的 List 再按 subType 分组（内层 key 为 subType）
+                Collectors.groupingBy(GfTypeRatioDto::getYbLv)));
+
+        List<StudentPaymentItemModel> allPaymentItemList = new ArrayList<>();
+
+        Map<String, List<PaymentedItemModel>> paymentedItemListByServiceTableMap =
+            paymentedItemList.stream().collect(Collectors.groupingBy(PaymentedItemModel::getServiceTable));
+
+        for (Map.Entry<String, List<PaymentedItemModel>> stringListEntry : paymentedItemListByServiceTableMap
+            .entrySet()) {
+
+            String key = stringListEntry.getKey();
+            ItemType itemType;
+            if (CommonConstants.TableName.MED_MEDICATION_REQUEST.equals(key)) {
+                itemType = ItemType.MEDICINE;
+            } else if (CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(key)) {
+                itemType = ItemType.ACTIVITY;
+            } else {
+                throw new ServiceException("除药品和诊疗项目外不存在其他公费项目，请确认！");
+            }
+            List<PaymentedItemModel> value = stringListEntry.getValue();
+            List<StudentPaymentItemModel> paymentItemList = gfRatioService.getGfRatioList(itemType, value);
+
+            for (StudentPaymentItemModel studentPaymentItemModel : paymentItemList) {
+
+                // 如果自付比例有值，就continue掉
+                if (studentPaymentItemModel.getSelfRatio() != null && studentPaymentItemModel.getTwiceRatio() != null) {
+                    continue;
+                }
+                // 查定价分类
+                ChargeItemDefinition chargeItemDefinition =
+                    chargeItemDefinitionService.getById(studentPaymentItemModel.getDefinitionId());
+
+                // 查医保等级
+                if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(studentPaymentItemModel.getProductTable())) {
+                    DeviceDefinition deviceDefinition =
+                        deviceDefinitionService.getById(studentPaymentItemModel.getProductId());
+                    if (deviceDefinition != null && chargeItemDefinition != null) {
+                        // 约定大项目的自付比例获取条件
+                        YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByValue(chargeItemDefinition.getYbType());
+                        if (medChrgItmType == null) {
+                            throw new ServiceException(chargeItemDefinition.getChargeName() + "未配置正确的医保分类！请检查！！！");
+                        }
+                        YbChrgitmLv chrgitmLv = YbChrgitmLv.getByValue(deviceDefinition.getChrgitmLv());
+                        if (chrgitmLv == null) {
+                            throw new ServiceException(chargeItemDefinition.getChargeName() + "未配置正确的医保等级！请检查！！！");
+                        }
+                        List<GfTypeRatioDto> gfTypeRatioDtos =
+                            result.get(chargeItemDefinition.getYbType()).get(chrgitmLv.getCode());
+                        if (gfTypeRatioDtos == null || gfTypeRatioDtos.isEmpty()) {
+                            throw new ServiceException(
+                                "医保分类：" + medChrgItmType.getInfo() + "医保等级：" + chrgitmLv.getInfo() + "未配置自付比例！请检查！！！");
+                        }
+
+                        studentPaymentItemModel.setSelfRatio(gfTypeRatioDtos.get(0).getSelfRatio());
+                        studentPaymentItemModel.setTwiceRatio(gfTypeRatioDtos.get(0).getSelfRatio());
+
+                    }
+                } else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION
+                    .equals(studentPaymentItemModel.getProductTable())) {
+                    ActivityDefinition activityDefinition =
+                        activityDefinitionService.getById(studentPaymentItemModel.getProductId());
+                    if (activityDefinition != null && chargeItemDefinition != null) {
+                        // 约定大项目的自付比例获取条件
+                        YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByValue(chargeItemDefinition.getYbType());
+                        if (medChrgItmType == null) {
+                            throw new ServiceException(chargeItemDefinition.getChargeName() + "未配置正确的医保分类！请检查！！！");
+                        }
+                        YbChrgitmLv chrgitmLv = YbChrgitmLv.getByValue(activityDefinition.getChrgitmLv());
+                        if (chrgitmLv == null) {
+                            throw new ServiceException(chargeItemDefinition.getChargeName() + "未配置正确的医保等级！请检查！！！");
+                        }
+                        List<GfTypeRatioDto> gfTypeRatioDtos =
+                            result.get(chargeItemDefinition.getYbType()).get(chrgitmLv.getCode());
+                        if (gfTypeRatioDtos == null || gfTypeRatioDtos.isEmpty()) {
+                            throw new ServiceException(
+                                "医保分类：" + medChrgItmType.getInfo() + "医保等级：" + chrgitmLv.getInfo() + "未配置自付比例！请检查！！！");
+                        }
+
+                        studentPaymentItemModel.setSelfRatio(gfTypeRatioDtos.get(0).getSelfRatio());
+                        studentPaymentItemModel.setTwiceRatio(gfTypeRatioDtos.get(0).getSelfRatio());
+                    }
+                } else if (CommonConstants.TableName.MED_MEDICATION_DEFINITION
+                    .equals(studentPaymentItemModel.getProductTable())) {
+                    MedicationDefinition medicationDefinition =
+                        medicationDefinitionService.getById(studentPaymentItemModel.getProductId());
+                    if (medicationDefinition != null && chargeItemDefinition != null) {
+                        // 约定大项目的自付比例获取条件
+                        YbMedChrgItmType medChrgItmType = YbMedChrgItmType.getByValue(chargeItemDefinition.getYbType());
+                        if (medChrgItmType == null) {
+                            throw new ServiceException(chargeItemDefinition.getChargeName() + "未配置正确的医保分类！请检查！！！");
+                        }
+                        YbChrgitmLv chrgitmLv = YbChrgitmLv.getByValue(medicationDefinition.getChrgitmLv());
+                        if (chrgitmLv == null) {
+                            throw new ServiceException(chargeItemDefinition.getChargeName() + "未配置正确的医保等级！请检查！！！");
+                        }
+                        List<GfTypeRatioDto> gfTypeRatioDtos =
+                            result.get(chargeItemDefinition.getYbType()).get(chrgitmLv.getCode());
+                        if (gfTypeRatioDtos == null || gfTypeRatioDtos.isEmpty()) {
+                            throw new ServiceException(
+                                "医保分类：" + medChrgItmType.getInfo() + "医保等级：" + chrgitmLv.getInfo() + "未配置自付比例！请检查！！！");
+                        }
+
+                        studentPaymentItemModel.setSelfRatio(gfTypeRatioDtos.get(0).getSelfRatio());
+                        studentPaymentItemModel.setTwiceRatio(gfTypeRatioDtos.get(0).getSelfRatio());
+                    }
+                } else {
+                    HealthcareService healthcareService =
+                        healthcareServiceService.getById(studentPaymentItemModel.getServiceId());
+                    if (healthcareService != null && chargeItemDefinition != null) {
+                        // 约定大项目的自付比例获取条件 医疗服务没有定义医保等级，默认百分百还是直接抛异常？
+                        studentPaymentItemModel.setSelfRatio(new BigDecimal("100"));
+                        studentPaymentItemModel.setTwiceRatio(new BigDecimal("100"));
+                    }
+                }
+                allPaymentItemList.addAll(paymentItemList);
+            }
+        }
+        return allPaymentItemList;
+    }
+
+    /**
+     * 医保预结算
+     * 
+     * @param contract 合同b
+     * @param ybMdtrtCertType 证件类型
+     * @param busiCardInfo 电子密钥
+     * @param paymentedItemList 收款明细
+     * @return 预结算参数
+     */
+    private PrePaymentResult studentPreSettleYb(Contract contract, YbMdtrtCertType ybMdtrtCertType, String busiCardInfo,
+        List<PaymentedItemModel> paymentedItemList) {
+        Map<String, List<PaymentedItemModel>> collect =
+            paymentedItemList.stream().collect(Collectors.groupingBy(PaymentedItemModel::getMedType));
+        // 一次医保结算只能支持一种医疗类型的结算
+        for (Map.Entry<String, List<PaymentedItemModel>> medTypeKV : collect.entrySet()) {
+            Clinic2206OrderOutput clinic2206OrderOutput = null;
+            ClinicReg2201Output reg2201Output = null;
+            if (!medTypeKV.getKey().equals(YbMedType.GENERAL_OUTPATIENT.getValue()) && "1"
+                .equals(SecurityUtils.getLoginUser().getOptionJson().getString(CommonConstants.Option.YB_SWITCH))) {
+                // 不是普通门诊就诊类型，补充挂号信息
+                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，此处更正赋值
+            } else {
+                // 从数据库里取reg2201
+                reg2201Output = ybManager.getClinicRegByEncounterId(medTypeKV.getValue().get(0).getEncounterId());
+            }
+            if (reg2201Output == null) {
+                throw new ServiceException("未查询到医保挂号信息");
+            }
+            // 调用预结算
+            clinic2206OrderOutput =
+                ybManager.preSettle(contract, medTypeKV.getValue().get(0).getEncounterId(), ybMdtrtCertType,
+                    busiCardInfo, reg2201Output, "01", medTypeKV.getValue(), YbMedType.getByValue(medTypeKV.getKey()));
+            PrePaymentResult prePaymentResult = new PrePaymentResult();
+            BeanUtils.copyProperties(clinic2206OrderOutput, prePaymentResult);
+            return prePaymentResult;
+        }
+        return null;
+    }
+
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java
new file mode 100644
index 00000000..c300feb2
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java
@@ -0,0 +1,11 @@
+package com.openhis.financial.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.financial.domain.ThreePartPayCallBack;
+import com.openhis.financial.mapper.ThreePartPayCallBackMapper;
+import com.openhis.financial.service.ThreePartPayCallBackService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ThreePartPayCallBackServiceImpl extends ServiceImpl<ThreePartPayCallBackMapper, ThreePartPayCallBack> implements ThreePartPayCallBackService {
+}
diff --git a/openhis-server-new/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
index 19a08b18..09d0ac17 100644
--- a/openhis-server-new/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
@@ -168,4 +168,9 @@ public class MedicationDefinition extends HisBaseEntity {
     /** 处方标志 */
     private Integer rxFlag;
 
+    /**
+     * 用药说明
+     */
+    private String dosageInstruction;
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 6f51b88c..b64c7177 100644
--- a/openhis-server-new/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
@@ -215,4 +215,9 @@ public class MedicationDetail extends HisBaseEntity {
     /** 最大库存警戒数量(常规单位) */
     private BigDecimal itemMaxQuantity;
 
+    /**
+     * 用药说明
+     */
+    private String dosageInstruction;
+
 }
diff --git a/openhis-server-new/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
index 6361ae29..1bedafaf 100644
--- a/openhis-server-new/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
@@ -6,8 +6,8 @@ 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;
@@ -126,4 +126,7 @@ public class MedicationDispense extends HisBaseEntity {
 
     /** 执行id */
     private Long procedureId;
+
+    /** 汇总编号 */
+    private String summaryNo;
 }
diff --git a/openhis-server-new/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
index 2248a82d..9a490316 100644
--- a/openhis-server-new/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
@@ -239,4 +239,14 @@ public class MedicationRequest extends HisBaseEntity {
 
     /** 请求基于什么的ID */
     private Long basedOnId;
+
+    /**
+     * 用药说明
+     */
+    private String dosageInstruction;
+
+    /**
+     * 生成来源
+     */
+    private Integer generateSourceEnum;
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/dto/AdjustPriceMedListDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/dto/AdjustPriceMedListDto.java
new file mode 100644
index 00000000..4e544660
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/dto/AdjustPriceMedListDto.java
@@ -0,0 +1,78 @@
+package com.openhis.medication.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName AdjustPriceMedListDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/20 09:58
+ * @Version 1.0
+ **/
+@Data
+public class AdjustPriceMedListDto {
+
+    /**
+     * 表主表ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long targetId;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 规格
+     */
+    private String volume;
+    /**
+     * 原进货价
+     */
+    private BigDecimal originBuyingPrice;
+    /**
+     * 原零售价
+     */
+    private BigDecimal originRetailPrice;
+    /**
+     * 新进货价格
+     */
+    private BigDecimal newBuyingPrice;
+    /**
+     * 新零售价
+     */
+    private BigDecimal newRetailPrice;
+
+    /**
+     * 调价原因
+     */
+    private String reason;
+    /**
+     * 项目编码
+     */
+    private String busNo;
+    /**
+     * 科室名称
+     */
+    private String orgName;
+    /**
+     * 药品单位
+     */
+    private String unitCode;
+    /**
+     * 影响库存总数
+     */
+    private BigDecimal totalQuantity;
+    /**
+     * 进价盈负差
+     */
+    private BigDecimal buyingDifferencePrice;
+    /**
+     * 售价盈负差
+     */
+    private BigDecimal retailDifferencePrice;
+
+}
diff --git a/openhis-server-new/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
index 138d1b74..462f1417 100644
--- a/openhis-server-new/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
@@ -3,6 +3,8 @@ package com.openhis.medication.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.medication.domain.Medication;
 import com.openhis.medication.domain.MedicationDetail;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -22,4 +24,12 @@ public interface MedicationMapper extends BaseMapper<Medication> {
      * @return 药品详细信息列表
      */
     List<MedicationDetail> selectDetailList();
+    /**
+     * Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * @param keyWord
+     * @Author raymond
+     * @Date 10:17 2025/10/20
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchMedListByKeyWord(@Param("keyWord") String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 3937ef98..b578626e 100644
--- a/openhis-server-new/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
@@ -1,9 +1,8 @@
 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.MedicationDispense;
 import com.openhis.medication.domain.MedicationRequest;
@@ -21,16 +20,19 @@ public interface IMedicationDispenseService extends IService<MedicationDispense>
      *
      * @param medicationRequest 药品请求信息
      * @param dbOpType db操作类型
+     * @return 发放id
      */
-    void handleMedicationDispense(MedicationRequest medicationRequest, String dbOpType);
+    Long handleMedicationDispense(MedicationRequest medicationRequest, String dbOpType);
 
     /**
      * 医嘱执行生成药品发放,状态为待配药
      * 
      * @param medicationRequest 药品医嘱请求
      * @param procedureId 执行记录id
+     * @param plannedDispenseTime 预定发药时间
+     * @return 发放id
      */
-    void generateMedicationDispense(MedicationRequest medicationRequest,Long procedureId);
+    Long generateMedicationDispense(MedicationRequest medicationRequest, Long procedureId, Date plannedDispenseTime);
 
     /**
      * 删除药品发放信息
@@ -77,20 +79,13 @@ public interface IMedicationDispenseService extends IService<MedicationDispense>
      */
     List<MedicationDispense> selectByRequestIdList(List<Long> requestIdList);
 
-    /**
-     * 通过id获取药品发放信息
-     *
-     * @param idList 请求id
-     * @return 发放信息
-     */
-    List<MedicationDispense> selectByIdList(@Param("idList") List<Long> idList);
-
     /**
      * 更新药品状态：已汇总
      *
      * @param medDispenseId 发放id列表
+     * @param busNo 汇总单号
      */
-    void updateDispenseStatusSummarized(List<Long> medDispenseId);
+    void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo);
 
     /**
      * 通过执行id获取药品发放信息
@@ -99,4 +94,28 @@ public interface IMedicationDispenseService extends IService<MedicationDispense>
      * @return 发放信息
      */
     List<MedicationDispense> getMedDispenseByProcedureId(List<Long> procedureIdList);
+
+    /**
+     * 取消汇总
+     *
+     * @param summaryNoList 汇总单号列表
+     * @return 取消结果
+     */
+    boolean cancelMedicationSummary(List<String> summaryNoList);
+
+    /**
+     * 更新药品发放状态
+     *
+     * @param dispenseIdList 发放id列表
+     * @param dispenseStatus 发放状态
+     */
+    void updateDispenseStatus(List<Long> dispenseIdList, Integer dispenseStatus);
+
+    /**
+     * 通过汇总单号获取药品发放信息
+     *
+     * @param summaryNoList 汇总单号列表
+     * @return 发放信息
+     */
+    List<MedicationDispense> getMedDispenseBySummaryNo(List<String> summaryNoList);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 6359b848..ccee7f7a 100644
--- a/openhis-server-new/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
@@ -3,8 +3,6 @@ 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;
 
@@ -35,10 +33,19 @@ public interface IMedicationRequestService extends IService<MedicationRequest> {
     void updateDraftStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate);
 
     /**
-     * 通过id获取药品请求信息
+     * 更新请求状态：取消
      *
-     * @param idList 请求id
-     * @return 发放信息
+     * @param requestIdList 药品请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
-    List<MedicationRequest> selectByIdList(@Param("idList") List<Long> idList);
+    void updateCancelledStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate);
+
+    /**
+     * 根据药品id获取药品请求
+     * 
+     * @param medicationId 药品id
+     * @return 药品请求列表
+     */
+    List<MedicationRequest> getMedRequestByMedicationId(Long medicationId);
 }
diff --git a/openhis-server-new/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
index b3ed6cc1..b5d2e934 100644
--- a/openhis-server-new/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
@@ -5,6 +5,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.medication.domain.Medication;
 import com.openhis.medication.domain.MedicationDetail;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 药品基本信息管理Service接口
@@ -31,5 +33,12 @@ public interface IMedicationService extends IService<Medication> {
 
     // 新增药品目录
     boolean addMedication(MedicationDetail medicationDetail);
-
+    /**
+     * Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * @param keyWord
+     * @Author raymond
+     * @Date 10:18 2025/10/20
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchMedListByKeyWord(String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index f801953c..c080d451 100644
--- a/openhis-server-new/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
@@ -8,7 +8,6 @@ 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,9 +42,10 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
      *
      * @param medicationRequest 药品请求信息
      * @param dbOpType db操作类型
+     * @return 发放id
      */
     @Override
-    public void handleMedicationDispense(MedicationRequest medicationRequest, String dbOpType) {
+    public Long handleMedicationDispense(MedicationRequest medicationRequest, String dbOpType) {
         MedicationDispense medicationDispense = new MedicationDispense();
         // 药品发放id
         medicationDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
@@ -103,19 +103,26 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
             baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
                 .eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
         }
+
+        return medicationDispense.getId();
     }
 
     /**
      * 医嘱执行生成药品发放,状态为待配药
-     * 
+     *
      * @param medicationRequest 药品医嘱请求
      * @param procedureId 执行记录id
+     * @param plannedDispenseTime 预定发药时间
+     * @return 发放id
      */
     @Override
-    public void generateMedicationDispense(MedicationRequest medicationRequest, Long procedureId) {
+    public Long generateMedicationDispense(MedicationRequest medicationRequest, Long procedureId,
+        Date plannedDispenseTime) {
         MedicationDispense medicationDispense = new MedicationDispense();
         // 执行id
         medicationDispense.setProcedureId(procedureId);
+        // 预定发药时间
+        medicationDispense.setPlannedDispenseTime(plannedDispenseTime);
         // 药品发放id
         medicationDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_DIS_NO.getPrefix(), 4));
         // 药品发放状态
@@ -166,6 +173,8 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
         medicationDispense.setLimitTime(limitTime);
 
         baseMapper.insert(medicationDispense);
+
+        return medicationDispense.getId();
     }
 
     /**
@@ -247,30 +256,19 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
                 .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) {
+    public void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo) {
         baseMapper.update(null,
             new LambdaUpdateWrapper<MedicationDispense>()
                 .set(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())
                 .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
-                .in(MedicationDispense::getId, medDispenseId));
+                .set(MedicationDispense::getSummaryNo, busNo).in(MedicationDispense::getId, medDispenseId)
+                .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
     }
 
     /**
@@ -285,4 +283,48 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
             new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getProcedureId, procedureIdList)
                 .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
     }
+
+    /**
+     * 取消汇总
+     *
+     * @param summaryNoList 汇总单号
+     * @return 取消结果
+     */
+    @Override
+    public boolean cancelMedicationSummary(List<String> summaryNoList) {
+        int result = baseMapper.update(null,
+            new LambdaUpdateWrapper<MedicationDispense>()
+                .set(MedicationDispense::getStatusEnum, DispenseStatus.PREPARATION.getValue())
+                .set(MedicationDispense::getSummaryNo, null).in(MedicationDispense::getSummaryNo, summaryNoList)
+                .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+        return result > 0;
+    }
+
+    /**
+     * 更新药品发放状态
+     *
+     * @param dispenseIdList 发放id列表
+     * @param dispenseStatus 发放状态
+     */
+    @Override
+    public void updateDispenseStatus(List<Long> dispenseIdList, Integer dispenseStatus) {
+        baseMapper.update(null,
+            new LambdaUpdateWrapper<MedicationDispense>().set(MedicationDispense::getStatusEnum, dispenseStatus)
+                .set(MedicationDispense::getStatusChangedTime, DateUtils.getNowDate())
+                .in(MedicationDispense::getId, dispenseIdList)
+                .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 通过汇总单号获取药品发放信息
+     *
+     * @param summaryNoList 汇总单号列表
+     * @return 发放信息
+     */
+    @Override
+    public List<MedicationDispense> getMedDispenseBySummaryNo(List<String> summaryNoList) {
+        return baseMapper
+            .selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getSummaryNo, summaryNoList)
+                .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 4e026bf3..1930ba28 100644
--- a/openhis-server-new/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
@@ -3,7 +3,6 @@ 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;
@@ -60,15 +59,36 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
     }
 
     /**
-     * 通过id获取药品请求信息
+     * 更新请求状态：取消
      *
-     * @param idList 请求id
-     * @return 发放信息
+     * @param requestIdList 药品请求id列表
+     * @param practitionerId 校对人
+     * @param checkDate 校对时间
      */
     @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()));
+    public void updateCancelledStatusBatch(List<Long> requestIdList, Long practitionerId, Date checkDate) {
+        LambdaUpdateWrapper<MedicationRequest> updateWrapper =
+            new LambdaUpdateWrapper<MedicationRequest>().in(MedicationRequest::getId, requestIdList)
+                .set(MedicationRequest::getStatusEnum, RequestStatus.CANCELLED.getValue());
+        if (practitionerId != null) {
+            updateWrapper.set(MedicationRequest::getPerformerCheckId, practitionerId);
+        }
+        if (checkDate != null) {
+            updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
+        }
+        baseMapper.update(null, updateWrapper);
     }
 
+    /**
+     * 根据药品id获取药品请求
+     *
+     * @param medicationId 药品id
+     * @return 药品请求列表
+     */
+    @Override
+    public List<MedicationRequest> getMedRequestByMedicationId(Long medicationId) {
+        return baseMapper
+            .selectList(new LambdaQueryWrapper<MedicationRequest>().eq(MedicationRequest::getMedicationId, medicationId)
+                .eq(MedicationRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
diff --git a/openhis-server-new/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
index 8ecd538a..e8516f81 100644
--- a/openhis-server-new/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
@@ -2,6 +2,9 @@ package com.openhis.medication.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,7 +63,7 @@ public class MedicationServiceImpl extends ServiceImpl<MedicationMapper, Medicat
 
     /**
      * 新增药品目录
-     * 
+     *
      * @param medicationDetail
      * @return
      */
@@ -83,4 +86,8 @@ public class MedicationServiceImpl extends ServiceImpl<MedicationMapper, Medicat
         return true;
     }
 
+    @Override
+    public List<AdjustPriceMedListDto> searchMedListByKeyWord(String keyWord) {
+        return this.medicationMapper.searchMedListByKeyWord(keyWord);
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java
new file mode 100644
index 00000000..f6f33ab7
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatio.java
@@ -0,0 +1,58 @@
+package com.openhis.nenu.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-02-20
+ */
+@Data
+@TableName("nenu_gf_ratio")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfRatio extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 比例类型（1大项比例2单项比例） */
+    private Integer ratioType;
+
+    /** 公费项目分类（1药品2诊疗） */
+    private Integer itemType;
+
+    /** 医保分项 */
+    private String ybClass;
+
+    /** 医保等级 */
+    private String ybLv;
+
+    /** 自付比例 */
+    private BigDecimal selfRatio;
+
+    /** 二次报销的自付比例 */
+    private BigDecimal twiceRatio;
+
+    /** 开始时间 */
+    private Date startDate;
+
+    /** 结束时间 */
+    private Date endDate;
+
+    /** 表id */
+    private Long definitionId;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java
new file mode 100644
index 00000000..7784f2c0
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/GfRatioApplication.java
@@ -0,0 +1,106 @@
+package com.openhis.nenu.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-02-20
+ */
+@Data
+@TableName("nenu_gf_ratio_application")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfRatioApplication extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 申请编号 */
+    private String busNo;
+
+    /** 公费项目分类（1药品2诊疗） */
+    private Integer itemType;
+
+    /** 医保分项 */
+    private String ybClass;
+
+    /** 医保等级 */
+    private String ybLv;
+
+    /** 申请比例 */
+    private BigDecimal applicationRatio;
+
+    /** 二次报销的自付比例 */
+    private BigDecimal twiceRatio;
+
+    /** 开始时间 */
+    private Date startDate;
+
+    /** 结束时间 */
+    private Date endDate;
+
+    /** 申请状态（0处理中1通过2驳回3取消） */
+    private Integer applicationStatus;
+
+    /** 申请人 */
+    private String applicant;
+
+    /** 申请时间 */
+    private Date applicationTime;
+
+    /** 申请原因 */
+    private String applicationReason;
+
+    /** 测算盈亏负责人 */
+    private String initialApprover;
+
+    /** 测算通过or驳回（0处理中1通过2驳回） */
+    private Integer initialApprovalResult;
+
+    /** 测算时间 */
+    private Date initialApprovalTime;
+
+    /** 测算意见 */
+    private String initialApprovalOpinion;
+
+    /** 财务科负责人 */
+    private String financeApprover;
+
+    /** 财务科通过or驳回（0处理中1通过2驳回） */
+    private Integer financeApprovalResult;
+
+    /** 报批时间 */
+    private Date financeApprovalTime;
+
+    /** 报批意见 */
+    private String financeApprovalOpinion;
+
+    /** 会议结果录入人 */
+    private String finalRecorder;
+
+    /** 会议通过or驳回（0处理中1通过2驳回） */
+    private Integer finalApprovalResult;
+
+    /** 录入时间 */
+    private Date finalRecordTime;
+
+    /** 录入意见 */
+    private String finalApprovalOpinion;
+
+    /** 表id */
+    private Long definitionId;
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java
new file mode 100644
index 00000000..878a746b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/domain/TransactionResponse.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.nenu.domain;
+
+import java.math.BigDecimal;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.alibaba.fastjson.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;
+
+/**
+ * BPC返回对象
+ *
+ * @author SunJQ
+ * @date 2025-08-15
+ */
+@Data
+@TableName("nenu_transaction_response")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class TransactionResponse extends HisBaseEntity {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private BigDecimal id;
+
+    /**
+     * 响应码：（枚举RespCode）00 表示成功，其它表示失败
+     */
+    @Length(max = 2)
+    @JSONField(name = "respCode")
+    private String respCode;
+
+    /**
+     * 响应码解释信息（需要Base64解密）
+     */
+    @Length(max = 64)
+    @JSONField(name = "respMsg")
+    private String respMsg;
+
+    /**
+     * 交易类型：（枚举TranType）
+     */
+    @Length(max = 1)
+    @JSONField(name = "tranType")
+    private String tranType;
+
+    /**
+     * 交易金额：以分为单位的交易金额（订单总金额，同请求金额一致）
+     */
+    @Length(max = 12)
+    @JSONField(name = "txnAmt")
+    private String txnAmt;
+
+    /**
+     * 支付方式：（枚举PayType）
+     */
+    @Length(max = 4)
+    @JSONField(name = "payType")
+    private String payType;
+
+    /**
+     * 终端流水号：终端号系统跟踪号，同请求报文原值返回，客户端收到应答报文需要验证traceNo字段值，需与请求报文值一致，如果不一致则丢包交易失败
+     */
+    @Length(max = 6)
+    @JSONField(name = "traceNo")
+    private String traceNo;
+
+    /**
+     * 交易时间：（yyyyMMddHHmmss）
+     */
+    @Length(max = 14)
+    @JSONField(name = "txnTime")
+    private String txnTime;
+
+    /**
+     * 支付订单号：银行返回系统订单号，需要保存该支付交易订单号
+     */
+    @Length(max = 64)
+    @JSONField(name = "tradeNo")
+    private String tradeNo;
+
+    /**
+     * 第三方支付订单号
+     */
+    @Length(max = 64)
+    @JSONField(name = "transNo")
+    private String transNo;
+
+    /**
+     * 商户号
+     */
+    @Length(max = 15)
+    @JSONField(name = "mid")
+    private String mid;
+
+    /**
+     * 商户名称
+     */
+    @Length(max = 64)
+    @JSONField(name = "merName")
+    private String merName;
+
+    /**
+     * 终端号
+     */
+    @Length(max = 8)
+    @JSONField(name = "tid")
+    private String tid;
+
+    /**
+     * 商户系统订单号：同请求一致
+     */
+    @Length(max = 64)
+    @JSONField(name = "merTradeNo")
+    private String merTradeNo;
+
+    /**
+     * 商户系统退款授权单号：同请求一致
+     */
+    @Length(max = 64)
+    @JSONField(name = "vfTradeNo")
+    private String vfTradeNo;
+
+    /**
+     * 优惠金额
+     */
+    @Length(max = 12)
+    @JSONField(name = "discountAmt")
+    private String discountAmt;
+
+    /**
+     * 有效时间：二维码本身的有效时间，是相对时间，单位为秒，以接收方收到报文时间为起始点计时。不同类型的订单以及不同的订单状况会对应不同的默认有效时间和最大有效时间（可以为空）
+     */
+    @Length(max = 8)
+    @JSONField(name = "qrValidTime")
+    private String qrValidTime;
+
+    /**
+     * 二维码信息：主扫支付二维码，以二维码形式显示，手机APP扫二维码码消费
+     */
+    @Length(max = 128)
+    @JSONField(name = "scanCode")
+    private String scanCode;
+
+    /**
+     * 原交易类型：1、订单查询类交易填写原交易类型（被扫交易必填）2、非订单查询填写交易类型与tranType一致（可以为空）
+     */
+    @Length(max = 1)
+    @JSONField(name = "orgTranType")
+    private String orgTranType;
+
+    /**
+     * 原交易名称：订单查询类交易填写原交易名称，非订单查询填写交易名称（被扫交易必填）
+     */
+    @Length(max = 30)
+    @JSONField(name = "orgTxnName")
+    private String orgTxnName;
+
+    /**
+     * 订单数据：当tranType为F时，payType 值为ZFBA或WEIX时支付宝返回的tradeNo 或者微信返回的prepayId
+     */
+    @Length(max = 64)
+    @JSONField(name = "payData")
+    private String payData;
+
+    /**
+     * 付款主键ID
+     */
+    private Long paymentId;
+
+    /**
+     * 前台UI序号
+     */
+    private Long index;
+
+    /**
+     * 时间戳（中银建议）
+     */
+    private Long time;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java
new file mode 100644
index 00000000..ec38a76a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/dto/GfTypeRatioDto.java
@@ -0,0 +1,34 @@
+package com.openhis.nenu.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 公费医疗-大项比例Dto
+ *
+ * @author Thanking
+ * @date 2025-10-24
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GfTypeRatioDto {
+
+    /** 医保分项 */
+    private String ybClass;
+
+    /** 医保分项名称 */
+    private String ybClassName;
+
+    /** 医保等级 */
+    private String ybLv;
+
+    /** 医保等级名称 */
+    private String ybLvName;
+
+    /** 自付比例 */
+    private BigDecimal selfRatio;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java
new file mode 100644
index 00000000..d0006d71
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioApplicationMapper.java
@@ -0,0 +1,17 @@
+package com.openhis.nenu.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.nenu.domain.GfRatioApplication;
+
+/**
+ * 公费医疗自付比例调整申请表Mapper接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Repository
+public interface GfRatioApplicationMapper extends BaseMapper<GfRatioApplication> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java
new file mode 100644
index 00000000..7f41ad8f
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/GfRatioMapper.java
@@ -0,0 +1,17 @@
+package com.openhis.nenu.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.nenu.domain.GfRatio;
+
+/**
+ * 公费医疗自付比例管理表Mapper接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Repository
+public interface GfRatioMapper extends BaseMapper<GfRatio> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java
new file mode 100644
index 00000000..2ac30faa
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/mapper/TransactionResponseMapper.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.nenu.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.nenu.domain.TransactionResponse;
+
+/**
+ * 中银交易记录Mapper
+ *
+ * @author SunJQ
+ * @date 2025-10-28
+ */
+@Repository
+public interface TransactionResponseMapper extends BaseMapper<TransactionResponse> {}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioApplicationService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioApplicationService.java
new file mode 100644
index 00000000..554ced94
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioApplicationService.java
@@ -0,0 +1,14 @@
+package com.openhis.nenu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.nenu.domain.GfRatioApplication;
+
+/**
+ * 公费医疗自付比例调整申请表Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IGfRatioApplicationService extends IService<GfRatioApplication> {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java
new file mode 100644
index 00000000..27eeec2c
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/IGfRatioService.java
@@ -0,0 +1,23 @@
+package com.openhis.nenu.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.nenu.domain.GfRatio;
+import com.openhis.nenu.dto.GfTypeRatioDto;
+
+/**
+ * 公费医疗自付比例管理表Service接口
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+public interface IGfRatioService extends IService<GfRatio> {
+
+    /**
+     * 查询大项比例列表
+     *
+     * @return 大项比例列表
+     */
+    List<GfTypeRatioDto> getTypeRatioList();
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/ITransactionResponseService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/ITransactionResponseService.java
new file mode 100644
index 00000000..e3e2287a
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/ITransactionResponseService.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.nenu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.nenu.domain.TransactionResponse;
+
+/**
+ * 中银交易记录Service
+ *
+ * @author SunJQ
+ * @date 2025-10-28
+ */
+
+public interface ITransactionResponseService extends IService<TransactionResponse> {}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java
new file mode 100644
index 00000000..182877af
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioApplicationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.openhis.nenu.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.nenu.domain.GfRatioApplication;
+import com.openhis.nenu.mapper.GfRatioApplicationMapper;
+import com.openhis.nenu.service.IGfRatioApplicationService;
+
+/**
+ * 公费医疗自付比例调整申请表Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Service
+public class GfRatioApplicationServiceImpl extends ServiceImpl<GfRatioApplicationMapper, GfRatioApplication>
+    implements IGfRatioApplicationService {
+
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java
new file mode 100644
index 00000000..7628cc7d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/GfRatioServiceImpl.java
@@ -0,0 +1,121 @@
+package com.openhis.nenu.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.BeanUtils;
+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.enums.DeleteFlag;
+import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.GfRatioType;
+import com.openhis.common.enums.ItemType;
+import com.openhis.common.enums.ybenums.YbChrgitmLv;
+import com.openhis.common.enums.ybenums.YbMedChrgItmType;
+import com.openhis.financial.model.PaymentedItemModel;
+import com.openhis.financial.model.StudentPaymentItemModel;
+import com.openhis.nenu.domain.GfRatio;
+import com.openhis.nenu.dto.GfTypeRatioDto;
+import com.openhis.nenu.mapper.GfRatioMapper;
+import com.openhis.nenu.service.IGfRatioService;
+
+/**
+ * 公费医疗自付比例管理表Service业务层处理
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Service
+public class GfRatioServiceImpl extends ServiceImpl<GfRatioMapper, GfRatio> implements IGfRatioService {
+
+    /**
+     * 查询自付比例（按照小项查询自付比例，如果没有的话，返回值不一定会有自付比例，还要查大项）
+     * 
+     * @param itemType
+     * @param paymentItemList
+     * @return
+     */
+    public List<StudentPaymentItemModel> getGfRatioList(ItemType itemType, List<PaymentedItemModel> paymentItemList) {
+
+        ArrayList<StudentPaymentItemModel> list = new ArrayList<>();
+
+        List<Long> serviceIdList =
+            paymentItemList.stream().map(PaymentedItemModel::getServiceId).collect(Collectors.toList());
+
+        Date date = new Date();
+        // 查询自付比例
+        List<GfRatio> gfRatios =
+            baseMapper.selectList(new LambdaQueryWrapper<GfRatio>().in(GfRatio::getDefinitionId, serviceIdList)
+                .eq(GfRatio::getDeleteFlag, DelFlag.NO.getCode()).eq(GfRatio::getItemType, itemType.getValue())
+                .ge(GfRatio::getStartDate, date).le(GfRatio::getEndDate, date));
+
+        Map<Long, List<GfRatio>> gfRatiosMap =
+            gfRatios.stream().collect(Collectors.groupingBy(GfRatio::getDefinitionId));
+
+        StudentPaymentItemModel studentPaymentItemModel;
+        for (PaymentedItemModel paymentedItemModel : paymentItemList) {
+            // copy字段
+            studentPaymentItemModel = new StudentPaymentItemModel();
+            BeanUtils.copyProperties(paymentedItemModel, studentPaymentItemModel);
+
+            List<GfRatio> gfRatiosList = gfRatiosMap.get(paymentedItemModel.getServiceId());
+            if (gfRatiosList != null && !gfRatiosList.isEmpty()) {
+                // 赋值
+                studentPaymentItemModel.setSelfRatio(gfRatiosList.get(0).getSelfRatio());
+                studentPaymentItemModel.setTwiceRatio(gfRatiosList.get(0).getTwiceRatio());
+
+            }
+            list.add(studentPaymentItemModel);
+        }
+
+        return list;
+    }
+
+    /**
+     * 查询大项比例列表
+     *
+     * @return 大项比例列表
+     */
+    @Override
+    public List<GfTypeRatioDto> getTypeRatioList() {
+        // 查询DB中的所有大项比例
+        List<GfRatio> gfRatioList =
+            this.list(new LambdaQueryWrapper<GfRatio>().eq(GfRatio::getRatioType, GfRatioType.TYPE_RATIO.getValue())
+                .eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
+        // 做成医保分项+医保等级拼接的Map
+        Map<String, GfRatio> gfRatioMap =
+            gfRatioList.stream().collect(Collectors.toMap(e -> e.getYbClass() + e.getYbLv(), Function.identity()));
+        List<GfTypeRatioDto> gfTypeRatioDtoList = new ArrayList<>();
+        // 遍历所有医疗收费项目类别
+        for (YbMedChrgItmType ybMedChrgItmType : YbMedChrgItmType.values()) {
+            // 甲类
+            GfTypeRatioDto gfTypeRatioDtoA =
+                new GfTypeRatioDto().setYbClass(ybMedChrgItmType.getValue()).setYbClassName(ybMedChrgItmType.getInfo())
+                    .setYbLv(YbChrgitmLv.CATEGORY_A.getCode()).setYbLvName(YbChrgitmLv.CATEGORY_A.getInfo());
+            GfRatio gfRatioA = gfRatioMap.get(ybMedChrgItmType.getValue() + YbChrgitmLv.CATEGORY_A.getCode());
+            if (gfRatioA != null) {
+                // DB存在则取DB的值
+                gfTypeRatioDtoA.setSelfRatio(gfRatioA.getSelfRatio());
+            }
+            gfTypeRatioDtoList.add(gfTypeRatioDtoA);
+            // 乙类
+            GfTypeRatioDto gfTypeRatioDtoB =
+                new GfTypeRatioDto().setYbClass(ybMedChrgItmType.getValue()).setYbClassName(ybMedChrgItmType.getInfo())
+                    .setYbLv(YbChrgitmLv.CATEGORY_B.getCode()).setYbLvName(YbChrgitmLv.CATEGORY_B.getInfo());
+            GfRatio gfRatioB = gfRatioMap.get(ybMedChrgItmType.getValue() + YbChrgitmLv.CATEGORY_B.getCode());
+            if (gfRatioB != null) {
+                // DB存在则取DB的值
+                gfTypeRatioDtoB.setSelfRatio(gfRatioB.getSelfRatio());
+            }
+            gfTypeRatioDtoList.add(gfTypeRatioDtoB);
+        }
+        // 返回列表
+        return gfTypeRatioDtoList;
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java
new file mode 100644
index 00000000..f0bb93de
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/nenu/service/impl/TransactionResponseServiceImpl.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.nenu.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.nenu.domain.TransactionResponse;
+import com.openhis.nenu.mapper.TransactionResponseMapper;
+import com.openhis.nenu.service.ITransactionResponseService;
+
+/**
+ * 中银交易记录Service
+ *
+ * @author SunJQ
+ * @date 2025-10-28
+ */
+@Service
+public class TransactionResponseServiceImpl extends ServiceImpl<TransactionResponseMapper, TransactionResponse>
+    implements ITransactionResponseService {}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java
index 75eff0fa..dd08ce91 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java
@@ -46,4 +46,25 @@ public class OrdersGroupPackageDetail extends HisBaseEntity {
      */
     private String unitCode;
 
+    /** 单次剂量 */
+    private BigDecimal dose;
+
+    /** 用药频次 */
+    private String rateCode;
+
+    /** 用药天数 */
+    private Integer dispensePerDuration;
+
+    /** 给药途径 */
+    private String methodCode;
+
+    /**
+     * 小单位单次剂量
+     */
+    private BigDecimal doseQuantity;
+
+    /**
+     * 组号
+     */
+    private Long groupId;
 }
diff --git a/openhis-server-new/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
index 1047ca14..fa935a0c 100644
--- a/openhis-server-new/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
@@ -170,4 +170,9 @@ public class DeviceRequest extends HisBaseEntity {
 
     /** 请求基于什么的ID */
     private Long basedOnId;
+
+    /**
+     * 生成来源
+     */
+    private Integer generateSourceEnum;
 }
diff --git a/openhis-server-new/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
index a172dd5b..c3f158e9 100644
--- a/openhis-server-new/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
@@ -89,9 +89,6 @@ public class InventoryItem extends HisBaseEntity {
     /** 追溯码包装层级 */
     private Integer packagingLevels;
 
-    /** 采购单价（包装单位） */
-    private BigDecimal price;
-
     public InventoryItem() {
         // 库存状态：启用
         this.inventoryStatusEnum = PublicationStatus.ACTIVE.getValue();
diff --git a/openhis-server-new/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
index 39b62958..25ee169f 100644
--- a/openhis-server-new/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
@@ -163,4 +163,9 @@ public class ServiceRequest extends HisBaseEntity {
      */
     private Long parentId;
 
+    /**
+     * 生成来源
+     */
+    private Integer generateSourceEnum;
+
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ActivityDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ActivityDto.java
new file mode 100644
index 00000000..124aa548
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ActivityDto.java
@@ -0,0 +1,23 @@
+package com.openhis.workflow.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName ActivityDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/18 11:31
+ * @Version 1.0
+ **/
+@Data
+public class ActivityDto {
+
+    private Long itemId;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 项目名称 */
+    private String name;
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java
new file mode 100644
index 00000000..20ab0b3b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/AdjustPriceDto.java
@@ -0,0 +1,40 @@
+package com.openhis.workflow.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @ClassName AdjustPriceDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/16 21:37
+ * @Version 1.0
+ **/
+@Data
+@Accessors(chain = true)
+public class AdjustPriceDto {
+    /**
+     * 货品ID
+     */
+    private Long itemId;
+    /**
+     * 剩余库存总数量
+     */
+    private BigDecimal totalCount;
+    /**
+     * 表名
+     */
+    private String itemTable;
+    /**
+     * 入库批次号
+     */
+    private String lotNumber;
+    /**
+     * 仓库ID 如 药房一，药房二的ID
+     */
+    private Long locationId;
+
+    private String unitCode;
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ChangePriceDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ChangePriceDto.java
new file mode 100644
index 00000000..122eba03
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/dto/ChangePriceDto.java
@@ -0,0 +1,31 @@
+package com.openhis.workflow.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName ChangePriceDto
+ * @Description TODO
+ * @Author raymond
+ * @Date 2025/10/19 10:02
+ * @Version 1.0
+ **/
+@Data
+public class ChangePriceDto {
+
+    private Long chargeId;
+
+    private Long itemId;
+
+    private BigDecimal newPrice;
+
+    private String reason;
+
+    private BigDecimal quantity;
+
+    private Long supplyRequestId;
+
+    private BigDecimal retailPrice;
+    private String itemTable;
+}
diff --git a/openhis-server-new/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
index b709cbbc..95a69686 100644
--- a/openhis-server-new/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
@@ -1,10 +1,14 @@
 package com.openhis.workflow.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.medication.dto.AdjustPriceMedListDto;
 import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.dto.ActivityDto;
 
 /**
  * 诊疗定义管理Mapper接口
@@ -23,5 +27,21 @@ public interface ActivityDefinitionMapper extends BaseMapper<ActivityDefinition>
      */
     Long getAppointActivityDefinitionId(@Param("activityName") String activityName,
         @Param("status") Integer status);
+    /**
+     * Desc: 根据 项目id数组 加载 诊疗数据集合
+     * @param itemIds
+     * @Author raymond
+     * @Date 12:20 2025/10/18
+     * @return java.util.List<com.openhis.workflow.domain.ActivityDefinition>
+     **/
+    List<ActivityDto> searchActivityDefinitionByIds(@Param("itemIds") List<Long> itemIds);
+    /**
+     * Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * @param keyWord
+     * @Author raymond
+     * @Date 07:53 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchActivityListByKeyWord(@Param("keyWord") String keyWord);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index fe52098f..1a9c629d 100644
--- a/openhis-server-new/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
@@ -1,9 +1,13 @@
 package com.openhis.workflow.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.workflow.domain.InventoryItem;
+import com.openhis.workflow.dto.AdjustPriceDto;
 
 /**
  * 库存项目管理Mapper接口
@@ -13,5 +17,21 @@ import com.openhis.workflow.domain.InventoryItem;
  */
 @Repository
 public interface InventoryItemMapper extends BaseMapper<InventoryItem> {
+    /**
+     * Desc: 根据 productIds 查询 库存大于0的 货品
+     * @param itemIds
+     * @Author raymond
+     * @Date 21:56 2025/10/16
+     * @return java.util.List<com.openhis.workflow.dto.AdjustPriceDto>
+     **/
+    List<AdjustPriceDto> searchResultDataList(@Param("itemIds") List<Long> itemIds);
+    /**
+     * Desc: 根据 productIds 查询 库存大于0的 货品并分组查询
+     * @param itemIds
+     * @Author raymond
+     * @Date 21:56 2025/10/16
+     * @return java.util.List<com.openhis.workflow.dto.AdjustPriceDto>
+     **/
+    List<AdjustPriceDto> searchResultDataListByGroup(@Param("itemIds") List<Long> itemIds);
 
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 57122b87..6572449e 100644
--- a/openhis-server-new/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
@@ -1,10 +1,16 @@
 package com.openhis.workflow.mapper;
 
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.openhis.workflow.dto.ChangePriceDto;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.openhis.workflow.domain.SupplyRequest;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 供应申请管理Mapper接口
  *
@@ -13,5 +19,88 @@ import com.openhis.workflow.domain.SupplyRequest;
  */
 @Repository
 public interface SupplyRequestMapper extends BaseMapper<SupplyRequest> {
+    /**
+     * Desc: 根据 调价单号 查询 supply request 和 价格主表
+     * @param busNo
+     * @Author raymond
+     * @Date 10:12 2025/10/19
+     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     **/
+    List<ChangePriceDto> searchDataForBusNo(@Param("busNo") String busNo);
+    /**
+     * Desc: 根据 批次号查询 分组后的 产品ID
+     * @param busNo
+     * @Author raymond
+     * @Date 13:36 2025/10/30
+     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     **/
+    List<ChangePriceDto> searchGroupDataForBusNo(@Param("busNo") String busNo);
+    /**
+     * Desc: 根据调价单号 查询 原价 med
+     * @param busNo
+     * @Author raymond
+     * @Date 14:10 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchMedInfoDataForBusNo(@Param("busNo") String busNo);
+    /**
+     * Desc: 查询历史数据 药品调价数据
+     * @param busNo
+     * @param createTime
+     * @Author raymond
+     * @Date 07:22 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryMedInfoData(@Param("busNo") String busNo, @Param("createTime")Date createTime);
 
+    /**
+     * Desc: 根据调价单号 查询 原价 device
+     * @param busNo
+     * @Author raymond
+     * @Date 18:03 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchDeviceInfoDataForBusNo(@Param("busNo") String busNo);
+    /**
+     * Desc: 查询历史数据 耗材调价数据
+     * @param busNo
+     * @param createTime
+     * @Author raymond
+     * @Date 08:57 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryDeviceInfoDataForBusNo(@Param("busNo") String busNo,@Param("createTime") Date createTime);
+    /**
+     * Desc: 根据调价单号 查询 原价 activity
+     * @param busNo
+     * @Author raymond
+     * @Date 18:03 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchActivityInfoDataForBusNo(@Param("busNo") String busNo);
+    /**
+     * Desc: 根据调价单号 查询 历史原价 activity
+     * @param busNo
+     * @Author raymond
+     * @Date 10:01 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryActivityInfoDataForBusNo(@Param("busNo") String busNo);
+
+    /**
+     * Desc: 根据调价单号 查询 原价 health
+     * @param busNo
+     * @Author raymond
+     * @Date 18:03 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHealthInfoDataForBusNo(@Param("busNo") String busNo);
+    /**
+     * Desc: 根据调价单号 查询 历史原价 health
+     * @param busNo
+     * @Author raymond
+     * @Date 10:00 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryHealthInfoDataForBusNo(@Param("busNo") String busNo);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 5a4526f7..1203ba68 100644
--- a/openhis-server-new/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
@@ -1,7 +1,13 @@
 package com.openhis.workflow.service;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.dto.ActivityDto;
 
 /**
  * 诊疗定义管理Service接口
@@ -35,4 +41,20 @@ public interface IActivityDefinitionService extends IService<ActivityDefinition>
      */
     Long getAppointActivityDefinitionId(String activityName);
 
+    /**
+     * Desc: 根据 项目id数组 加载 诊疗数据集合
+     * @param itemIds
+     * @Author raymond
+     * @Date 12:20 2025/10/18
+     * @return java.util.List<com.openhis.workflow.domain.ActivityDefinition>
+     **/
+    List<ActivityDto> searchActivityDefinitionByIds(@Param("itemIds") List<Long> itemIds);
+    /**
+     * Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * @param keyWord
+     * @Author raymond
+     * @Date 07:53 2025/10/22
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchActivityListByKeyWord(String keyWord);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 9aad1df1..7a9e9591 100644
--- a/openhis-server-new/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
@@ -17,13 +17,27 @@ import com.openhis.workflow.domain.DeviceRequest;
  */
 public interface IDeviceDispenseService extends IService<DeviceDispense> {
 
+
     /**
      * 处理器材发放信息
      *
      * @param deviceRequest 器材请求信息
      * @param dbOpType db操作类型
+     * @return 发放id
      */
-    void handleDeviceDispense(DeviceRequest deviceRequest, String dbOpType);
+    Long handleDeviceDispense(DeviceRequest deviceRequest, String dbOpType);
+
+    /**
+     * 医嘱执行生成耗材发放,状态为待配药
+     *
+     * @param deviceRequest 耗材医嘱请求
+     * @param procedureId 执行记录id
+     * @param locationId 发放器材房
+     * @param plannedDispenseTime 预定发药时间
+     * @return 发放id
+     */
+    Long generateDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
+        Date plannedDispenseTime);
 
     /**
      * 删除器材发放信息
@@ -107,4 +121,11 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
      * @param devDispenseId 发放id列表
      */
     void updateDispenseStatusSummarized(List<Long> devDispenseId);
+
+    /**
+     * 更新耗材状态：已汇总
+     *
+     * @param medDispenseId 发放id列表
+     */
+    void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo);
 }
diff --git a/openhis-server-new/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
index 8363cc44..065a2d18 100644
--- a/openhis-server-new/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
@@ -1,13 +1,11 @@
 package com.openhis.workflow.service;
 
+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.workflow.domain.DeviceRequest;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 器材请求管理Service接口
  *
@@ -45,4 +43,19 @@ public interface IDeviceRequestService extends IService<DeviceRequest> {
      * @param devReqIdList 耗材请求id列表
      */
     void updateDraftStatusBatch(List<Long> devReqIdList);
+
+    /**
+     * 更新请求状态：取消
+     *
+     * @param devReqIdList 耗材请求id列表
+     */
+    void updateCancelledStatusBatch(List<Long> devReqIdList);
+
+    /**
+     * 获取耗材请求信息
+     *
+     * @param deviceId 耗材id
+     * @return 耗材请求信息
+     */
+    List<DeviceRequest> getDevRequestByDeviceId(Long deviceId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index db62604c..cc364140 100644
--- a/openhis-server-new/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
@@ -3,9 +3,11 @@ package com.openhis.workflow.service;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.dto.AdjustPriceDto;
 
 /**
  * 库存项目管理Service接口
@@ -43,4 +45,34 @@ public interface IInventoryItemService extends IService<InventoryItem> {
      */
     List<InventoryItem> selectInventoryByItemId(Long itemId, String lotNumber, Long locationId, Integer tenantId);
 
+    /**
+     * 查询
+     *
+     * @param itemIdList 项目编号列表
+     * @param tenantId 租户id
+     * @return 单据详情
+     */
+    List<InventoryItem> selectInventoryByItemIdList(List<Long> itemIdList, Integer tenantId);
+
+    /**
+     * Desc: 根据id 数组检索库存 > 0 的药品或耗材
+     * 
+     * @param productIds
+     * @Author raymond
+     * @Date 16:45 2025/10/16
+     * @return java.util.List<com.openhis.workflow.domain.InventoryItem>
+     **/
+    List<AdjustPriceDto> searchResultDataList(List<Long> productIds);
+
+    /**
+     * Desc: 根据id 数组检索库存 > 0 的药品或耗材并分组
+     * 
+     * @param productIds
+     * @Author raymond
+     * @Date 16:45 2025/10/16
+     * @return java.util.List<com.openhis.workflow.domain.InventoryItem>
+     **/
+    List<AdjustPriceDto> searchResultDataListByGroup(List<Long> productIds);
+
+    List<InventoryItem> selectAllInventory();
 }
diff --git a/openhis-server-new/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
index d1953143..9f5cb880 100644
--- a/openhis-server-new/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
@@ -112,11 +112,10 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
     void updateCountPint(Long id, Integer num);
 
     /**
-     * 根据药品请求id,查询对应的服务请求实体
-     *
-     * @param medRequestId 药品请求id
-     * @return 服务请求实体
+     * 查询诊疗对应的服务申请
+     * 
+     * @param activityId 诊疗id
+     * @return 请求信息列表
      */
-    ServiceRequest selectByMedRequestId(Long medRequestId);
-
+    List<ServiceRequest> getServiceRequestByActivityId(Long activityId);
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 9eb76f0b..9ab6ea1c 100644
--- a/openhis-server-new/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
@@ -1,11 +1,10 @@
 package com.openhis.workflow.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.core.common.core.domain.R;
-import com.core.common.core.domain.model.LoginUser;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
 
@@ -47,5 +46,44 @@ public interface ISupplyDeliveryService extends IService<SupplyDelivery> {
      */
     List<SupplyDelivery> selectByIdList(List<Long> deliveryIdList);
 
+    /**
+     * 根据requestId，获取供应发放列表
+     *
+     * @param requestIdList requestId列表
+     * @return 供应发放列表
+     */
+    List<SupplyDelivery> selectByRequestIdList(List<Long> requestIdList);
 
+    /**
+     * 创建待发药的供应发放
+     * 
+     * @param medicationId
+     * @param lotNumber
+     * @param patientId
+     * @param minQuantity
+     * @param minUnitCode
+     * @param receiverId
+     * @param supplyRequestId
+     */
+    void createSummarySupplyDelivery(Long medicationId, String lotNumber, Long patientId, BigDecimal minQuantity,
+        String minUnitCode, Long receiverId, Long supplyRequestId);
+
+    /**
+     * 创建已发放的供应发放（耗材）
+     *
+     * @param deviceId
+     * @param lotNumber
+     * @param minQuantity
+     * @param minUnitCode
+     * @param supplyRequestId
+     */
+    void createDeviceSummarySupplyDelivery(Long deviceId, String lotNumber, BigDecimal minQuantity, String minUnitCode,
+        Long supplyRequestId);
+
+    /**
+     * 根据供应申请id，删除供应发放
+     *
+     * @param requestIdList 供应申请id列表
+     */
+    void deleteSupplyDeliveryByReqId(List<Long> requestIdList);
 }
diff --git a/openhis-server-new/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
index e4a8a207..585f972e 100644
--- a/openhis-server-new/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
@@ -1,12 +1,13 @@
 package com.openhis.workflow.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 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.medication.dto.AdjustPriceMedListDto;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.dto.ChangePriceDto;
 
 /**
  * 供应申请管理Service接口
@@ -127,6 +128,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @return 校验结果
      */
     boolean verifyAbleEdit(Long itemId);
+
     /**
      * 通过单据号删除单据信息
      *
@@ -140,6 +142,7 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @param supplyRequestIdList 供应申请id列表
      */
     void updateCompletedStatusBatch(List<Long> supplyRequestIdList);
+
     /**
      * 根据id，获取供应申请列表
      *
@@ -147,4 +150,145 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
      * @return 供应发放列表
      */
     List<SupplyRequest> selectByIdList(List<Long> requestIdList);
+
+    /**
+     * Desc: 根据 调价单号 查询 supplyrequest 和 价格主表
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 10:13 2025/10/19
+     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     **/
+    List<ChangePriceDto> searchDataForBusNo(String busNo);
+
+    /**
+     * 生成汇总发药单
+     *
+     * @param medicationId
+     * @param locationId
+     * @param lotNumber
+     * @param patientId
+     * @param minQuantity
+     * @param minUnitCode
+     * @param practitionerId
+     * @param now
+     * @param busNo
+     */
+    Long createSummarySupplyRequest(Long medicationId, Long locationId, String lotNumber, Long patientId,
+        BigDecimal minQuantity, String minUnitCode, Long practitionerId, Date now, String busNo);
+
+    /**
+     * 生成汇总发药单（耗材）
+     *
+     * @param deviceId
+     * @param locationId
+     * @param lotNumber
+     * @param minQuantity
+     * @param minUnitCode
+     * @param practitionerId
+     * @param now
+     * @param busNo
+     */
+    Long createDeviceSummarySupplyRequest(Long deviceId, Long locationId, String lotNumber, BigDecimal minQuantity,
+        String minUnitCode, Long practitionerId, Date now, String busNo);
+
+    /**
+     * Desc: 根据调价单号 查询 原价 med
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 14:10 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchMedInfoDataForBusNo(String busNo);
+
+    /**
+     * Desc: 查询历史数据 药品调价数据
+     * 
+     * @param busNo
+     * @param createTime
+     * @Author raymond
+     * @Date 07:22 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryMedInfoData(String busNo, Date createTime);
+
+    /**
+     * Desc: 根据调价单号 查询 原价 device
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 14:10 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchDeviceInfoDataForBusNo(String busNo);
+
+    /**
+     * Desc: 查询历史数据 耗材调价数据
+     * 
+     * @param busNo
+     * @param createTime
+     * @Author raymond
+     * @Date 08:57 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryDeviceInfoDataForBusNo(String busNo, Date createTime);
+
+    /**
+     * Desc: 根据调价单号 查询 原价 activity
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 14:10 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchActivityInfoDataForBusNo(String busNo);
+
+    /**
+     * Desc: 根据调价单号 查询 历史原价 activity
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 10:01 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryActivityInfoDataForBusNo(String busNo);
+
+    /**
+     * Desc: 根据调价单号 查询 原价 health
+     *
+     * @param busNo
+     * @Author raymond
+     * @Date 14:10 2025/10/21
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHealthInfoDataForBusNo(String busNo);
+
+    /**
+     * Desc: 根据调价单号 查询 历史原价 health
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 10:00 2025/10/29
+     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
+     **/
+    List<AdjustPriceMedListDto> searchHistoryHealthInfoDataForBusNo(String busNo);
+
+    /**
+     * 取消汇总
+     *
+     * @param summaryNoList 汇总单号
+     * @return 处理结果
+     */
+    List<Long> cancelSummarySupplyRequest(List<String> summaryNoList);
+
+    /**
+     * Desc: 根据 批次号查询 分组后的 产品ID
+     * 
+     * @param busNo
+     * @Author raymond
+     * @Date 13:36 2025/10/30
+     * @return java.util.List<com.openhis.workflow.dto.ChangePriceDto>
+     **/
+    List<ChangePriceDto> searchGroupDataForBusNo(String busNo);
 }
diff --git a/openhis-server-new/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
index 530a91fb..ab9f0410 100644
--- a/openhis-server-new/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
@@ -2,6 +2,8 @@ package com.openhis.workflow.service.impl;
 
 import java.util.List;
 
+import com.openhis.medication.dto.AdjustPriceMedListDto;
+import com.openhis.workflow.dto.ActivityDto;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -68,4 +70,14 @@ public class ActivityDefinitionServiceImpl extends ServiceImpl<ActivityDefinitio
         return baseMapper.getAppointActivityDefinitionId(activityName, PublicationStatus.ACTIVE.getValue());
     }
 
+    @Override
+    public List<ActivityDto> searchActivityDefinitionByIds(List<Long> itemIds) {
+        return this.activityDefinitionMapper.searchActivityDefinitionByIds(itemIds);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchActivityListByKeyWord(String keyWord) {
+        return this.activityDefinitionMapper.searchActivityListByKeyWord(keyWord);
+    }
+
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index ca139269..c56436e9 100644
--- a/openhis-server-new/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
@@ -42,9 +42,10 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
      *
      * @param deviceRequest 器材请求信息
      * @param dbOpType db操作类型
+     * @return 发放id
      */
     @Override
-    public void handleDeviceDispense(DeviceRequest deviceRequest, String dbOpType) {
+    public Long handleDeviceDispense(DeviceRequest deviceRequest, String dbOpType) {
         DeviceDispense deviceDispense = new DeviceDispense();
         // 器材发放id
         deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
@@ -92,6 +93,69 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
             baseMapper.update(deviceDispense,
                 new LambdaUpdateWrapper<DeviceDispense>().eq(DeviceDispense::getDeviceReqId, deviceRequest.getId()));
         }
+
+        return deviceDispense.getId();
+    }
+
+    /**
+     * 医嘱执行生成耗材发放,状态为待配药
+     *
+     * @param deviceRequest 耗材医嘱请求
+     * @param procedureId 执行记录id
+     * @param locationId 发放器材房
+     * @param plannedDispenseTime 预定发药时间
+     * @return 发放id
+     */
+    @Override
+    public Long generateDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
+        Date plannedDispenseTime) {
+        DeviceDispense deviceDispense = new DeviceDispense();
+        // 执行id
+        deviceDispense.setProcedureId(procedureId);
+        // 预定发药时间
+        deviceDispense.setPlannedDispenseTime(plannedDispenseTime);
+        // 器材发放id
+        deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
+        // 器材请求id
+        deviceDispense.setDeviceReqId(deviceRequest.getId());
+        // 器材发放状态
+        deviceDispense.setStatusEnum(DispenseStatus.PREPARATION.getValue());
+        // 发药类型
+        deviceDispense.setDispenseCategoryEnum(deviceRequest.getCategoryEnum());
+        // 器材编码
+        deviceDispense.setDeviceDefId(deviceRequest.getDeviceDefId());
+        // 领药患者
+        deviceDispense.setPatientId(deviceRequest.getPatientId());
+        // 相关诊疗
+        deviceDispense.setEncounterId(deviceRequest.getEncounterId());
+        // 发放数量
+        deviceDispense.setQuantity(deviceRequest.getQuantity());
+        // 发放单位
+        deviceDispense.setUnitCode(deviceRequest.getUnitCode());
+        // 产品批号
+        deviceDispense.setLotNumber(deviceRequest.getLotNumber());
+        // 发药人
+        deviceDispense.setPerformerId(deviceRequest.getPerformerId());
+        // 发放器材房
+        deviceDispense.setLocationId(locationId);
+        // 支持用药信息
+        deviceDispense.setSupportInfo(deviceRequest.getSupportInfo());
+        // 已发药数量
+        deviceDispense.setDispenseQuantity(BigDecimal.ZERO);
+        // 发药频次
+        deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode());
+
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        // 增加12小时
+        LocalDateTime newTime = now.plusHours(12);
+        // 转换为Date对象（如果需要保持使用Date类型）
+        Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant());
+        // 设置限制发药时间
+        deviceDispense.setLimitTime(limitTime);
+        baseMapper.insert(deviceDispense);
+
+        return deviceDispense.getId();
     }
 
     /**
@@ -255,4 +319,20 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
                 .set(DeviceDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())
                 .in(DeviceDispense::getId, devDispenseId));
     }
+
+    /**
+     * 更新耗材状态：已汇总
+     *
+     * @param medDispenseId 发放id列表
+     */
+    @Override
+    public void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo) {
+        baseMapper.update(null,
+            new LambdaUpdateWrapper<DeviceDispense>()
+                .set(DeviceDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue())
+                // TODO 数据库需要加字段
+                // .set(DeviceDispense::getStatusChangedTime, DateUtils.getNowDate())
+                // .set(DeviceDispense::getSummaryNo, busNo)
+                .in(DeviceDispense::getId, medDispenseId).eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
diff --git a/openhis-server-new/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
index 571581bf..2405b0fd 100644
--- a/openhis-server-new/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
@@ -4,9 +4,11 @@ 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.Practitioner;
+import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.workflow.domain.DeviceRequest;
 import com.openhis.workflow.mapper.DeviceRequestMapper;
@@ -75,4 +77,27 @@ public class DeviceRequestServiceImpl extends ServiceImpl<DeviceRequestMapper, D
         baseMapper.update(null, new LambdaUpdateWrapper<DeviceRequest>().in(DeviceRequest::getId, devReqIdList)
             .set(DeviceRequest::getStatusEnum, RequestStatus.DRAFT.getValue()));
     }
+
+    /**
+     * 更新请求状态：取消
+     *
+     * @param devReqIdList 耗材请求id列表
+     */
+    @Override
+    public void updateCancelledStatusBatch(List<Long> devReqIdList) {
+        baseMapper.update(null, new LambdaUpdateWrapper<DeviceRequest>().in(DeviceRequest::getId, devReqIdList)
+            .set(DeviceRequest::getStatusEnum, RequestStatus.CANCELLED.getValue()));
+    }
+
+    /**
+     * 获取耗材请求信息
+     *
+     * @param deviceId 耗材id
+     * @return 耗材请求信息
+     */
+    @Override
+    public List<DeviceRequest> getDevRequestByDeviceId(Long deviceId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<DeviceRequest>().eq(DeviceRequest::getDeviceDefId, deviceId)
+            .eq(DeviceRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index 38b002c9..17b4dc15 100644
--- a/openhis-server-new/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
@@ -3,7 +3,10 @@ package com.openhis.workflow.service.impl;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.openhis.workflow.dto.AdjustPriceDto;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -75,4 +78,45 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
         // 查询取库房信息
         return baseMapper.selectList(queryWrapper);
     }
+
+    /**
+     * 查询
+     *
+     * @param itemIdList 项目编号列表
+     * @param tenantId 租户id
+     * @return 单据详情
+     */
+    @Override
+    public List<InventoryItem> selectInventoryByItemIdList(List<Long> itemIdList, Integer tenantId) {
+        LambdaQueryWrapper<InventoryItem> queryWrapper =
+            new LambdaQueryWrapper<InventoryItem>().in(InventoryItem::getItemId, itemIdList)
+                .eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue())
+                .eq(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue());
+        // 查询取库房信息
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 查询
+     *
+     * @return 单据详情
+     */
+    @Override
+    public List<InventoryItem> selectAllInventory() {
+        LambdaQueryWrapper<InventoryItem> queryWrapper =
+            new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue());
+        // 查询取库房信息
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<AdjustPriceDto> searchResultDataList(List<Long> productIds) {
+
+        return baseMapper.searchResultDataList(productIds);
+    }
+
+    @Override
+    public List<AdjustPriceDto> searchResultDataListByGroup(List<Long> productIds) {
+        return baseMapper.searchResultDataListByGroup(productIds);
+    }
 }
diff --git a/openhis-server-new/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
index 38f08900..ddfe71b4 100644
--- a/openhis-server-new/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
@@ -215,21 +215,14 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
     }
 
     /**
-     * 根据药品请求id,查询对应的服务请求实体
+     * 查询诊疗对应的服务申请
      *
-     * @param medRequestId 药品请求id
-     * @return 服务请求实体
+     * @param activityId 诊疗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);
-
+    public List<ServiceRequest> getServiceRequestByActivityId(Long activityId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<ServiceRequest>()
+            .eq(ServiceRequest::getActivityId, activityId).eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
-
 }
\ No newline at end of file
diff --git a/openhis-server-new/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
index f4bbe82c..8bc99799 100644
--- a/openhis-server-new/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
@@ -1,5 +1,6 @@
 package com.openhis.workflow.service.impl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -11,8 +12,10 @@ 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.constant.CommonConstants;
 import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.DispenseStatus;
+import com.openhis.common.enums.SupplyType;
 import com.openhis.workflow.domain.SupplyDelivery;
 import com.openhis.workflow.domain.SupplyRequest;
 import com.openhis.workflow.mapper.SupplyDeliveryMapper;
@@ -125,4 +128,65 @@ public class SupplyDeliveryServiceImpl extends ServiceImpl<SupplyDeliveryMapper,
         return baseMapper.selectList(new LambdaQueryWrapper<SupplyDelivery>().in(SupplyDelivery::getId, deliveryIdList)
             .eq(SupplyDelivery::getDeleteFlag, DelFlag.YES.getCode()));
     }
+
+    /**
+     * 根据requestId，获取供应发放列表
+     *
+     * @param requestIdList requestId列表
+     * @return 供应发放列表
+     */
+    @Override
+    public List<SupplyDelivery> selectByRequestIdList(List<Long> requestIdList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyDelivery>()
+            .in(SupplyDelivery::getRequestId, requestIdList).eq(SupplyDelivery::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 创建待发药的供应发放
+     *
+     * @param medicationId
+     * @param lotNumber
+     * @param patientId
+     * @param minQuantity
+     * @param minUnitCode
+     * @param receiverId
+     * @param supplyRequestId
+     */
+    @Override
+    public void createSummarySupplyDelivery(Long medicationId, String lotNumber, Long patientId, BigDecimal minQuantity,
+        String minUnitCode, Long receiverId, Long supplyRequestId) {
+        baseMapper.insert(new SupplyDelivery().setItemId(medicationId)
+            .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setLotNumber(lotNumber)
+            .setPatientId(patientId).setQuantity(minQuantity).setUnitCode(minUnitCode)
+            .setTypeEnum(SupplyType.SUMMARY_DISPENSE.getValue()).setRequestId(supplyRequestId)
+            .setStatusEnum(DispenseStatus.IN_PROGRESS.getValue()).setReceiverId(receiverId));
+    }
+
+    /**
+     * 创建已发放的供应发放（耗材）
+     *
+     * @param deviceId
+     * @param lotNumber
+     * @param minQuantity
+     * @param minUnitCode
+     * @param supplyRequestId
+     */
+    @Override
+    public void createDeviceSummarySupplyDelivery(Long deviceId, String lotNumber, BigDecimal minQuantity,
+        String minUnitCode, Long supplyRequestId) {
+        baseMapper.insert(new SupplyDelivery().setItemId(deviceId)
+            .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION).setLotNumber(lotNumber)
+            .setQuantity(minQuantity).setUnitCode(minUnitCode).setTypeEnum(SupplyType.DEVICE_STOCKTAKING.getValue())
+            .setRequestId(supplyRequestId).setStatusEnum(DispenseStatus.COMPLETED.getValue()));
+    }
+
+    /**
+     * 根据供应申请id，删除供应发放
+     *
+     * @param requestIdList 供应申请id列表
+     */
+    @Override
+    public void deleteSupplyDeliveryByReqId(List<Long> requestIdList) {
+        baseMapper.delete(new LambdaQueryWrapper<SupplyDelivery>().in(SupplyDelivery::getRequestId, requestIdList));
+    }
 }
diff --git a/openhis-server-new/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
index 406ff3b1..0047b735 100644
--- a/openhis-server-new/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
@@ -1,9 +1,12 @@
 package com.openhis.workflow.service.impl;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,9 +14,14 @@ 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.constant.CommonConstants;
 import com.openhis.common.enums.DelFlag;
+import com.openhis.common.enums.SupplyCategory;
 import com.openhis.common.enums.SupplyStatus;
+import com.openhis.common.enums.SupplyType;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.dto.ChangePriceDto;
 import com.openhis.workflow.mapper.SupplyRequestMapper;
 import com.openhis.workflow.service.ISupplyRequestService;
 
@@ -31,6 +39,8 @@ import lombok.extern.slf4j.Slf4j;
 @AllArgsConstructor
 public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, SupplyRequest>
     implements ISupplyRequestService {
+    @Resource
+    private SupplyRequestMapper supplyRequestMapper;
 
     /**
      * 通过单据号查询单据信息
@@ -40,8 +50,7 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
      */
     @Override
     public List<SupplyRequest> getSupplyByBusNo(String busNo) {
-        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo)
-            .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
     }
 
     /**
@@ -229,7 +238,8 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
     @Override
     public boolean verifyAbleEdit(Long itemId) {
         return baseMapper.exists(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getItemId, itemId)
-            .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
+            .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode())
+            .in(SupplyRequest::getStatusEnum, SupplyStatus.APPROVAL.getValue(), SupplyStatus.AGREE.getValue()));
     }
 
     /**
@@ -268,4 +278,127 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
         return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getId, requestIdList)
             .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
-}
+
+    @Override
+    public List<ChangePriceDto> searchDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchDataForBusNo(busNo);
+    }
+
+    /**
+     * 生成汇总发药单
+     *
+     * @param medicationId
+     * @param locationId
+     * @param lotNumber
+     * @param patientId
+     * @param minQuantity
+     * @param minUnitCode
+     * @param practitionerId
+     * @param now
+     * @param busNo
+     */
+    @Override
+    public Long createSummarySupplyRequest(Long medicationId, Long locationId, String lotNumber, Long patientId,
+        BigDecimal minQuantity, String minUnitCode, Long practitionerId, Date now, String busNo) {
+        SupplyRequest supplyRequest = new SupplyRequest().setItemId(medicationId).setSourceLocationId(locationId)
+            .setLotNumber(lotNumber).setPatientId(patientId).setItemQuantity(minQuantity).setUnitCode(minUnitCode)
+            .setApplicantId(practitionerId).setApplyTime(now).setBusNo(busNo)
+            .setStatusEnum(SupplyStatus.SEND.getValue()).setTypeEnum(SupplyType.SUMMARY_DISPENSE.getValue())
+            .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION)
+            .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue());
+        baseMapper.insert(supplyRequest);
+        return supplyRequest.getId();
+    }
+
+    /**
+     * 生成汇总发药单
+     *
+     * @param deviceId
+     * @param locationId
+     * @param lotNumber
+     * @param minQuantity
+     * @param minUnitCode
+     * @param practitionerId
+     * @param now
+     * @param busNo
+     */
+    @Override
+    public Long createDeviceSummarySupplyRequest(Long deviceId, Long locationId, String lotNumber,
+        BigDecimal minQuantity, String minUnitCode, Long practitionerId, Date now, String busNo) {
+        SupplyRequest supplyRequest = new SupplyRequest().setItemId(deviceId).setSourceLocationId(locationId)
+            .setLotNumber(lotNumber).setItemQuantity(minQuantity).setUnitCode(minUnitCode)
+            .setApplicantId(practitionerId).setApplyTime(now).setBusNo(busNo)
+            .setStatusEnum(SupplyStatus.SEND.getValue()).setTypeEnum(SupplyType.DEVICE_STOCKTAKING.getValue())
+            .setItemTable(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
+            .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue());
+        baseMapper.insert(supplyRequest);
+        return supplyRequest.getId();
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchMedInfoDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchMedInfoDataForBusNo(busNo);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchHistoryMedInfoData(String busNo, Date createTime) {
+        return this.supplyRequestMapper.searchHistoryMedInfoData(busNo, createTime);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchDeviceInfoDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchDeviceInfoDataForBusNo(busNo);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchHistoryDeviceInfoDataForBusNo(String busNo, Date createTime) {
+        return this.supplyRequestMapper.searchHistoryDeviceInfoDataForBusNo(busNo, createTime);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchActivityInfoDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchActivityInfoDataForBusNo(busNo);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchHistoryActivityInfoDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchHistoryActivityInfoDataForBusNo(busNo);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchHealthInfoDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchHealthInfoDataForBusNo(busNo);
+    }
+
+    @Override
+    public List<AdjustPriceMedListDto> searchHistoryHealthInfoDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchHistoryHealthInfoDataForBusNo(busNo);
+    }
+
+    /**
+     * 取消汇总
+     *
+     * @param summaryNoList 汇总单号
+     * @return 汇总单ids
+     */
+    @Override
+    public List<Long> cancelSummarySupplyRequest(List<String> summaryNoList) {
+        // 查询汇总发药单
+        List<SupplyRequest> supplyRequestList =
+            baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getBusNo, summaryNoList)
+                .eq(SupplyRequest::getTypeEnum, SupplyType.SUMMARY_DISPENSE.getValue())
+                .eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getCode()));
+        // 软删除汇总发药单
+        baseMapper.delete(new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getBusNo, summaryNoList)
+            .eq(SupplyRequest::getTypeEnum, SupplyType.SUMMARY_DISPENSE.getValue()));
+        if (supplyRequestList != null && !supplyRequestList.isEmpty()) {
+            return supplyRequestList.stream().map(SupplyRequest::getId).toList();
+        }
+        return null;
+    }
+
+    @Override
+    public List<ChangePriceDto> searchGroupDataForBusNo(String busNo) {
+        return this.supplyRequestMapper.searchGroupDataForBusNo(busNo);
+    }
+}
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CatalogFileInput.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CatalogFileInput.java
new file mode 100644
index 00000000..2b6c6c30
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/CatalogFileInput.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.dto;
+
+import lombok.Data;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-10-30
+ */
+@Data
+public class CatalogFileInput {
+
+    String ver;
+
+    String address;
+}
diff --git a/openhis-server-new/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
index 582d6bf8..2424f8c8 100644
--- a/openhis-server-new/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
@@ -4,6 +4,7 @@
 package com.openhis.yb.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -23,4 +24,6 @@ public class FileDownload {
     private String fileQuryNo;
     @JSONField(name = "fixmedins_code")
     private String fixmedinsCode;
+
+    private String address;
 }
diff --git a/openhis-server-new/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
index 12d047ae..be5b7e3d 100644
--- a/openhis-server-new/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
@@ -22,15 +22,12 @@ import lombok.experimental.Accessors;
 public class FileResult {
 
     // 文件查询号
-    @JSONField(name="file_qury_no")
     private String fileQuryNo;
 
     // 文件名称
-    @JSONField(name="filename")
     private String filename;
 
     // 下载截止时间
-    @JSONField(name="dld_endtime")
     private Date dldEndtime;
 
     // 文件数据
@@ -38,6 +35,5 @@ public class FileResult {
     private byte[] fileData;
 
     // 医药机构编号
-    @JSONField(name="fixmedins_code")
     private String fixmedinsCode;
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java
new file mode 100644
index 00000000..d5330239
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/ThreePartPayDto.java
@@ -0,0 +1,42 @@
+package com.openhis.yb.dto;
+
+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 java.util.List;
+
+/**
+ * 第三方支付参数
+ */
+@Data
+@Accessors(chain = true)
+public class ThreePartPayDto{
+
+    private String txtCode;//支付码
+
+    private Integer index=220400;//序号
+
+
+    /**
+     * 付款id
+     */
+    private Long id;// paymentId
+
+    /** 就诊ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /** 收费项 */
+    private List<Long> chargeItemIds;// 收费时传收费的项目，退费时传退费的项目,2025/05/07去掉notEmpty的注解，与前端约定此字段必传，可以是空集合
+
+    /** 支付详细 */
+    @NotEmpty
+    private List<PaymentDetailDto> paymentDetails;
+
+    private String ybMdtrtCertType;// 社保卡/身份证/电子医保码
+
+    private String busiCardInfo;// 社保卡号/身份证号/ecToken
+}
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
index b5129361..3278be17 100644
--- 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
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
- * TODO:请概括描述当前类的主要用途和注意事项
+ * 【2401】
  *
  * @author SunJQ
  * @date 2025-07-29
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
index 4b4a655c..9777f029 100644
--- 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
@@ -10,8 +10,8 @@ import lombok.experimental.Accessors;
 
 import java.util.Date;
 
-/**
- * TODO:请概括描述当前类的主要用途和注意事项
+/**【2402】
+ *
  *
  * @author SunJQ
  * @date 2025-07-29
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
index acafa1e9..91d970e6 100644
--- 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
@@ -18,13 +18,13 @@ public class Yb2403InputParam {
     /**
      *
      */
-    Yb2403InputAdmInfo yb2403InputAdmInfo;
+    Yb2403InputAdmInfo adminfo;
     /**
      *
      */
-    List<Yb2403InputDiseInfo> yb2403InputDiseInfo;
+    List<Yb2403InputDiseInfo> diseinfo;
     /**
      *
      */
-    Yb2403InputMdtrtGrpContent yb2403InputMdtrtGrpContent;
+    Yb2403InputMdtrtGrpContent mdtrtGrpContent;
 }
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
index f0ccf5d3..3b50dab4 100644
--- 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
@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】就诊诊断信息
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 1df006df..10d6d29b 100644
--- 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
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】就诊患者信息
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index d8fbe06e..12db9ce8 100644
--- 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
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】处方（医嘱）信息
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index e1a0bcf5..311af482 100644
--- 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
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输入-规则分析信息（节点标识：data）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index a8153257..7a3f85b9 100644
--- 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
@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输入-诊断信息（节点标识：fsi_diagnose_dtos）
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 7cb2c7d7..96b67135 100644
--- 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
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输入-就诊信息（节点标识：fsi_encounter_dtos）
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 5a70885b..703e8e71 100644
--- 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
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输入-手术操作信息（节点标识：fsi_operation_dtos）
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 7c09fca3..0fee9204 100644
--- 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
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输入-处方（医嘱）信息（节点标识：fsi_order_dtos）
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 874075bb..1592dc6c 100644
--- 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
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输入-参保人信息（节点标识：patient_dtos）
  * 
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index e24926f3..a8d77c11 100644
--- 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
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输出-违规明细信息（节点标识：judge_result_detail_dtos）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 8a57cc56..d9f9230e 100644
--- 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
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3101】输出-违规信息（节点标识：result）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index dc559ab2..e5dd87f9 100644
--- 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
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3103】输入（节点标识：data）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 754ff685..5ca6b426 100644
--- 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
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 /**
  * 【3103】输入（节点标识：warns）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 58608b9f..03375951 100644
--- 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
@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】结算清单信息
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 060f7ee7..af81d951 100644
--- 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
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】输血信息（节点标识：bldinfo）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 4434c8c3..30f8cfe0 100644
--- 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
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】住院诊断信息（节点标识：diseinfo）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index d58ac044..92dce9c9 100644
--- 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
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】重症监护信息（节点标识：icuinfo）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index af61e15e..0701ae4b 100644
--- 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
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】手术操作信息（节点标识：oprninfo）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 869353d1..5ed1801a 100644
--- 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
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】门诊慢特病诊断信息（节点标识：opspdiseinfo）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 8aa147cb..5ed7806b 100644
--- 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
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】结算清单信息（节点标识setlinfo）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
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
index 583c517b..63a5ac9f 100644
--- 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
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 /**
  * 【4101A】输出（节点标识：data）
  *
- * @author GuoRui
+ * @author Thanking
  */
 @Data
 @Accessors(chain = true)
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.java
new file mode 100644
index 00000000..c7d0d10d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientDischargeMapper.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.InpatientDischarge;
+import com.openhis.yb.domain.InpatientReg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TODO:请概括描述当前接口的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Repository
+public interface InpatientDischargeMapper extends BaseMapper<InpatientDischarge> {
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.java
new file mode 100644
index 00000000..67ba8ffe
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/mapper/InpatientRegInfoUpdateRecordeMapper.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.InpatientDischarge;
+import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
+import org.springframework.stereotype.Repository;
+
+/**
+ * TODO:请概括描述当前接口的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Repository
+public interface InpatientRegInfoUpdateRecordeMapper extends BaseMapper<InpatientRegInfoUpdateRecorde> {
+}
diff --git a/openhis-server-new/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
index 4b802d97..c2f984dd 100644
--- a/openhis-server-new/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
@@ -32,29 +32,27 @@ public interface MedicalInsuranceMapper {
      * @return 查询结果
      */
     Settlement3201Dto get3201Param(@Param("startTime") Date stmtBegnDate, @Param("endTime") Date stmtEndDate,
-                                   @Param("tenantId") Integer tenantId, @Param("orgId") Long orgId, @Param("InsuType") String InsuType,
-                                   @Param("clrType") Integer clrType, @Param("admVs") String admVs, @Param("zhPay") Integer zhPay,
-                                   @Param("zhGjPay") Integer zhGjPay, @Param("ybFund") Integer ybFund);
+        @Param("tenantId") Integer tenantId, @Param("orgId") Long orgId, @Param("InsuType") String InsuType,
+        @Param("clrType") Integer clrType, @Param("admVs") String admVs, @Param("zhPay") Integer zhPay,
+        @Param("zhGjPay") Integer zhGjPay, @Param("ybFund") Integer ybFund);
 
     Settlement3202Dto get3202Param(@Param("startTime") String stmtBegnDate, @Param("endTime") String stmtEndDate,
-                                   @Param("tenantId") Integer tenantId, @Param("orgId") Long orgId, @Param("clrType") String clrType,
-                                   @Param("admVs") String admVs, @Param("zhPay") Integer zhPay, @Param("zhGjPay") Integer zhGjPay,
-                                   @Param("cash") Integer cash, @Param("cashVX") Integer cashVX, @Param("cashAli") Integer cashAli,
-                                   @Param("cashUNIN") Integer cashUNIN, @Param("ybFund") Integer ybFund);
+        @Param("tenantId") Integer tenantId, @Param("orgId") Long orgId, @Param("clrType") String clrType,
+        @Param("admVs") String admVs, @Param("zhPay") Integer zhPay, @Param("zhGjPay") Integer zhGjPay,
+        @Param("cash") Integer cash, @Param("cashVX") Integer cashVX, @Param("cashAli") Integer cashAli,
+        @Param("cashUNIN") Integer cashUNIN, @Param("ybFund") Integer ybFund);
 
     Financial3203Dto get3203Param(@Param("startTime") Date begndate, @Param("endTime") Date enddate,
-                                  @Param("tenantId") Integer tenantId, @Param("clrType") String clrType, @Param("zhPay") Integer zhPay,
-                                  @Param("zhGjPay") Integer zhGjPay, @Param("cash") Integer cash, @Param("cashVX") Integer cashVX,
-                                  @Param("cashAli") Integer cashAli, @Param("cashUNIN") Integer cashUNIN, @Param("ybFund") Integer ybFund);
-
-
-    List<Settlement3201DetailDto> get3201ParamList(@Param("startTime") String stmtBegnDate, @Param("endTime") String stmtEndDate,
-                                                   @Param("tenantId") Integer tenantId, @Param("orgId") Long orgId, @Param("InsuType") String InsuType,
-                                                   @Param("clrType") String clrType, @Param("admVs") String admVs, @Param("zhPay") Integer zhPay,
-                                                   @Param("zhGjPay") Integer zhGjPay, @Param("ybFund") Integer ybFund);
+        @Param("tenantId") Integer tenantId, @Param("clrType") String clrType, @Param("zhPay") Integer zhPay,
+        @Param("zhGjPay") Integer zhGjPay, @Param("cash") Integer cash, @Param("cashVX") Integer cashVX,
+        @Param("cashAli") Integer cashAli, @Param("cashUNIN") Integer cashUNIN, @Param("ybFund") Integer ybFund);
 
+    List<Settlement3201DetailDto> get3201ParamList(@Param("startTime") String stmtBegnDate,
+        @Param("endTime") String stmtEndDate, @Param("tenantId") Integer tenantId, @Param("orgId") Long orgId,
+        @Param("InsuType") String InsuType, @Param("clrType") String clrType, @Param("admVs") String admVs,
+        @Param("zhPay") Integer zhPay, @Param("zhGjPay") Integer zhGjPay, @Param("ybFund") Integer ybFund);
 
     List<PaymentDecDetailUniAccountDto> getPaymentDecDetailUniAccountDtoListByPaymentIdList(
-            @Param("idList")List<Long> idList, @Param("startTime")Date startTime,
-            @Param("endTime")Date endTime, @Param("draft")Integer draft);
+        @Param("idList") List<Long> idList, @Param("startTime") Date startTime, @Param("endTime") Date endTime,
+        @Param("draft") Integer draft);
 }
diff --git a/openhis-server-new/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
index 4e295fbe..b9167ee0 100644
--- a/openhis-server-new/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
@@ -1,19 +1,23 @@
 package com.openhis.yb.model;
 
-import lombok.Data;
-
 import java.math.BigDecimal;
 
+import lombok.Data;
+
 @Data
 public class OutpatientRegistrationModel {
-    //就诊凭证类型
+    // 就诊凭证类型
     private String mdtrtCertType;
-    //卡密
+    // 卡密
     private String busiCardInfo;
-    //结算方式
+    // 结算方式
     private String psnSetlWay;
-    //总价
+    // 总价
     private BigDecimal totalPrice;
-    //合同編號
+    // 合同編號
     private String contractNo;
+    // 医保对码
+    private String BusNo;
+    // 医保对码
+    private String ybNo;
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java
new file mode 100644
index 00000000..5f696bc5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientDischargeService.java
@@ -0,0 +1,20 @@
+/*
+ * 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.InpatientDischarge;
+import com.openhis.yb.domain.InpatientReg;
+
+/**
+ * TODO:请概括描述当前接口的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+
+public interface IInpatientDischargeService extends IService<InpatientDischarge> {
+
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java
new file mode 100644
index 00000000..c4e5aa74
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/IInpatientRegInfoUpdateRecordeService.java
@@ -0,0 +1,19 @@
+/*
+ * 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.InpatientRegInfoUpdateRecorde;
+
+/**
+ * TODO:请概括描述当前接口的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+
+public interface IInpatientRegInfoUpdateRecordeService extends IService<InpatientRegInfoUpdateRecorde> {
+
+}
diff --git a/openhis-server-new/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
index a2971941..5aae9af7 100644
--- a/openhis-server-new/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
@@ -47,6 +47,7 @@ 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.model.PaymentedItemModel;
 import com.openhis.financial.service.IContractService;
 import com.openhis.financial.service.IPaymentRecDetailService;
 import com.openhis.financial.service.IPaymentReconciliationService;
@@ -120,7 +121,11 @@ public class YbDao {
     @Autowired
     private IRegService iRegService;
     @Autowired
-    private IInpatientRegService iInpatientRegService;
+    private IInpatientRegService inpatientRegService;
+    @Autowired
+    private IInpatientDischargeService inpatientDischargeService;
+    @Autowired
+    private IInpatientRegInfoUpdateRecordeService inpatientRegInfoUpdateRecordeService;
     @Autowired
     private IInpatientSettleService inpatientSettleService;
     @Autowired
@@ -247,13 +252,13 @@ public class YbDao {
      * 【2204】诊断信息上传
      *
      * @param tenantId 租户id
-     * @param chargeItemIds 收费项id集合
+     * @param paymentedItemList 收费项id集合
      * @return 【2204】参数
      */
 
-    public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<Long> chargeItemIds,
+    public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<PaymentedItemModel> paymentedItemList,
         ClinicReg2201Output reg2201Output) {
-        return ybUtil.getClinicOrder2204Param(tenantId, chargeItemIds, reg2201Output);
+        return ybUtil.getClinicOrder2204Param(tenantId, paymentedItemList, reg2201Output);
     }
 
     /**
@@ -1998,7 +2003,7 @@ public class YbDao {
             throw new ServiceException("未查询到就诊记录");
         }
 
-        InpatientReg inpatientReg = iInpatientRegService
+        InpatientReg inpatientReg = inpatientRegService
             .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
                 .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (inpatientReg == null) {
@@ -2088,7 +2093,7 @@ public class YbDao {
         if (encounter == null) {
             throw new ServiceException("未查询到挂号信息");
         }
-        InpatientReg inpatientReg = iInpatientRegService
+        InpatientReg inpatientReg = inpatientRegService
             .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
                 .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (inpatientReg == null) {
@@ -2151,7 +2156,7 @@ public class YbDao {
             throw new ServiceException("未查询到挂号信息");
         }
         // 查询挂号信息
-        InpatientReg inpatientReg = iInpatientRegService
+        InpatientReg inpatientReg = inpatientRegService
             .getOne(new LambdaQueryWrapper<InpatientReg>().eq(InpatientReg::getIptNo, encounter.getBusNo())
                 .orderByDesc(InpatientReg::getBegntime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (inpatientReg == null) {
@@ -2341,7 +2346,7 @@ public class YbDao {
      * @param encounterId 就诊id
      * @return 2402参数
      */
-    public Yb2402InputParam getYb2402InputInpatientDscgInfo(Long encounterId) {
+    public Yb2402InputParam getYb2402InputInpatientDscgInfo(Long encounterId,Contract contract) {
 
         Yb2402InputParam yb2402InputParam = new Yb2402InputParam();
         Encounter encounter = iEncounterService.getById(encounterId);
@@ -2349,7 +2354,7 @@ public class YbDao {
             throw new ServiceException("未查询到就诊信息");
         }
 
-        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        InpatientReg inpatientReg = inpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
         if (inpatientReg == null) {
             throw new ServiceException("未查询到医保挂号信息");
         }
@@ -2362,7 +2367,7 @@ public class YbDao {
             throw new ServiceException("挂号账户为自费账户，无法办理医保住院登记");
         }
 
-        Contract contract = iContractService.getContract(account.getContractNo());
+        contract = iContractService.getContract(account.getContractNo());
         if (contract == null) {
             throw new ServiceException("未查询到对应合同信息");
         }
@@ -2531,7 +2536,7 @@ public class YbDao {
             throw new ServiceException("未查询到就诊信息");
         }
 
-        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        InpatientReg inpatientReg = inpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
         if (inpatientReg == null) {
             throw new ServiceException("未查询到医保挂号信息");
         }
@@ -2719,8 +2724,8 @@ public class YbDao {
         }
 
         // 拼装参数
-        yb24032InputParam.setYb2403InputDiseInfo(yb2403InputDiseInfos);
-        yb24032InputParam.setYb2403InputAdmInfo(yb2403InputAdmInfo);
+        yb24032InputParam.setDiseinfo(yb2403InputDiseInfos);
+        yb24032InputParam.setAdminfo(yb2403InputAdmInfo);
 
         return yb24032InputParam;
     }
@@ -2740,7 +2745,7 @@ public class YbDao {
             throw new ServiceException("未查询到就诊信息");
         }
 
-        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        InpatientReg inpatientReg = inpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
         if (inpatientReg == null) {
             throw new ServiceException("未查询到医保挂号信息");
         }
@@ -2764,7 +2769,7 @@ public class YbDao {
             throw new ServiceException("未查询到就诊信息");
         }
 
-        InpatientReg inpatientReg = iInpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
+        InpatientReg inpatientReg = inpatientRegService.getInpatientRegByIptNo(encounter.getBusNo());
         if (inpatientReg == null) {
             throw new ServiceException("未查询到医保挂号信息");
         }
@@ -2797,4 +2802,62 @@ public class YbDao {
 
         return yb5205InputSpecialDisease;
     }
+
+    /**
+     * 保存入院办理信息
+     * @param inpatientReg 参数
+     */
+    public void save2401InpatientReg(InpatientReg inpatientReg) {
+        inpatientRegService.save(inpatientReg);
+    }
+
+    /**
+     * 保存出院办理信息
+     * @param inpatientReg
+     */
+    public void save2402InpatientDscg(InpatientDischarge inpatientReg) {
+        inpatientDischargeService.save(inpatientReg);
+    }
+
+    /**
+     * 保存2403住院信息变更记录
+     * @param yb2403InputParam 参数
+     */
+    public void save2403InputInpatient(Yb2403InputParam yb2403InputParam) {
+
+        InpatientRegInfoUpdateRecorde inpatientRegInfoUpdateRecorde = new InpatientRegInfoUpdateRecorde();
+
+        Yb2403InputMdtrtGrpContent yb2403InputMdtrtGrpContent = yb2403InputParam.getMdtrtGrpContent();
+        Yb2403InputAdmInfo yb2403InputAdmInfo = yb2403InputParam.getAdminfo();
+        List<Yb2403InputDiseInfo> yb2403InputDiseInfo = yb2403InputParam.getDiseinfo();
+
+        inpatientRegInfoUpdateRecorde.setMdtrtId(yb2403InputAdmInfo.getMdtrtId())
+                .setAdmBed(yb2403InputAdmInfo.getAdmBed())
+                .setPsnNo(yb2403InputAdmInfo.getPsnNo())
+                .setConerName(yb2403InputAdmInfo.getConerName())
+                .setTel(yb2403InputAdmInfo.getTel())
+                .setBegntime(yb2403InputAdmInfo.getBegntime())
+                .setEndtime(yb2403InputAdmInfo.getEndtime())
+                .setDscgMaindiagCode(yb2403InputAdmInfo.getDscgMaindiagCode())
+                .setDscgMaindiagName(yb2403InputAdmInfo.getDscgMaindiagName())
+                .setMainCondDscr(yb2403InputAdmInfo.getMainCondDscr())
+                .setDiseCodg(yb2403InputAdmInfo.getDiseCodg())
+                .setDiseName(yb2403InputAdmInfo.getDiseName())
+                .setOprnOprtName(yb2403InputAdmInfo.getOprnOprtName())
+                .setOprnOprtCode(yb2403InputAdmInfo.getOprnOprtCode())
+                .setFpscNo(yb2403InputAdmInfo.getFpscNo())
+                .setMatnType(yb2403InputAdmInfo.getMatnType())
+                .setBirctrlMatnDate(yb2403InputAdmInfo.getBirctrlMatnDate())
+                .setLatechbFlag(yb2403InputAdmInfo.getLatechbFlag())
+                .setBirctrlType(yb2403InputAdmInfo.getBirctrlType())
+                .setEssoVal(yb2403InputAdmInfo.getEssoVal())
+                .setFetts(yb2403InputAdmInfo.getFetts())
+                .setFetusCnt(yb2403InputAdmInfo.getFetusCnt())
+                .setPretFlag(yb2403InputAdmInfo.getPretFlag())
+                .setDiseTypeCode(yb2403InputAdmInfo.getDiseTypeCode());
+
+        inpatientRegInfoUpdateRecorde.setInputParam(JSON.toJSONString(inpatientRegInfoUpdateRecorde));
+
+        inpatientRegInfoUpdateRecordeService.save(inpatientRegInfoUpdateRecorde);
+    }
 }
diff --git a/openhis-server-new/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
index d2c4fa2a..2d505be9 100644
--- a/openhis-server-new/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
@@ -9,11 +9,10 @@ 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 com.openhis.financial.service.impl.ContractServiceImpl;
+import com.openhis.yb.domain.InpatientDischarge;
+import com.openhis.yb.domain.InpatientReg;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -49,6 +48,7 @@ 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.financial.service.impl.ContractServiceImpl;
 import com.openhis.yb.domain.ClinicReg;
 import com.openhis.yb.dto.*;
 import com.openhis.yb.model.Clinic2207OrderModel;
@@ -400,13 +400,13 @@ public class YbHttpUtils {
     public Result reconcileGeneralLedger(Financial3201Param financial3201Param) {
 
         // 此处先查询到合同并回填给入参对象
-        Contract contract=iContractService.getContract(financial3201Param.getSetlOptins());
-        if(contract==null){
+        Contract contract = iContractService.getContract(financial3201Param.getSetlOptins());
+        if (contract == null) {
             throw new ServiceException("未查询到合同信息");
         }
         // 发送请求
         String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/reconcile",
-            financial3201Param,contract);
+            financial3201Param, contract);
 
         // 赋值（上述回填的两个参数医保不要，为了避免麻烦，在发送http后进行回填）
         financial3201Param.setFixmedinsCode(contract.getFixmedinsCode());
@@ -662,7 +662,7 @@ public class YbHttpUtils {
         MedicalInventory3511Output medicalInventory3511Output = null;
         if (result == null) {
             throw new ServiceException("未接收到医保返回参数");
-        } else if (result.getCode() == 200) {
+        } else if (result.getCode() == 401) {
             System.out.println(JSON.toJSONString(result.getResult()));
             medicalInventory3511Output =
                 parseObject(JSON.toJSONString(result.getResult()), MedicalInventory3511Output.class);
@@ -1076,4 +1076,154 @@ public class YbHttpUtils {
         }
         return null;
     }
+
+    /**
+     * 【目录下载】
+     *
+     * @param catalogFileInput
+     * @return
+     */
+    public FileResult queryCatalog(CatalogFileInput catalogFileInput) {
+        String resultString = httpPost(
+            SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/query-catalog", catalogFileInput, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【" + catalogFileInput.getAddress() + "】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【" + catalogFileInput.getAddress() + "】返回参数:" + 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) {
+                System.out.println(result.getResult().toString());
+                return JSON.parseObject(JSON.toJSONString(result.getResult()), FileResult.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 【文件下载】
+     *
+     * @param fileResult
+     * @return
+     */
+    public FileResult downLoadFile(FileResult fileResult) {
+        String resultString =
+            httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/download", fileResult, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【9102】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【9102】返回参数:" + 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) {
+                System.out.println(result.getResult().toString());
+                return JSON.parseObject(JSON.toJSONString(result.getResult()), FileResult.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * 【2401】住院办理
+     *
+     * @param yb2401InputInpatientMdtrtInfo 入參
+     * @return 結果
+     */
+    public InpatientReg inpatientReg(Yb2401InputInpatientMdtrtInfo yb2401InputInpatientMdtrtInfo) {
+        String resultString =
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/inpatient-reg",
+                        yb2401InputInpatientMdtrtInfo, contractServiceImpl.getContract(yb2401InputInpatientMdtrtInfo.getMdtrtareaAdmvs()));
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2401】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2401】返回参数:" + 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) {
+                System.out.println(result.getResult().toString());
+                return JSON.parseObject(result.getResult().toString(), InpatientReg.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    public InpatientDischarge inpatientCheckOut(Contract contract,Yb2402InputParam yb2402InputInpatientDscgInfo) {
+        String resultString =
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/discharge-patient",
+                        yb2402InputInpatientDscgInfo, contract);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2402】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2402】返回参数:" + 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) {
+                System.out.println(result.getResult().toString());
+                return JSON.parseObject(result.getResult().toString(), InpatientDischarge.class);
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    public void updateInpatientInfo(Yb2403InputParam yb2405InputInpatient) {
+        String resultString =
+                httpPost(SecurityUtils.getLoginUser().getOptionJson().getString("ybUrl") + "/change-inpatient-info",
+                        yb2405InputInpatient, null);
+        if (StringUtils.isEmpty(resultString)) {
+            throw new ServiceException("未接收到医保返回参数");
+        }
+        System.out.println("【2405】返回参数:" + JSON.toJSONString(resultString));
+        logger.info("【2405】返回参数:" + 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) {
+                System.out.println(result.getResult().toString());
+                return;
+            } else {
+                throw new ServiceException(result.getMessage());
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+    }
 }
diff --git a/openhis-server-new/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
index a27c02d2..1457c5c8 100644
--- a/openhis-server-new/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
@@ -41,6 +41,7 @@ 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.model.PaymentedItemModel;
 import com.openhis.financial.service.IContractService;
 import com.openhis.financial.service.IPaymentRecDetailService;
 import com.openhis.financial.service.IPaymentReconciliationService;
@@ -237,32 +238,7 @@ public class YbManager {
      * @return 结果
      */
     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);
-        }
-        return R.fail(regResult, "医保退号失败");
+        return null;
     }
 
     /**
@@ -353,12 +329,13 @@ public class YbManager {
         if (totalPrice == null) {
             throw new ServiceException("未查询到挂号费用金额");
         }
+
         // 外购处方标志（文档上没有详细介绍） 2025/04/14经确认，暂定非处方流转传0，处方流转传1
-        clinicFeedetail.setMedListCodg("001101000010000-100000002");
+        clinicFeedetail.setMedListCodg(cancelRegPaymentModel.getYbNo());
         clinicFeedetail.setFeedetlSn(clinic2204OrderParam.getChrgBchno()).setMdtrtId(clinicReg2201Output.getMdtrtId())
             .setPsnNo(reg.getPsnNo()).setChrgBchno(clinic2204OrderParam.getChrgBchno()).setFeeOcurTime(new Date())
-            .setMedinsListCodg("1922546598919725058").setDetItemFeeSumamt(totalPrice.doubleValue()).setCnt(1.0)
-            .setPric(totalPrice.doubleValue()).setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs())
+            .setMedinsListCodg(cancelRegPaymentModel.getBusNo()).setDetItemFeeSumamt(totalPrice.doubleValue())
+            .setCnt(1.0).setPric(totalPrice.doubleValue()).setInsuplcAdmdvs(perinfo.getInsuplcAdmdvs())
             .setBilgDeptCodg(organization.getYbNo()).setBilgDeptName(organization.getName())
             .setBilgDrCodg(doctor.getYbNo())
             // 默认无需审批
@@ -404,8 +381,8 @@ public class YbManager {
     }
 
     public Clinic2206OrderOutput preSettle(Contract contract, Long encounterId, YbMdtrtCertType ybMdtrtCertType,
-        String busiCardInfo, ClinicReg2201Output reg2201Output, String payWay, List<Long> chargeItemIds,
-        YbMedType ybMedType) {
+        String busiCardInfo, ClinicReg2201Output reg2201Output, String payWay,
+        List<PaymentedItemModel> paymentedItemList, YbMedType ybMedType) {
         YbPsnSetlWay ybPsnSetlWay = YbPsnSetlWay.getByValue(payWay);
         if (ybPsnSetlWay == null) {
             ybPsnSetlWay = YbPsnSetlWay.PSN_SETLWAY01;
@@ -422,7 +399,7 @@ public class YbManager {
         Result result = ybHttpService.upload2203Record(clinic2203MedicalParam, contract);
 
         Clinic2204OrderParam clinic2204OrderParam =
-            ybBaseService.getClinicOrder2204Param(tenantId, chargeItemIds, reg2201Output);
+            ybBaseService.getClinicOrder2204Param(tenantId, paymentedItemList, reg2201Output);
         if (clinic2204OrderParam == null) {
             throw new ServiceException("未生成2204接口参数");
         }
@@ -920,6 +897,8 @@ public class YbManager {
         List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtos =
             iChargeItemService.getChargeItemBaseInfoByIds(prePaymentDto.getChargeItemIds());
         List<ChargeItemBaseInfoDto> chargeItemBaseInfoDtosList = new ArrayList<>();
+
+        // 查询基础信息 todo:childrenJson里面村的内容相比较ChargeItemBaseInfoDto有些不够，需要确认一下类里面实际用到的值在children里存不存在
         for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtos) {
             if (chargeItemBaseInfoDto.getContractNo().equals(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO)) {
                 continue;
@@ -933,6 +912,7 @@ public class YbManager {
                 chargeItemBaseInfoDtosList.add(chargeItemBaseInfoDto);
             }
         }
+
         Yb2301InputFeeDetail yb2301InputFeeDetail;
         List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList();
         // int i = 1;
@@ -958,19 +938,19 @@ public class YbManager {
         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);
-            }
-        }
+        // 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) {
@@ -986,7 +966,7 @@ public class YbManager {
             .setInsutype(infoPerson.getInsutype()).setInsuplcAdmdvs(infoPerson.getInsuplcAdmdvs())
             .setMdtrtareaAdmvs(iContractService.getContractListByYb().get(0).getAdmVs());
 
-        // todo:中如结算标志需要判断一下，待2304接口开发完成后编辑
+        // todo:中途结算标志需要判断一下，待2304接口开发完成后编辑
 
         Yb2303OutputSetInfo yb2303OutputSetInfo = ybHttpService.inpatientPreSettle(yb2303InputInpatient);
 
@@ -1031,4 +1011,7 @@ public class YbManager {
 
         return yb2305OutputSetlInfo;
     }
+
+    public void hospitalAdmission() {
+    }
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientDischargeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientDischargeServiceImpl.java
new file mode 100644
index 00000000..871014f5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientDischargeServiceImpl.java
@@ -0,0 +1,28 @@
+/*
+ * 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.InpatientDischarge;
+import com.openhis.yb.domain.InpatientReg;
+import com.openhis.yb.mapper.InpatientDischargeMapper;
+import com.openhis.yb.mapper.InpatientRegMapper;
+import com.openhis.yb.service.IInpatientDischargeService;
+import com.openhis.yb.service.IInpatientRegService;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Service
+public class InpatientDischargeServiceImpl extends ServiceImpl<InpatientDischargeMapper, InpatientDischarge>
+    implements IInpatientDischargeService {
+
+
+}
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
new file mode 100644
index 00000000..910cf4be
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/service/impl/InpatientRegInfoUpdateRecordeServiceImpl.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.yb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.yb.domain.InpatientDischarge;
+import com.openhis.yb.domain.InpatientRegInfoUpdateRecorde;
+import com.openhis.yb.mapper.InpatientDischargeMapper;
+import com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper;
+import com.openhis.yb.service.IInpatientDischargeService;
+import com.openhis.yb.service.IInpatientRegInfoUpdateRecordeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO:请概括描述当前类的主要用途和注意事项
+ *
+ * @author SunJQ
+ * @date 2025-07-31
+ */
+@Service
+public class InpatientRegInfoUpdateRecordeServiceImpl extends ServiceImpl<InpatientRegInfoUpdateRecordeMapper, InpatientRegInfoUpdateRecorde>
+    implements IInpatientRegInfoUpdateRecordeService {
+
+
+}
diff --git a/openhis-server-new/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
index 8243ee86..667b3467 100644
--- a/openhis-server-new/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
@@ -36,6 +36,7 @@ import com.openhis.common.enums.ybenums.*;
 import com.openhis.financial.domain.Contract;
 import com.openhis.financial.domain.PaymentRecDetail;
 import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.model.PaymentedItemModel;
 import com.openhis.financial.service.IContractService;
 import com.openhis.financial.service.IPaymentRecDetailService;
 import com.openhis.financial.service.IPaymentReconciliationService;
@@ -354,17 +355,17 @@ public class YbParamBuilderUtil {
      * @return
      */
     public List<Clinic2204FeeDetailParam> getClinicFeedetailList(Integer tenantId, ClinicReg2201Output reg,
-        String chrgBchno, List<Long> chargeItemIds) {
+        String chrgBchno, List<PaymentedItemModel> paymentedItemList) {
 
         List<Clinic2204FeeDetailParam> clincFeedetailList = new ArrayList<Clinic2204FeeDetailParam>();
         // 查询收费项
-        List<ChargeItem> ChargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
-            .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getTenantId, tenantId));
+        // List<ChargeItem> ChargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
+        // .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getTenantId, tenantId));
 
         // 是否是电子处方
         Whether eFlag = Whether.getByValue(0);
 
-        for (ChargeItem chargeItem : ChargeItemList) {
+        for (PaymentedItemModel chargeItem : paymentedItemList) {
             Clinic2204FeeDetailParam clinicFeedetail = new Clinic2204FeeDetailParam();
             // 查询项目信息
             String productTable = chargeItem.getProductTable();
@@ -423,7 +424,7 @@ public class YbParamBuilderUtil {
      * @param tenantId 租户id
      * @return
      */
-    public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<Long> chargeItemIds,
+    public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<PaymentedItemModel> paymentedItemList,
         ClinicReg2201Output reg2201Output) {
 
         Clinic2204OrderParam clinicOrderPage = new Clinic2204OrderParam();
@@ -433,7 +434,7 @@ public class YbParamBuilderUtil {
         clinicOrderPage.setChrgBchno(clinicOrderPage.getChrgBchno());
 
         List<Clinic2204FeeDetailParam> clincFeedetailList =
-            getClinicFeedetailList(tenantId, reg2201Output, clinicOrderPage.getChrgBchno(), chargeItemIds);
+            getClinicFeedetailList(tenantId, reg2201Output, clinicOrderPage.getChrgBchno(), paymentedItemList);
 
         clinicOrderPage.setFeedetail(clincFeedetailList).setInsuplcAdmdvs(reg2201Output.getInsuplcAdmdvs());
         return clinicOrderPage;
@@ -1338,8 +1339,8 @@ public class YbParamBuilderUtil {
             throw new ServiceException("无效的目录类别");
         }
         return new MedicalDirectory3302Param().setFixmedinsHilistId(busNo)
-            .setFixmedinsCode(TenantOptionUtil.getOptionContent(TenantOptionDict.FIXMEDINS_CODE)).setListType(listType)
-            .setMedListCodg(ybNo);
+            .setFixmedinsCode(TenantOptionUtil.getOptionContent(TenantOptionDict.YB_FIXMEDINS_CODE))
+            .setListType(listType).setMedListCodg(ybNo);
     }
 
     /**
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
new file mode 100644
index 00000000..d75ea224
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChangePriceRecordMapper.xml
@@ -0,0 +1,209 @@
+<?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.ChangePriceRecordMapper">
+
+    <select id="searchMedChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select md.name as itemName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        record.unit_code as unitCode,
+        med.total_volume as totalVolume,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join med_medication_definition md on record.item_id = md.id
+        left join med_medication med on medication_def_id = md.id
+        where record.bus_no = #{busNo}
+        and record.item_category_enum = #{categoryEnum}
+        <if test="statusEnum != null">
+            and record.status_enum = #{statusEnum}
+        </if>
+        group by md.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no,record.unit_code,med.total_volume
+    </select>
+
+    <select id="searchMedChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select md.name as itemName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        record.unit_code as unitCode,
+        med.total_volume as totalVolume,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join med_medication_definition md on record.item_id = md.id
+        left join med_medication med on medication_def_id = md.id
+        where record.item_id = #{itemId}
+        and record.item_category_enum = #{categoryEnum}
+        and record.status_enum = #{statusEnum}
+        group by md.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no,record.unit_code,med.total_volume
+    </select>
+
+    <select id="searchDeviceChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select deivce.name as itemName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        deivce.size   as totalVolume,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join adm_device_definition deivce on record.item_id = deivce.id
+        where record.bus_no = #{busNo}
+        and record.item_category_enum = #{categoryEnum}
+        <if test="statusEnum != null">
+            and record.status_enum = #{statusEnum}
+        </if>
+        group by deivce.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no,deivce.size
+    </select>
+
+    <select id="searchDeviceChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select deivce.name as itemName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        deivce.size   as totalVolume,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join adm_device_definition deivce on record.item_id = deivce.id
+        where record.item_id = #{itemId}
+        and record.item_category_enum = #{categoryEnum}
+        and record.status_enum = #{statusEnum}
+        group by deivce.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no,deivce.size
+    </select>
+
+    <select id="searchActivityChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select activity.name as itemName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join wor_activity_definition activity on record.item_id = activity.id
+        where record.bus_no = #{busNo}
+        and record.item_category_enum = #{categoryEnum}
+        <if test="statusEnum != null">
+            and record.status_enum = #{statusEnum}
+        </if>
+        group by activity.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no
+    </select>
+
+    <select id="searchActivityChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select activity.name as itemName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join wor_activity_definition activity on record.item_id = activity.id
+        where record.item_id = #{itemId}
+        and record.item_category_enum = #{categoryEnum}
+        and record.status_enum = #{statusEnum}
+        group by activity.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no
+    </select>
+
+    <select id="searchHealthChangePriceByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select hearlth.name as itemName,
+        org.name as orgName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join adm_healthcare_service hearlth on record.item_id = hearlth.id
+        left join adm_organization org on hearlth.offered_org_id = org.id
+        where record.bus_no = #{busNo}
+        and record.item_category_enum = #{categoryEnum}
+        <if test="statusEnum != null">
+            and record.status_enum = #{statusEnum}
+        </if>
+        group by hearlth.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no, org.name
+    </select>
+
+    <select id="searchHealthChangePriceByItemId" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select hearlth.name as itemName,
+        org.name as orgName,
+        record.origin_buying_price as originBuyingPrice,
+        record.new_buying_price as newBuyingPrice,
+        record.origin_retail_price as originRetailPrice,
+        record.new_retail_price as newRetailPrice,
+        record.reason as reason,
+        record.bus_no as busNo,
+        sum(record.item_quantity) as itemQuantity,
+        sum(record.difference_buying_price) as differenceBuyingPrice,
+        sum(record.difference_retail_price) as differenceRetailPrice
+        from adm_change_price_record record
+        left join adm_healthcare_service hearlth on record.item_id = hearlth.id
+        left join adm_organization org on hearlth.offered_org_id = org.id
+        where record.item_id = #{itemId}
+        and record.item_category_enum = #{categoryEnum}
+        and record.status_enum = #{statusEnum}
+        group by hearlth.name, record.origin_buying_price, record.new_buying_price, record.origin_retail_price,
+        record.new_retail_price, record.reason, record.bus_no, org.name
+    </select>
+
+    <select id="searchChangePriceRecordDataByBusNo" resultType="com.openhis.administration.dto.ChangePriceDataDto">
+        select record.origin_buying_price as originBuyingPrice,
+               record.new_buying_price    as newBuyingPrice,
+               record.origin_retail_price as originRetailPrice,
+               record.new_retail_price    as newRetailPrice,
+               record.reason              as reason,
+               record.bus_no              as busNo,
+               cid.id                     as chargeId,
+               record.id                  as changePriceRecordId,
+               record.lot_number          as lotNumber
+        from adm_change_price_record record
+                 left join adm_charge_item_definition cid on record.item_id = cid.instance_id
+        where record.bus_no = #{busNo}
+          and record.status_enum = #{statusEnum}
+          and cid.status_enum = 2
+    </select>
+
+    <select id="searchChangePriceDataGroupByBusNo" resultType="com.openhis.administration.domain.ChangePriceRecord">
+        select
+            bus_no as busNo,applicant_time as applicantTime,status_enum as statusEnum,item_id as itemId
+        from adm_change_price_record where bus_no = #{busNo} group by busNo,applicantTime,statusEnum,item_id
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
new file mode 100644
index 00000000..5869030b
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefDetailAppMapper.xml
@@ -0,0 +1,14 @@
+<?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.ChargeItemDefDetailAppMapper">
+
+    <select id="searchChargeDetailDataByBusNo" resultType="com.openhis.administration.domain.ChargeItemDefDetail">
+        select create_time
+        from adm_charge_item_def_detail
+        where
+            condition_value = #{value} and condition_code = #{code} and (delete_flag = '0' or delete_flag = '1')
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
index 5c112cff..0c21cc61 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefinitionMapper.xml
@@ -4,4 +4,35 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.ChargeItemDefinitionMapper">
 
+    <select id="getMedPriceByParam" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
+        SELECT cidd.amount as price, mmd.part_percent as partPercent
+        from adm_charge_item_definition cid
+                 left join adm_charge_item_def_detail cidd on cid.id = cidd.definition_id
+                 left join med_medication_definition mmd on cid.instance_id = mmd.id
+        where cidd.condition_code = #{conditionCode}
+          and cid.instance_id = #{instanceId}
+          and cidd.delete_flag = '0'
+        order by cidd.create_time desc limit 1
+    </select>
+
+    <select id="getDevicePriceByParam" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
+        SELECT cidd.amount as price, device.part_percent as partPercent
+        from adm_charge_item_definition cid
+                 left join adm_charge_item_def_detail cidd on cid.id = cidd.definition_id
+                 left join adm_device_definition device on cid.instance_id = device.id
+        where cidd.condition_code = #{conditionCode}
+          and cid.instance_id = #{instanceId}
+          and cidd.delete_flag = '0'
+        order by cidd.create_time desc limit 1
+    </select>
+
+    <select id="getProductPrice" resultType="com.openhis.administration.dto.ChargeItemDefDetailPriceDto">
+        SELECT cid.price as price
+        from adm_charge_item_definition cid
+        where cid.instance_id = #{instanceId}
+          and cid.status_enum = #{statusEnum}
+          and cid.delete_flag = '0'
+        order by cid.create_time desc limit 1
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
index 09fcdd06..1aed4f8a 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/DeviceDefinitionMapper.xml
@@ -4,4 +4,30 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.DeviceDefinitionMapper">
 
+    <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
+    <select id="searchDeviceListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        select df.id as targetId, df.name as name, df.size as volume, details.amount as
+        originRetailPrice,def_details.amount as originBuyingPrice,df.bus_no as busNo,df.min_unit_code as unitCode
+        from adm_device_definition df
+        inner join adm_charge_item_definition actd on actd.instance_id = df.id
+        left join adm_charge_item_def_detail details on actd.id = details.definition_id
+        and details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
+        cidd.condition_code = '5' and cidd.delete_flag = '0' ORDER BY create_time DESC
+        LIMIT 1)
+        left join adm_charge_item_def_detail def_details on actd.id = def_details.definition_id
+        and def_details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
+        cidd.condition_code = '1' and cidd.delete_flag = '0' ORDER BY create_time DESC
+        LIMIT 1)
+        WHERE 1 = 1 and df.id in (select inventoty.item_id FROM wor_inventory_item inventoty where
+        inventoty.quantity > 0 and inventoty.delete_flag = '0' )
+        <if test="keyWord == ''">
+            limit 10
+        </if>
+        <if test="keyWord !=''">
+            and
+            (df.name like concat('%',#{keyWord},'%') or df.py_str like concat('%',#{keyWord},'%') or df.wb_str like
+            concat('%',#{keyWord},'%'))
+        </if>
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
index c174a7e8..789f4791 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterLocationMapper.xml
@@ -4,4 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.EncounterLocationMapper">
 
+    <select id="searchEncounterDataByLocationId" resultType="com.openhis.administration.dto.PatientBedInfoDto">
+        select encounter_id as encounterId , location_id as bedLocationId
+        from adm_encounter_location where location_id = #{locationId} and status_enum = #{statusEnum} and form_enum = #{formEnum}
+    </select>
+
 </mapper>
\ No newline at end of file
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
index 2f2c2389..73972682 100644
--- 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
@@ -49,4 +49,17 @@
           AND T1.create_time &lt;
               #{endDate};
     </select>
+
+    <select id="searchEncounterDataByIds" resultType="com.openhis.administration.dto.EncounterDataDto">
+        select * from adm_encounter
+         where  (class_enum = #{imp} or class_enum = #{amb}) and status_enum = #{encounterStatus}
+            and id in
+        <foreach collection="encounterIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <select id="getPatientIdByParam" resultType="com.openhis.administration.dto.EncounterDataDto">
+        select patient_id as patientId,id as encounterId
+               from adm_encounter encounter where id = #{encounterId} and class_enum = #{classEnum}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
index 5e6d647c..b31d5889 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/HealthcareServiceMapper.xml
@@ -4,4 +4,24 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.HealthcareServiceMapper">
 
+    <select id="searchHealthByIds" resultType="com.openhis.administration.dto.HealthcareDto">
+        <!-- 根据项目id数组 加载挂号集合 -->
+        SELECT
+        health.id as itemId,
+        health.offered_org_id as orgId,health.name as name,health.category_code as categoryCode,health.type_code as
+        typeCode
+        FROM adm_healthcare_service as health
+        WHERE health.ID IN
+        <foreach collection="itemIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <!-- 查询所有 挂号数据 -->
+    <select id="searchAllHeathData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT heal.id AS targetId,heal.name AS name,cid.price AS originRetailPrice,org.name as orgName
+        FROM public.adm_healthcare_service heal
+                 INNER JOIN adm_charge_item_definition cid ON heal.id = cid.instance_id
+                 INNER JOIN adm_organization org ON heal.offered_org_id = org.id
+        WHERE heal.delete_flag = '0' AND heal.offered_org_id = #{orgId} AND cid.status_enum = #{statusEnum}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
index 54dbe4bf..03c455f8 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
@@ -4,4 +4,35 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.LocationMapper">
 
+    <!-- 根据区域id数组查询 区域表 -->
+    <select id="searchLocationDataByIds" resultType="com.openhis.administration.dto.LocationDataDto">
+        select id               as locationId,
+               bus_no           as busNo,
+               name             as areaName,
+               status_enum      as statusEnum,
+               mode_enum        as modeEnum,
+               operational_enum as operationalEnum
+        from adm_location
+        where delete_flag = '0'
+          and id in
+        <foreach collection="locationIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <!-- 根据区域id数组查询 区域表 -->
+    <select id="searchLocationDataByBusNo" resultType="com.openhis.administration.dto.PatientBedInfoDto">
+        select id        as bedLocationId,
+        bus_no           as busNo,
+        name             as bedName,
+        status_enum      as statusEnum,
+        mode_enum        as modeEnum,
+        operational_enum as operationalEnum
+        from adm_location
+        where delete_flag = '0'
+           and bus_no like concat (#{busNo}, '%') and form_enum = #{formEnum} and status_enum = #{statusEnum}
+    </select>
+
+
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
index 8b78f76f..658afa70 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/OrganizationMapper.xml
@@ -3,6 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.OrganizationMapper">
+<<<<<<< HEAD
     
     <!-- 自定义selectById方法，确保包含所有字段，包括新增字段 -->
     <select id="selectById" parameterType="java.lang.Long" resultType="com.openhis.administration.domain.Organization">
@@ -14,4 +15,17 @@
         FROM adm_organization 
         WHERE id = #{id} AND delete_flag = '0'
     </select>
+=======
+
+    <select id="searchOrgDataByHealth" resultType="com.openhis.administration.dto.OrgDataDto">
+        SELECT org.id AS orgId, org.name AS orgName
+        FROM adm_organization AS org
+        WHERE id IN
+              (SELECT offered_org_id
+               FROM adm_healthcare_service heal
+               WHERE heal.delete_flag = '0'
+               GROUP BY heal.offered_org_id)
+    </select>
+
+>>>>>>> upstream/develop
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
index 5c33d9d6..ef6fec89 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientMapper.xml
@@ -4,4 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.PatientMapper">
 
+    <select id="searchPatientDataByPatientId" resultType="com.openhis.administration.dto.PatientDataDto">
+        select id as patientId,name as patientName,gender_enum as gender,id_card as idCard from adm_patient
+            where delete_flag = '0' and id = #{patientId} and active_flag = #{activeFlag}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
similarity index 69%
rename from openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml
rename to openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml
index 217b4b4d..ef22ba84 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemDefAppMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.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.ChargeItemDefAppMapper">
+<mapper namespace="com.openhis.administration.mapper.PatientStudentMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
index befdd602..928b61a0 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PractitionerRoleMapper.xml
@@ -3,5 +3,51 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.PractitionerRoleMapper">
+    <!-- 根据员工ID 查询权限数据集 -->
+    <select id="searchPractitionerRoleByPractitionerId" resultType="com.openhis.administration.dto.RoleDataDto">
+        select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
+        typeCode
+        from adm_practitioner_role
+        where delete_flag = '0'
+        <if test="practitionerId != null and practitionerId!= ''">
+            and practitioner_id = #{practitionerId}
+        </if>
+        <if test="roleCode != null and roleCode!= ''">
+            and role_code = #{roleCode}
+        </if>
+        and location_id is not null order by id desc
+    </select>
+
+    <!-- 根据员工ID数组 查询权限数据集 -->
+    <select id="searchPractitionerRoleByPractitionerIds" resultType="com.openhis.administration.dto.RoleDataDto">
+        select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
+        typeCode
+        from adm_practitioner_role
+        where delete_flag = '0'
+        <if test="practitionerId != null and practitionerId!= ''">
+            and practitioner_id in
+            <foreach collection="practitionerIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="roleCode != null and roleCode!= ''">
+            and role_code = #{roleCode}
+        </if>
+        and location_id is not null order by id desc
+    </select>
+
+    <!-- 根据员工ID 查询位置ID数组 -->
+    <select id="searchPractitionerRoleLocationIds" resultType="java.lang.Long">
+        select location_id as locationId
+        from adm_practitioner_role
+        where delete_flag = '0'
+        <if test="practitionerId != null and practitionerId!= ''">
+            and practitioner_id = #{practitionerId}
+        </if>
+        <if test="roleCode != null and roleCode!= ''">
+            and role_code = #{roleCode}
+        </if>
+        and location_id is not null order by id desc
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
new file mode 100644
index 00000000..eed9436d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/ConditionNoDefinitionMapper.xml
@@ -0,0 +1,8 @@
+<?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.clinical.mapper.ConditionNoDefinitionMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.xml
new file mode 100644
index 00000000..85559802
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/DocInventoryItemStaticMapper.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.document.mapper.DocInventoryItemStaticMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.xml
new file mode 100644
index 00000000..bc39dd08
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/document/VitalSignsMapper.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.document.mapper.VitalSignsMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
new file mode 100644
index 00000000..b066c855
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/financial/ThreePartPayCallBackMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.openhis.financial.mapper.ThreePartPayCallBackMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
index 285c9a75..e5b8b8c2 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
@@ -42,4 +42,33 @@
                            ON T1.medication_product_id = T2.id
         WHERE T1.delete_flag = 0
     </select>
+    <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
+    <select id="searchMedListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        select med.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
+        originRetailPrice,def_details.amount as originBuyingPrice,med_def.bus_no as busNo,med_def.min_unit_code as unitCode
+        from med_medication med
+        inner join med_medication_definition med_def on med.medication_def_id = med_def.id
+        inner join adm_charge_item_definition actd on actd.instance_id = med_def.id
+        left join adm_charge_item_def_detail details on actd.id = details.definition_id
+        and details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
+        cidd.condition_code = '5' and cidd.delete_flag = '0' ORDER BY create_time DESC
+        LIMIT 1)
+        left join adm_charge_item_def_detail def_details on actd.id = def_details.definition_id
+        and def_details.id = (select cidd.id from adm_charge_item_def_detail cidd where actd.id = cidd.definition_id and
+        cidd.condition_code = '1' and cidd.delete_flag = '0' ORDER BY create_time DESC
+        LIMIT 1)
+        WHERE med.delete_flag = '0'  and med_def.id in (select inventoty.item_id FROM wor_inventory_item inventoty where
+        inventoty.quantity > 0 and inventoty.delete_flag = '0' )
+        <if test="keyWord == ''">
+            limit 10
+        </if>
+        <if test="keyWord !=''">
+            and
+            (med_def.name like concat('%',#{keyWord},'%') or med_def.merchandise_name like concat('%',#{keyWord},'%') or
+            med_def.py_str like concat('%',#{keyWord},'%') or
+            med_def.wb_str like concat('%',#{keyWord},'%') or med_def.merchandise_py_str like concat('%',#{keyWord},'%')
+            or med_def.merchandise_wb_str like concat('%',#{keyWord},'%'))
+        </if>
+
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.xml
new file mode 100644
index 00000000..8bafb97d
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioApplicationMapper.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.nenu.mapper.GfRatioApplicationMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.xml
new file mode 100644
index 00000000..b70348e5
--- /dev/null
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/nenu/GfRatioMapper.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.nenu.mapper.GfRatioMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
index 586740dc..76da7f77 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
@@ -12,4 +12,22 @@
           AND NAME = #{activityName} LIMIT 1
     </select>
 
+    <!-- 根据项目id数组 加载诊疗集合 -->
+    <select id="searchActivityDefinitionByIds" resultType="com.openhis.workflow.dto.ActivityDto">
+        SELECT id as itemId, bus_no as busNo, name as name
+        FROM wor_activity_definition
+        WHERE id IN
+        <foreach collection="itemIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
+    <select id="searchActivityListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT cid.price AS originRetailPrice, ad.id AS targetId, ad.bus_no AS busNo, ad.name AS name
+        FROM wor_activity_definition ad
+                 inner join adm_charge_item_definition cid on ad.id = cid.instance_id
+        WHERE ad.delete_flag = '0'
+          AND (name LIKE concat('%', #{keyWord}, '%') or py_str LIKE concat('%', #{keyWord}, '%') or
+               wb_str LIKE concat('%', #{keyWord}, '%'))
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
index 39dafc5d..c1b46cdc 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/InventoryItemMapper.xml
@@ -3,5 +3,29 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.workflow.mapper.InventoryItemMapper">
+    <!-- 根据药品、耗材ID数组查询 存库大于 零 并且分组的集合数据 -->
+    <select id="searchResultDataList" resultType="com.openhis.workflow.dto.AdjustPriceDto">
+        SELECT item_id as itemId, item_table as itemTable ,location_id as locationId,quantity as totalCount,lot_number as
+        lotNumber,unit_code as unitCode
+        FROM wor_inventory_item
+        WHERE
+        quantity > 0 AND delete_flag = '0' AND
+        item_id IN
+        <foreach collection="itemIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 
+    <!-- 根据药品、耗材ID数组查询 存库大于 零 并且分组的集合数据 -->
+    <select id="searchResultDataListByGroup" resultType="com.openhis.workflow.dto.AdjustPriceDto">
+        SELECT item_id as itemId
+        FROM wor_inventory_item
+        WHERE
+        quantity > 0 AND delete_flag = '0' AND
+        item_id IN
+        <foreach collection="itemIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        GROUP BY item_id
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
index fc4d2278..c37e6594 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/SupplyRequestMapper.xml
@@ -3,5 +3,215 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.workflow.mapper.SupplyRequestMapper">
+    <!-- 根据 调价单号 查询 supplyrequest 和 价格主表 -->
+    <select id="searchDataForBusNo" resultType="com.openhis.workflow.dto.ChangePriceDto">
+        SELECT acid.id           as chargeId,
+               wsr.item_id       as itemId,
+               wsr.price         as newPrice,
+               wsr.retail_price  as retailPrice,
+               wsr.reason        as reason,
+               wsr.item_quantity as quantity,
+               wsr.id            as supplyRequestId
+        FROM wor_supply_request wsr
+                 INNER JOIN adm_charge_item_definition acid ON wsr.item_id = acid.instance_id
+        WHERE wsr.bus_no = #{busNo}
+    </select>
+    <select id="searchGroupDataForBusNo" resultType="com.openhis.workflow.dto.ChangePriceDto">
+        SELECT wsr.item_id as itemId, wsr.item_table as itemTable, wsr.retail_price as newPrice
+        FROM wor_supply_request wsr
+        WHERE wsr.bus_no = #{busNo}
+        GROUP BY wsr.item_id, wsr.item_table, wsr.retail_price
+    </select>
+    <!-- 根据调价单号 查询未审核的详情-->
+    <select id="searchMedInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.item_id            as targetId,
+               med_def.name          as name,
+               med.total_volume      as volume,
+               sr.price              as newBuyingPrice,
+               sr.retail_price       as newRetailPrice,
+               details.amount        as originRetailPrice,
+               sr.reason             as reason,
+               def_details.amount    as originBuyingPrice,
+               sr.unit_code          as unitCode,
+               sum(sr.item_quantity) as totalQuantity
+        FROM wor_supply_request sr
+                 LEFT JOIN med_medication_definition med_def ON sr.item_id = med_def.id
+                 LEFT JOIN med_medication med ON sr.item_id = med.id
+                 LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = med_def.id
+                 LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
+            AND details.id = (SELECT cidd.id
+                              FROM adm_charge_item_def_detail cidd
+                              WHERE actd.id = cidd.definition_id
+                                AND cidd.condition_code = '5'
+                                AND cidd.delete_flag = '0'
+                              ORDER BY create_time DESC
+            LIMIT 1)
+            LEFT JOIN adm_charge_item_def_detail def_details
+        ON actd.id = def_details.definition_id
+            AND def_details.id = (SELECT cidd.id
+            FROM adm_charge_item_def_detail cidd
+            WHERE actd.id = cidd.definition_id
+            AND cidd.condition_code = '1'
+            AND cidd.delete_flag = '0'
+            ORDER BY create_time DESC
+            LIMIT 1)
+        WHERE sr.bus_no = #{busNo}
+        GROUP BY sr.item_id, med_def.name, med.total_volume, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount, sr.unit_code
+    </select>
+
+    <!-- 根据调价单号 查询已经审核过的详情-->
+    <select id="searchHistoryMedInfoData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.item_id         as targetId,
+               med_def.name       as name,
+               med.total_volume   as volume,
+               sr.price           as newBuyingPrice,
+               sr.retail_price    as newRetailPrice,
+               details.amount     as originRetailPrice,
+               def_details.amount as originBuyingPrice,
+               sr.reason          as reason,
+               sr.unit_code       as unitCode,
+               sum(item_quantity) as totalQuantity
+        FROM wor_supply_request sr
+                 LEFT JOIN med_medication_definition med_def ON sr.item_id = med_def.id
+                 LEFT JOIN med_medication med ON sr.item_id = med.id
+                 LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = med_def.id
+                 LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
+            AND details.id = (SELECT cidd.id
+                              FROM adm_charge_item_def_detail cidd
+                              WHERE actd.id = cidd.definition_id
+                                AND cidd.condition_code = '5'
+                                AND cidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
+            LEFT JOIN adm_charge_item_def_detail def_details
+        ON actd.id = def_details.definition_id
+            AND def_details.id = (SELECT acidd.id
+            FROM adm_charge_item_def_detail acidd
+            WHERE actd.id = acidd.definition_id
+            AND acidd.condition_code = '1'
+            AND acidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
+        WHERE sr.bus_no = #{busNo}
+        GROUP BY sr.item_id, med_def.name, med.total_volume, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount, sr.unit_code
+    </select>
+
+    <!-- 查询device -->
+    <select id="searchDeviceInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.item_id         as targetId,
+               ad.name            as name,
+               ad.size            as volume,
+               sr.price           as newBuyingPrice,
+               sr.retail_price    as newRetailPrice,
+               details.amount     as originRetailPrice,
+               sr.reason          as reason,
+               def_details.amount as originBuyingPrice
+        FROM wor_supply_request sr
+                 LEFT JOIN adm_device_definition ad on sr.item_id = ad.id
+                 LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = ad.id
+                 LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
+            AND details.id = (SELECT cidd.id
+                              FROM adm_charge_item_def_detail cidd
+                              WHERE actd.id = cidd.definition_id
+                                AND cidd.condition_code = '5'
+                                AND cidd.delete_flag = '0'
+                              ORDER BY create_time DESC
+            LIMIT 1)
+            LEFT JOIN adm_charge_item_def_detail def_details
+        ON actd.id = def_details.definition_id
+            AND def_details.id = (SELECT cidd.id
+            FROM adm_charge_item_def_detail cidd
+            WHERE actd.id = cidd.definition_id
+            AND cidd.condition_code = '1'
+            AND cidd.delete_flag = '0'
+            ORDER BY create_time DESC
+            LIMIT 1)
+        WHERE sr.bus_no = #{busNo}
+        GROUP BY sr.item_id, ad.name, ad.size, sr.price, details.amount, sr.reason, sr.retail_price, def_details.amount
+    </select>
+    <!-- 查询device 历史记录-->
+    <select id="searchHistoryDeviceInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.item_id         as targetId,
+               ad.name            as name,
+               ad.size            as volume,
+               sr.price           as newBuyingPrice,
+               sr.retail_price    as newRetailPrice,
+               details.amount     as originRetailPrice,
+               def_details.amount as originBuyingPrice,
+               sr.reason          as reason,
+               sr.unit_code       as unitCode,
+               sum(item_quantity) as totalQuantity
+        FROM wor_supply_request sr
+                 LEFT JOIN adm_device_definition ad on sr.item_id = ad.id
+                 LEFT JOIN adm_charge_item_definition actd ON actd.instance_id = ad.id
+                 LEFT JOIN adm_charge_item_def_detail details ON actd.id = details.definition_id
+            AND details.id = (SELECT cidd.id
+                              FROM adm_charge_item_def_detail cidd
+                              WHERE actd.id = cidd.definition_id
+                                AND cidd.condition_code = '5'
+                                AND cidd.delete_flag = '0'
+                                AND cidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
+            LEFT JOIN adm_charge_item_def_detail def_details
+        ON actd.id = def_details.definition_id
+            AND def_details.id = (SELECT acidd.id
+            FROM adm_charge_item_def_detail acidd
+            WHERE actd.id = acidd.definition_id
+            AND acidd.condition_code = '1'
+            AND acidd.delete_flag = '0'
+            AND acidd.create_time <![CDATA[ < ]]> #{createTime} LIMIT 1)
+        WHERE sr.bus_no = #{busNo}
+        GROUP BY sr.item_id, ad.name, ad.size, sr.price, details.amount, sr.reason, def_details.amount, sr.unit_code, sr.retail_price
+    </select>
+
+    <select id="searchActivityInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.id          as targetId,
+               ad.name        as name,
+               sr.retal_price as newRetailPrice,
+               cid.price      as originBuyingPrice,
+               sr.reason      as reason
+        FROM wor_supply_request sr
+                 LEFT JOIN wor_activity_definition ad ON sr.item_id = ad.id
+                 LEFT JOIN adm_charge_item_definition cid on ad.id = cid.instance_id
+        WHERE ad.delete_flag = '0'
+          AND sr.bus_no = #{busNo}
+    </select>
+
+    <select id="searchHistoryActivityInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.id          as targetId,
+               ad.name        as name,
+               sr.price       as originBuyingPrice,
+               sr.retal_price as newRetailPrice,
+               sr.reason      as reason
+        FROM wor_supply_request sr
+                 LEFT JOIN wor_activity_definition ad ON sr.item_id = ad.id
+                 LEFT JOIN adm_charge_item_definition cid on ad.id = cid.instance_id
+        WHERE ad.delete_flag = '0'
+          AND sr.bus_no = #{busNo}
+    </select>
+
+    <select id="searchHealthInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.id           as targetId,
+               heal.name       as name,
+               sr.retail_price as newRetailPrice,
+               cid.price       as originBuyingPrice,
+               sr.reason       as reason,
+               org.name        as orgName
+        FROM wor_supply_request sr
+                 LEFT JOIN adm_healthcare_service heal ON sr.item_id = heal.id
+                 LEFT JOIN adm_organization org ON heal.offered_org_id = org.id
+                 LEFT JOIN adm_charge_item_definition cid on heal.id = cid.instance_id
+        WHERE heal.delete_flag = '0'
+          AND sr.bus_no = #{busNo}
+    </select>
+    <select id="searchHistoryHealthInfoDataForBusNo" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT sr.id           as targetId,
+               heal.name       as name,
+               sr.price        as originBuyingPrice,
+               sr.retail_price as newRetailPrice,
+               sr.reason       as reason,
+               org.name        as orgName
+        FROM wor_supply_request sr
+                 LEFT JOIN adm_healthcare_service heal ON sr.item_id = heal.id
+                 LEFT JOIN adm_organization org ON heal.offered_org_id = org.id
+                 LEFT JOIN adm_charge_item_definition cid on heal.id = cid.instance_id
+        WHERE heal.delete_flag = '0'
+          AND sr.bus_no = #{busNo}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml
index 2815c022..a9bb21f4 100644
--- a/openhis-server-new/pom.xml
+++ b/openhis-server-new/pom.xml
@@ -332,6 +332,7 @@
     </dependencyManagement>
 
     <modules>
+        <module>openhis-miniapp</module>
         <module>openhis-application</module>
         <module>openhis-domain</module>
         <module>openhis-common</module>
diff --git a/openhis-ui-vue3/.env.dev b/openhis-ui-vue3/.env.dev
index 681c2ba8..e0f1251a 100644
--- a/openhis-ui-vue3/.env.dev
+++ b/openhis-ui-vue3/.env.dev
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 医院信息管理系统
+VITE_APP_TITLE =医院信息管理系统
 
 # 开发环境配置
 VITE_APP_ENV = 'dev'
diff --git a/openhis-ui-vue3/index.html b/openhis-ui-vue3/index.html
index 4406ebfd..56609485 100644
--- a/openhis-ui-vue3/index.html
+++ b/openhis-ui-vue3/index.html
@@ -9,7 +9,8 @@
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
     <!-- <link rel="icon" href="src/assets/images/ccu.png" /> -->
-    <link rel="stylesheet" type="text/css" media="print" href="/print-lock.css">
+    <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>
diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json
index ad03573e..a51c0a79 100644
--- a/openhis-ui-vue3/package-lock.json
+++ b/openhis-ui-vue3/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "openhis",
   "version": "3.8.7",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
@@ -54,6 +54,7 @@
       "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.10.tgz",
       "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
@@ -62,6 +63,7 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.27.1.tgz",
       "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
@@ -71,15 +73,11 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/code-frame/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/@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==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -88,16 +86,18 @@
       "version": "7.27.1",
       "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
       "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.10.tgz",
-      "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.28.4.tgz",
+      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.10"
+        "@babel/types": "^7.28.4"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -107,20 +107,22 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.27.1.tgz",
-      "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.28.4.tgz",
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.26.10.tgz",
-      "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.28.4.tgz",
+      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -130,6 +132,7 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz",
       "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==",
+      "license": "MIT",
       "peerDependencies": {
         "jquery": ">= 1.7.x"
       }
@@ -138,6 +141,7 @@
       "version": "3.6.1",
       "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
       "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -146,6 +150,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
       "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==",
+      "license": "MIT",
       "peerDependencies": {
         "vue": "^3.2.0"
       }
@@ -158,6 +163,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "aix"
@@ -174,6 +180,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -190,6 +197,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -206,6 +214,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -222,6 +231,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -238,6 +248,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -254,6 +265,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -270,6 +282,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -286,6 +299,7 @@
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -302,6 +316,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -318,6 +333,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -334,6 +350,7 @@
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -350,6 +367,7 @@
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -366,6 +384,7 @@
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -382,6 +401,7 @@
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -398,6 +418,7 @@
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -414,6 +435,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -430,6 +452,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -446,6 +469,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -462,6 +486,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -478,6 +503,7 @@
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -494,6 +520,7 @@
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -510,6 +537,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -519,31 +547,35 @@
       }
     },
     "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==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.7.3.tgz",
+      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "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==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.7.4.tgz",
+      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/core": "^1.7.3",
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "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=="
+      "version": "0.2.10",
+      "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.10.tgz",
+      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
+      "license": "MIT"
     },
     "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=="
+      "version": "1.5.5",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "license": "MIT"
     },
     "node_modules/@kurkle/color": {
       "version": "0.3.4",
@@ -555,6 +587,7 @@
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -568,6 +601,7 @@
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -577,6 +611,7 @@
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -590,6 +625,7 @@
       "version": "2.11.7",
       "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
       "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==",
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -598,13 +634,15 @@
     "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=="
+      "integrity": "sha512-KZ3NyM8HsaBVcn5BRhWaOeZRhqEvm18PfB6HfRDuZfwwWhJLoTxB81mTENrBlONr2g8fy/fSbjsh44gvOj+/Lw==",
+      "license": "MIT"
     },
     "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==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -623,10 +661,11 @@
       }
     },
     "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==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -635,247 +674,308 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.35.0.tgz",
-      "integrity": "sha512-uYQ2WfPaqz5QtVgMxfN6NpLD+no0MYHDBywl7itPYd3K5TjjSghNKmX8ic9S8NU8w81NVhJv/XojcHptRly7qQ==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.4.tgz",
+      "integrity": "sha512-BTm2qKNnWIQ5auf4deoetINJm2JzvihvGb9R6K/ETwKLql/Bb3Eg2H1FBp1gUb4YGbydMA3jcmQTR73q7J+GAA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.35.0.tgz",
-      "integrity": "sha512-FtKddj9XZudurLhdJnBl9fl6BwCJ3ky8riCXjEw3/UIbjmIY58ppWwPEvU3fNu+W7FUsAsB1CdH+7EQE6CXAPA==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.4.tgz",
+      "integrity": "sha512-P9LDQiC5vpgGFgz7GSM6dKPCiqR3XYN1WwJKA4/BUVDjHpYsf3iBEmVz62uyq20NGYbiGPR5cNHI7T1HqxNs2w==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.35.0.tgz",
-      "integrity": "sha512-Uk+GjOJR6CY844/q6r5DR/6lkPFOw0hjfOIzVx22THJXMxktXG6CbejseJFznU8vHcEBLpiXKY3/6xc+cBm65Q==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.4.tgz",
+      "integrity": "sha512-QRWSW+bVccAvZF6cbNZBJwAehmvG9NwfWHwMy4GbWi/BQIA/laTIktebT2ipVjNncqE6GLPxOok5hsECgAxGZg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.35.0.tgz",
-      "integrity": "sha512-3IrHjfAS6Vkp+5bISNQnPogRAW5GAV1n+bNCrDwXmfMHbPl5EhTmWtfmwlJxFRUCBZ+tZ/OxDyU08aF6NI/N5Q==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.4.tgz",
+      "integrity": "sha512-hZgP05pResAkRJxL1b+7yxCnXPGsXU0fG9Yfd6dUaoGk+FhdPKCJ5L1Sumyxn8kvw8Qi5PvQ8ulenUbRjzeCTw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.35.0.tgz",
-      "integrity": "sha512-sxjoD/6F9cDLSELuLNnY0fOrM9WA0KrM0vWm57XhrIMf5FGiN8D0l7fn+bpUeBSU7dCgPV2oX4zHAsAXyHFGcQ==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.4.tgz",
+      "integrity": "sha512-xmc30VshuBNUd58Xk4TKAEcRZHaXlV+tCxIXELiE9sQuK3kG8ZFgSPi57UBJt8/ogfhAF5Oz4ZSUBN77weM+mQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.35.0.tgz",
-      "integrity": "sha512-2mpHCeRuD1u/2kruUiHSsnjWtHjqVbzhBkNVQ1aVD63CcexKVcQGwJ2g5VphOd84GvxfSvnnlEyBtQCE5hxVVw==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.4.tgz",
+      "integrity": "sha512-WdSLpZFjOEqNZGmHflxyifolwAiZmDQzuOzIq9L27ButpCVpD7KzTRtEG1I0wMPFyiyUdOO+4t8GvrnBLQSwpw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.35.0.tgz",
-      "integrity": "sha512-mrA0v3QMy6ZSvEuLs0dMxcO2LnaCONs1Z73GUDBHWbY8tFFocM6yl7YyMu7rz4zS81NDSqhrUuolyZXGi8TEqg==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.4.tgz",
+      "integrity": "sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.35.0.tgz",
-      "integrity": "sha512-DnYhhzcvTAKNexIql8pFajr0PiDGrIsBYPRvCKlA5ixSS3uwo/CWNZxB09jhIapEIg945KOzcYEAGGSmTSpk7A==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.4.tgz",
+      "integrity": "sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.35.0.tgz",
-      "integrity": "sha512-uagpnH2M2g2b5iLsCTZ35CL1FgyuzzJQ8L9VtlJ+FckBXroTwNOaD0z0/UF+k5K3aNQjbm8LIVpxykUOQt1m/A==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.4.tgz",
+      "integrity": "sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.35.0.tgz",
-      "integrity": "sha512-XQxVOCd6VJeHQA/7YcqyV0/88N6ysSVzRjJ9I9UA/xXpEsjvAgDTgH3wQYz5bmr7SPtVK2TsP2fQ2N9L4ukoUg==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.4.tgz",
+      "integrity": "sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.35.0.tgz",
-      "integrity": "sha512-5pMT5PzfgwcXEwOaSrqVsz/LvjDZt+vQ8RT/70yhPU06PTuq8WaHhfT1LW+cdD7mW6i/J5/XIkX/1tCAkh1W6g==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.4.tgz",
+      "integrity": "sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.35.0.tgz",
-      "integrity": "sha512-c+zkcvbhbXF98f4CtEIP1EBA/lCic5xB0lToneZYvMeKu5Kamq3O8gqrxiYYLzlZH6E3Aq+TSW86E4ay8iD8EA==",
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.4.tgz",
+      "integrity": "sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.35.0.tgz",
-      "integrity": "sha512-s91fuAHdOwH/Tad2tzTtPX7UZyytHIRR6V4+2IGlV0Cej5rkG0R61SX4l4y9sh0JBibMiploZx3oHKPnQBKe4g==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.4.tgz",
+      "integrity": "sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.4.tgz",
+      "integrity": "sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.35.0.tgz",
-      "integrity": "sha512-hQRkPQPLYJZYGP+Hj4fR9dDBMIM7zrzJDWFEMPdTnTy95Ljnv0/4w/ixFw3pTBMEuuEuoqtBINYND4M7ujcuQw==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.4.tgz",
+      "integrity": "sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.35.0.tgz",
-      "integrity": "sha512-Pim1T8rXOri+0HmV4CdKSGrqcBWX0d1HoPnQ0uw0bdp1aP5SdQVNBy8LjYncvnLgu3fnnCt17xjWGd4cqh8/hA==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.4.tgz",
+      "integrity": "sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.35.0.tgz",
-      "integrity": "sha512-QysqXzYiDvQWfUiTm8XmJNO2zm9yC9P/2Gkrwg2dH9cxotQzunBHYr6jk4SujCTqnfGxduOmQcI7c2ryuW8XVg==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.4.tgz",
+      "integrity": "sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.35.0.tgz",
-      "integrity": "sha512-OUOlGqPkVJCdJETKOCEf1mw848ZyJ5w50/rZ/3IBQVdLfR5jk/6Sr5m3iO2tdPgwo0x7VcncYuOvMhBWZq8ayg==",
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.4.tgz",
+      "integrity": "sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.4.tgz",
+      "integrity": "sha512-8GKr640PdFNXwzIE0IrkMWUNUomILLkfeHjXBi/nUvFlpZP+FA8BKGKpacjW6OUUHaNI6sUURxR2U2g78FOHWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.35.0.tgz",
-      "integrity": "sha512-2/lsgejMrtwQe44glq7AFFHLfJBPafpsTa6JvP2NGef/ifOa4KBoglVf7AKN7EV9o32evBPRqfg96fEHzWo5kw==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.4.tgz",
+      "integrity": "sha512-AIy/jdJ7WtJ/F6EcfOb2GjR9UweO0n43jNObQMb6oGxkYTfLcnN7vYYpG+CN3lLxrQkzWnMOoNSHTW54pgbVxw==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.4.tgz",
+      "integrity": "sha512-UF9KfsH9yEam0UjTwAgdK0anlQ7c8/pWPU2yVjyWcF1I1thABt6WXE47cI71pGiZ8wGvxohBoLnxM04L/wj8mQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.35.0.tgz",
-      "integrity": "sha512-PIQeY5XDkrOysbQblSW7v3l1MDZzkTEzAfTPkj5VAu3FW8fS4ynyLg2sINp0fp3SjZ8xkRYpLqoKcYqAkhU1dw==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.4.tgz",
+      "integrity": "sha512-bf9PtUa0u8IXDVxzRToFQKsNCRz9qLYfR/MpECxl4mRoWYjAeFjgxj1XdZr2M/GNVpT05p+LgQOHopYDlUu6/w==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -884,62 +984,75 @@
     "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=="
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "license": "MIT"
     },
     "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,
+      "license": "ISC",
       "engines": {
         "node": ">=10.13.0"
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
     },
     "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=="
+      "version": "4.17.20",
+      "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "license": "MIT"
     },
     "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==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/lodash": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "22.13.10",
-      "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.13.10.tgz",
-      "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
+      "version": "24.7.2",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-24.7.2.tgz",
+      "integrity": "sha512-/NbVmcGTP+lj5oa4yiYxxeBjRivKQ5Ns1eSZeB99ExsEQ6rX5XYU1Zy/gGxY/ilqtD4Etx9mKyrPxZRetiahhA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~7.14.0"
       }
     },
+    "node_modules/@types/pako": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/@types/pako/-/pako-2.0.4.tgz",
+      "integrity": "sha512-VWDCbrLeVXJM9fihYodcLiIv0ku+AlOa/TQ1SvYOaBuyrSKgEcro95LJyIsJ4vSo6BXIxOKxiJAat04CmST9Fw==",
+      "license": "MIT"
+    },
     "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=="
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -948,18 +1061,21 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "license": "MIT",
       "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=="
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
@@ -973,6 +1089,7 @@
       "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.3.9.tgz",
       "integrity": "sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.23.3",
         "@vue/shared": "3.3.9",
@@ -985,6 +1102,7 @@
       "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.3.9.tgz",
       "integrity": "sha512-nfWubTtLXuT4iBeDSZ5J3m218MjOy42Vp2pmKVuBKo2/BLcrFUX8nCSr/bKRFiJ32R8qbdnnnBgRn9AdU5v0Sg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vue/compiler-core": "3.3.9",
         "@vue/shared": "3.3.9"
@@ -995,6 +1113,7 @@
       "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.3.9.tgz",
       "integrity": "sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.23.3",
         "@vue/compiler-core": "3.3.9",
@@ -1013,6 +1132,7 @@
       "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.3.9.tgz",
       "integrity": "sha512-NO5oobAw78R0G4SODY5A502MGnDNiDjf6qvhn7zD7TJGc8XDeIEw4fg6JU705jZ/YhuokBKz0A5a/FL/XZU73g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vue/compiler-dom": "3.3.9",
         "@vue/shared": "3.3.9"
@@ -1021,14 +1141,16 @@
     "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=="
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+      "license": "MIT"
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.22.tgz",
+      "integrity": "sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.13"
+        "@vue/shared": "3.5.22"
       }
     },
     "node_modules/@vue/reactivity-transform": {
@@ -1036,6 +1158,7 @@
       "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.3.9.tgz",
       "integrity": "sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.23.3",
         "@vue/compiler-core": "3.3.9",
@@ -1045,91 +1168,102 @@
       }
     },
     "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=="
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
+      "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
+      "license": "MIT"
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.22.tgz",
+      "integrity": "sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/reactivity": "3.5.22",
+        "@vue/shared": "3.5.22"
       }
     },
     "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=="
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
+      "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
+      "license": "MIT"
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz",
+      "integrity": "sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/runtime-core": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@vue/reactivity": "3.5.22",
+        "@vue/runtime-core": "3.5.22",
+        "@vue/shared": "3.5.22",
         "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=="
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
+      "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
+      "license": "MIT"
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.22.tgz",
+      "integrity": "sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-ssr": "3.5.22",
+        "@vue/shared": "3.5.22"
       },
       "peerDependencies": {
-        "vue": "3.5.13"
+        "vue": "3.5.22"
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz",
+      "integrity": "sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.4",
+        "@vue/shared": "3.5.22",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz",
+      "integrity": "sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.22",
+        "@vue/shared": "3.5.22"
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz",
+      "integrity": "sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.22",
+        "@vue/shared": "3.5.22"
       }
     },
     "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=="
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
+      "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
+      "license": "MIT"
     },
     "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==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -1141,12 +1275,14 @@
       "version": "3.3.9",
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.9.tgz",
       "integrity": "sha512-ZE0VTIR0LmYgeyhurPTpy4KzKsuDyQbMSdM49eKkMnT5X4VfFBLysMzjIZhLEFQYjjOVVfbvUDHckwjDFiO2eA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "quill": "^1.3.7",
         "quill-delta": "^4.2.2"
@@ -1159,6 +1295,7 @@
       "version": "10.6.1",
       "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.6.1.tgz",
       "integrity": "sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==",
+      "license": "MIT",
       "dependencies": {
         "@types/web-bluetooth": "^0.0.20",
         "@vueuse/metadata": "10.6.1",
@@ -1174,6 +1311,7 @@
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -1198,6 +1336,7 @@
       "version": "10.6.1",
       "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.6.1.tgz",
       "integrity": "sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
@@ -1206,6 +1345,7 @@
       "version": "10.6.1",
       "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.6.1.tgz",
       "integrity": "sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==",
+      "license": "MIT",
       "dependencies": {
         "vue-demi": ">=0.14.6"
       },
@@ -1218,6 +1358,7 @@
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -1242,6 +1383,7 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmmirror.com/@wtto00/html2canvas/-/html2canvas-1.4.3.tgz",
       "integrity": "sha512-jwsb+xL8N+gjrSNABSaFdxmWtE4c7RNFjP20lo1G7gs63Qqo1phhxVBTzxc/apDVh6LgXsU2l5bwKtXd9uz65w==",
+      "license": "MIT",
       "dependencies": {
         "css-line-break": "^2.1.0",
         "text-segmentation": "^1.0.3"
@@ -1251,10 +1393,11 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1267,6 +1410,7 @@
       "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
       "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1276,6 +1420,7 @@
       "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1291,6 +1436,7 @@
       "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1303,6 +1449,7 @@
       "version": "5.0.6",
       "resolved": "https://registry.npmmirror.com/area-data/-/area-data-5.0.6.tgz",
       "integrity": "sha512-QxLoA+823xXKyhw5S3750I9TToki0OS42HU9ol3rCOsCXfkjtl8RtQ/eoj0cK0Levn4//oEM05FmMumfw/HIlg==",
+      "license": "MIT",
       "peer": true
     },
     "node_modules/arr-diff": {
@@ -1310,6 +1457,7 @@
       "resolved": "https://registry.npmmirror.com/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1319,6 +1467,7 @@
       "resolved": "https://registry.npmmirror.com/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1328,6 +1477,7 @@
       "resolved": "https://registry.npmmirror.com/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1337,6 +1487,7 @@
       "resolved": "https://registry.npmmirror.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
       "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "is-array-buffer": "^3.0.5"
@@ -1353,6 +1504,7 @@
       "resolved": "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1362,6 +1514,7 @@
       "resolved": "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
       "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
         "call-bind": "^1.0.8",
@@ -1383,6 +1536,7 @@
       "resolved": "https://registry.npmmirror.com/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1392,6 +1546,7 @@
       "resolved": "https://registry.npmmirror.com/async-function/-/async-function-1.0.0.tgz",
       "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -1399,17 +1554,20 @@
     "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=="
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==",
+      "license": "MIT"
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
     },
     "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==",
+      "license": "(MIT OR Apache-2.0)",
       "bin": {
         "atob": "bin/atob.js"
       },
@@ -1422,6 +1580,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,
+      "license": "MIT",
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -1436,6 +1595,7 @@
       "version": "0.27.2",
       "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
       "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -1445,6 +1605,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmmirror.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
       "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "cosmiconfig": "^6.0.0",
@@ -1455,6 +1616,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "babel-plugin-macros": "^2.6.1",
@@ -1469,13 +1631,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmmirror.com/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -1494,6 +1658,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1502,6 +1667,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
       "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
@@ -1511,6 +1677,7 @@
       "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -1520,6 +1687,7 @@
       "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -1531,19 +1699,22 @@
       "version": "3.7.2",
       "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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
+      "dev": true,
+      "license": "ISC"
     },
     "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==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -1553,6 +1724,7 @@
       "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -1564,6 +1736,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz",
       "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
+      "license": "(MIT OR Apache-2.0)",
       "bin": {
         "btoa": "bin/btoa.js"
       },
@@ -1575,6 +1748,7 @@
       "version": "4.7.0",
       "resolved": "https://registry.npmmirror.com/bwip-js/-/bwip-js-4.7.0.tgz",
       "integrity": "sha512-b7oQcgbWUl8rpcZayQ32SQrBCNteiZFuLkimKKBRlPwIHCeUN2VNeUE3HCMYShe04Evxd+ucS9uUAOsvNKjQbA==",
+      "license": "MIT",
       "bin": {
         "bwip-js": "bin/bwip-js.js"
       }
@@ -1584,6 +1758,7 @@
       "resolved": "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -1604,6 +1779,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1612,6 +1788,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.8.tgz",
       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
@@ -1629,6 +1806,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2"
@@ -1641,6 +1819,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz",
       "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.2",
         "get-intrinsic": "^1.3.0"
@@ -1656,6 +1835,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -1664,6 +1844,7 @@
       "version": "3.0.11",
       "resolved": "https://registry.npmmirror.com/canvg/-/canvg-3.0.11.tgz",
       "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@types/raf": "^3.4.0",
@@ -1683,6 +1864,7 @@
       "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1709,13 +1891,15 @@
     "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=="
+      "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -1740,6 +1924,7 @@
       "resolved": "https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -1755,6 +1940,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -1767,6 +1953,7 @@
       "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
@@ -1780,6 +1967,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1788,6 +1976,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
       "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8"
       }
@@ -1797,6 +1986,7 @@
       "resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -1810,6 +2000,7 @@
       "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1821,12 +2012,14 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -1838,6 +2031,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -1847,6 +2041,7 @@
       "resolved": "https://registry.npmmirror.com/component-emitter/-/component-emitter-1.3.1.tgz",
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
@@ -1857,20 +2052,36 @@
       "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
       "dev": true
     },
+    "node_modules/copy-anything": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz",
+      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "is-what": "^3.14.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "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,
+      "license": "MIT",
       "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==",
+      "version": "3.46.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.46.0.tgz",
+      "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==",
       "hasInstallScript": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/core-js"
@@ -1881,6 +2092,7 @@
       "resolved": "https://registry.npmmirror.com/cors/-/cors-2.8.5.tgz",
       "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "object-assign": "^4",
         "vary": "^1"
@@ -1893,6 +2105,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
       "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+      "license": "MIT",
       "dependencies": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.1.0",
@@ -1908,6 +2121,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
       "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "license": "MIT",
       "dependencies": {
         "utrie": "^1.0.2"
       }
@@ -1917,6 +2131,7 @@
       "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^6.0.1",
@@ -1933,6 +2148,7 @@
       "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
       "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
@@ -1952,13 +2168,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ]
+      ],
+      "license": "BSD-2-Clause"
     },
     "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,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "domelementtype": "^2.2.0"
       },
@@ -1974,6 +2192,7 @@
       "resolved": "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
@@ -1988,6 +2207,7 @@
       "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -1997,6 +2217,7 @@
       "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz",
       "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -2006,10 +2227,11 @@
       }
     },
     "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==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.2.2.tgz",
+      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -2022,6 +2244,7 @@
       "resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
       "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "css-tree": "^1.1.2"
       },
@@ -2032,12 +2255,14 @@
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
     },
     "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==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -2078,6 +2303,7 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmmirror.com/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -2089,6 +2315,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/d3-axis/-/d3-axis-3.0.0.tgz",
       "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2097,6 +2324,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/d3-brush/-/d3-brush-3.0.0.tgz",
       "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -2112,6 +2340,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-chord/-/d3-chord-3.0.1.tgz",
       "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "1 - 3"
       },
@@ -2123,6 +2352,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2131,6 +2361,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/d3-contour/-/d3-contour-4.0.2.tgz",
       "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "^3.2.0"
       },
@@ -2142,6 +2373,7 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmmirror.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
       "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
       "dependencies": {
         "delaunator": "5"
       },
@@ -2153,6 +2385,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
       "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2161,6 +2394,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/d3-drag/-/d3-drag-3.0.0.tgz",
       "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-selection": "3"
@@ -2173,6 +2407,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-dsv/-/d3-dsv-3.0.1.tgz",
       "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
       "dependencies": {
         "commander": "7",
         "iconv-lite": "0.6",
@@ -2197,6 +2432,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -2205,6 +2441,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-fetch/-/d3-fetch-3.0.1.tgz",
       "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dsv": "1 - 3"
       },
@@ -2216,6 +2453,7 @@
       "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==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-quadtree": "1 - 3",
@@ -2229,6 +2467,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/d3-format/-/d3-format-3.1.0.tgz",
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2237,6 +2476,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmmirror.com/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -2248,6 +2488,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmmirror.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
       "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2256,6 +2497,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -2267,6 +2509,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2275,6 +2518,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-polygon/-/d3-polygon-3.0.1.tgz",
       "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2283,6 +2527,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
       "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2291,6 +2536,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-random/-/d3-random-3.0.1.tgz",
       "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2299,6 +2545,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -2314,6 +2561,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
       "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -2326,7 +2574,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
-      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -2335,6 +2582,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmmirror.com/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -2346,6 +2594,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -2357,6 +2606,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmmirror.com/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -2368,6 +2618,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2376,6 +2627,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/d3-transition/-/d3-transition-3.0.1.tgz",
       "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-dispatch": "1 - 3",
@@ -2394,6 +2646,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/d3-zoom/-/d3-zoom-3.0.0.tgz",
       "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
       "dependencies": {
         "d3-dispatch": "1 - 3",
         "d3-drag": "2 - 3",
@@ -2410,6 +2663,7 @@
       "resolved": "https://registry.npmmirror.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
       "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -2427,6 +2681,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -2444,6 +2699,7 @@
       "resolved": "https://registry.npmmirror.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
       "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -2457,15 +2713,17 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.13",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+      "version": "1.11.18",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.18.tgz",
+      "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
+      "license": "MIT"
     },
     "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==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -2479,15 +2737,17 @@
       }
     },
     "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=="
+      "version": "10.6.0",
+      "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -2496,6 +2756,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.2.tgz",
       "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+      "license": "MIT",
       "dependencies": {
         "is-arguments": "^1.1.1",
         "is-date-object": "^1.0.5",
@@ -2515,6 +2776,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -2531,6 +2793,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -2548,6 +2811,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.0"
       },
@@ -2559,6 +2823,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmmirror.com/delaunator/-/delaunator-5.0.1.tgz",
       "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
       "dependencies": {
         "robust-predicates": "^3.0.2"
       }
@@ -2567,6 +2832,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -2576,6 +2842,7 @@
       "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "entities": "^2.0.0"
@@ -2591,13 +2858,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ]
+      ],
+      "license": "BSD-2-Clause"
     },
     "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,
+      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -2606,21 +2875,24 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "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,
+      "license": "BSD-2-Clause",
       "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==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-3.2.7.tgz",
+      "integrity": "sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
       "optional": true,
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -2631,6 +2903,7 @@
       "resolved": "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz",
       "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -2640,6 +2913,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz",
       "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
         "es-errors": "^1.3.0",
@@ -2653,6 +2927,7 @@
       "version": "5.4.3",
       "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
       "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "2.3.0",
         "zrender": "5.4.4"
@@ -2662,6 +2937,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "china-division": "^2.7.0"
       }
@@ -2670,6 +2946,7 @@
       "version": "2.9.11",
       "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.11.tgz",
       "integrity": "sha512-x4L/6YC8de4JtuE3vpaEugJdQIeHQaHtIYKyk67IeF6dTIiVax45aX4nWOygnh+xX+0gTvL6xO+9BZhPA3G82w==",
+      "license": "MIT",
       "dependencies": {
         "@ctrl/tinycolor": "^3.4.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -2694,12 +2971,14 @@
     "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=="
+      "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==",
+      "license": "MIT"
     },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "@types/web-bluetooth": "^0.0.16",
         "@vueuse/metadata": "9.13.0",
@@ -2715,6 +2994,7 @@
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -2739,6 +3019,7 @@
       "version": "9.13.0",
       "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
       "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
@@ -2747,6 +3028,7 @@
       "version": "9.13.0",
       "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz",
       "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
+      "license": "MIT",
       "dependencies": {
         "vue-demi": "*"
       },
@@ -2759,6 +3041,7 @@
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -2784,6 +3067,7 @@
       "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -2792,6 +3076,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
@@ -2804,6 +3089,7 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
       "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -2820,6 +3106,7 @@
       "version": "5.2.3",
       "resolved": "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
       "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -2830,36 +3117,52 @@
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "prr": "~1.0.1"
+      },
+      "bin": {
+        "errno": "cli.js"
+      }
+    },
     "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==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+      "license": "MIT",
       "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==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
+      "license": "MIT",
       "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",
+        "call-bound": "^1.0.4",
         "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-object-atoms": "^1.1.1",
         "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-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -2871,21 +3174,24 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -2894,7 +3200,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2907,6 +3213,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz",
       "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -2915,6 +3222,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -2923,6 +3231,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -2934,6 +3243,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "get-intrinsic": "^1.2.6",
@@ -2949,6 +3259,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.2.7",
         "is-date-object": "^1.0.5",
@@ -2964,7 +3275,8 @@
     "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=="
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
     },
     "node_modules/esbuild": {
       "version": "0.19.12",
@@ -2972,6 +3284,7 @@
       "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -3007,13 +3320,15 @@
     "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=="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -3024,13 +3339,15 @@
     "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=="
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -3038,13 +3355,15 @@
     "node_modules/eventemitter3": {
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz",
-      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
@@ -3063,6 +3382,7 @@
       "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -3072,6 +3392,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -3084,6 +3405,7 @@
       "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
@@ -3096,24 +3418,28 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/exsolve/-/exsolve-1.0.7.tgz",
+      "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "is-extendable": "^0.1.0"
       },
@@ -3126,6 +3452,7 @@
       "resolved": "https://registry.npmmirror.com/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -3143,13 +3470,15 @@
     "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=="
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "license": "Apache-2.0"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -3161,11 +3490,23 @@
         "node": ">=8.6.0"
       }
     },
+    "node_modules/fast-png": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmmirror.com/fast-png/-/fast-png-6.4.0.tgz",
+      "integrity": "sha512-kAqZq1TlgBjZcLr5mcN6NP5Rv4V2f22z00c3g8vRrwkcqjerx7BEhPbOnWCPqaHUl2XWQBJQvOT/FQhdMT7X/Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/pako": "^2.0.3",
+        "iobuffer": "^5.3.2",
+        "pako": "^2.1.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,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -3173,18 +3514,21 @@
     "node_modules/fflate": {
       "version": "0.8.2",
       "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.8.2.tgz",
-      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="
+      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3193,15 +3537,16 @@
       }
     },
     "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==",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -3216,6 +3561,7 @@
       "resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.5.tgz",
       "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.2.7"
       },
@@ -3231,18 +3577,21 @@
       "resolved": "https://registry.npmmirror.com/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
       "dev": true,
+      "license": "MIT",
       "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==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -3254,6 +3603,7 @@
       "resolved": "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "map-cache": "^0.2.2"
       },
@@ -3266,6 +3616,7 @@
       "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
       "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -3281,6 +3632,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3293,6 +3645,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3302,6 +3655,7 @@
       "resolved": "https://registry.npmmirror.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
       "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.3",
@@ -3321,6 +3675,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3329,14 +3684,26 @@
       "version": "6.6.2",
       "resolved": "https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz",
       "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/generator-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/generator-function/-/generator-function-2.0.1.tgz",
+      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.2",
         "es-define-property": "^1.0.1",
@@ -3360,6 +3727,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz",
       "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.1",
         "es-object-atoms": "^1.0.0"
@@ -3373,6 +3741,7 @@
       "resolved": "https://registry.npmmirror.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
       "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -3390,6 +3759,7 @@
       "resolved": "https://registry.npmmirror.com/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3399,6 +3769,7 @@
       "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -3411,6 +3782,7 @@
       "resolved": "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.4.tgz",
       "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.2.1",
         "gopd": "^1.0.1"
@@ -3426,6 +3798,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz",
       "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3437,13 +3810,15 @@
       "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
+      "dev": true,
+      "license": "ISC"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -3456,6 +3831,7 @@
       "resolved": "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz",
       "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3468,6 +3844,7 @@
       "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3476,6 +3853,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -3488,6 +3866,7 @@
       "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.2.0.tgz",
       "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.0"
       },
@@ -3502,6 +3881,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz",
       "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3513,6 +3893,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -3528,6 +3909,7 @@
       "resolved": "https://registry.npmmirror.com/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -3542,6 +3924,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3551,6 +3934,7 @@
       "resolved": "https://registry.npmmirror.com/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -3564,6 +3948,7 @@
       "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.0.2"
       },
@@ -3576,6 +3961,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -3588,6 +3974,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-4.0.0.tgz",
       "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -3599,6 +3986,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -3611,6 +3999,7 @@
       "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
@@ -3619,6 +4008,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
       "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "license": "MIT",
       "dependencies": {
         "css-line-break": "^2.1.0",
         "text-segmentation": "^1.0.3"
@@ -3631,6 +4021,7 @@
       "version": "0.10.3",
       "resolved": "https://registry.npmmirror.com/html2pdf.js/-/html2pdf.js-0.10.3.tgz",
       "integrity": "sha512-RcB1sh8rs5NT3jgbN5zvvTmkmZrsUrxpZ/RI8TMbvuReNZAdJZG5TMfA2TBP6ZXxpXlWf9NB/ciLXVb6W2LbRQ==",
+      "license": "MIT",
       "dependencies": {
         "es6-promise": "^4.2.5",
         "html2canvas": "^1.0.0",
@@ -3642,6 +4033,7 @@
       "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
@@ -3655,6 +4047,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -3667,6 +4060,7 @@
       "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz",
       "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "image-size": "bin/image-size.js"
       },
@@ -3678,12 +4072,14 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz",
       "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
       "version": "3.3.1",
       "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.1.tgz",
       "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -3699,13 +4095,15 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "hasown": "^2.0.2",
@@ -3719,15 +4117,23 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
+    "node_modules/iobuffer": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmmirror.com/iobuffer/-/iobuffer-5.4.0.tgz",
+      "integrity": "sha512-DRebOWuqDvxunfkNJAlc3IzWIPD5xVxwUNbHr7xKB8E6aLJxIPfNX3CoMJghcFjpv6RWQsrcJbghtEwSPoJqMA==",
+      "license": "MIT"
+    },
     "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,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.0"
       },
@@ -3739,6 +4145,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "has-tostringtag": "^1.0.2"
@@ -3755,6 +4162,7 @@
       "resolved": "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
       "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.3",
@@ -3770,13 +4178,15 @@
     "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=="
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "async-function": "^1.0.0",
         "call-bound": "^1.0.3",
@@ -3796,6 +4206,7 @@
       "resolved": "https://registry.npmmirror.com/is-bigint/-/is-bigint-1.1.0.tgz",
       "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-bigints": "^1.0.2"
       },
@@ -3811,6 +4222,7 @@
       "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -3823,6 +4235,7 @@
       "resolved": "https://registry.npmmirror.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
       "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "has-tostringtag": "^1.0.2"
@@ -3838,13 +4251,15 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3856,6 +4271,7 @@
       "version": "2.16.1",
       "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.16.1.tgz",
       "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -3871,6 +4287,7 @@
       "resolved": "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
       "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.0"
       },
@@ -3883,6 +4300,7 @@
       "resolved": "https://registry.npmmirror.com/is-data-view/-/is-data-view-1.0.2.tgz",
       "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "get-intrinsic": "^1.2.6",
@@ -3899,6 +4317,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.1.0.tgz",
       "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "has-tostringtag": "^1.0.2"
@@ -3915,6 +4334,7 @@
       "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.3.tgz",
       "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
@@ -3928,6 +4348,7 @@
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3937,6 +4358,7 @@
       "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3946,6 +4368,7 @@
       "resolved": "https://registry.npmmirror.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
       "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3"
       },
@@ -3957,13 +4380,15 @@
       }
     },
     "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==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/is-generator-function/-/is-generator-function-1.1.2.tgz",
+      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
+        "call-bound": "^1.0.4",
+        "generator-function": "^2.0.0",
+        "get-proto": "^1.0.1",
         "has-tostringtag": "^1.0.2",
         "safe-regex-test": "^1.1.0"
       },
@@ -3979,6 +4404,7 @@
       "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -3991,6 +4417,20 @@
       "resolved": "https://registry.npmmirror.com/is-map/-/is-map-2.0.3.tgz",
       "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmmirror.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4003,6 +4443,7 @@
       "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -4012,6 +4453,7 @@
       "resolved": "https://registry.npmmirror.com/is-number-object/-/is-number-object-1.1.1.tgz",
       "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "has-tostringtag": "^1.0.2"
@@ -4028,6 +4470,7 @@
       "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
       "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4037,6 +4480,7 @@
       "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -4049,6 +4493,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4057,6 +4502,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "gopd": "^1.2.0",
@@ -4075,6 +4521,7 @@
       "resolved": "https://registry.npmmirror.com/is-set/-/is-set-2.0.3.tgz",
       "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4087,6 +4534,7 @@
       "resolved": "https://registry.npmmirror.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
       "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3"
       },
@@ -4102,6 +4550,7 @@
       "resolved": "https://registry.npmmirror.com/is-string/-/is-string-1.1.1.tgz",
       "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "has-tostringtag": "^1.0.2"
@@ -4118,6 +4567,7 @@
       "resolved": "https://registry.npmmirror.com/is-symbol/-/is-symbol-1.1.1.tgz",
       "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "has-symbols": "^1.1.0",
@@ -4135,6 +4585,7 @@
       "resolved": "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.15.tgz",
       "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.16"
       },
@@ -4150,6 +4601,7 @@
       "resolved": "https://registry.npmmirror.com/is-weakmap/-/is-weakmap-2.0.2.tgz",
       "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4162,6 +4614,7 @@
       "resolved": "https://registry.npmmirror.com/is-weakref/-/is-weakref-1.1.1.tgz",
       "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3"
       },
@@ -4177,6 +4630,7 @@
       "resolved": "https://registry.npmmirror.com/is-weakset/-/is-weakset-2.0.4.tgz",
       "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "get-intrinsic": "^1.2.6"
@@ -4193,6 +4647,7 @@
       "resolved": "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4201,13 +4656,15 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "isarray": "1.0.0"
       },
@@ -4218,49 +4675,54 @@
     "node_modules/jquery": {
       "version": "3.7.1",
       "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "peer": true
+      "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
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "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==",
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
     },
     "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
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ==",
+      "license": "MIT"
     },
     "node_modules/jsencrypt": {
       "version": "3.3.2",
       "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
-      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==",
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -4269,10 +4731,11 @@
       }
     },
     "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -4281,13 +4744,13 @@
       }
     },
     "node_modules/jspdf": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-3.0.1.tgz",
-      "integrity": "sha512-qaGIxqxetdoNnFQQXxTKUD9/Z7AloLaw94fFsOiJMxbfYdBbrBuhWmbzI8TVjrw7s3jBY1PFHofBKMV/wZPapg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-3.0.3.tgz",
+      "integrity": "sha512-eURjAyz5iX1H8BOYAfzvdPfIKK53V7mCpBTe7Kb16PaM8JSXEcUQNBQaiWMI8wY5RvNOPj4GccMjTlfwRBd+oQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.26.7",
-        "atob": "^2.1.2",
-        "btoa": "^1.2.1",
+        "@babel/runtime": "^7.26.9",
+        "fast-png": "^6.2.0",
         "fflate": "^0.8.1"
       },
       "optionalDependencies": {
@@ -4300,13 +4763,15 @@
     "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=="
+      "integrity": "sha512-x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4314,13 +4779,15 @@
     "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=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -4335,6 +4802,7 @@
       "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.5.1.tgz",
       "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mlly": "^1.7.3",
         "pkg-types": "^1.2.1"
@@ -4349,19 +4817,18 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "peer": true
+      "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==",
-      "peer": true
+      "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==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/lodash-es": "*",
         "lodash": "*",
@@ -4371,32 +4838,52 @@
     "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=="
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==",
+      "license": "MIT"
     },
     "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."
+      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
+      "license": "MIT"
     },
     "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==",
+      "version": "0.30.19",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.19.tgz",
+      "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
+    "node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4406,6 +4893,7 @@
       "resolved": "https://registry.npmmirror.com/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "object-visit": "^1.0.0"
       },
@@ -4417,6 +4905,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
       "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -4425,18 +4914,21 @@
       "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
+      "dev": true,
+      "license": "CC0-1.0"
     },
     "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=="
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "is-plain-obj": "^1.1"
       },
@@ -4449,6 +4941,7 @@
       "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -4458,6 +4951,7 @@
       "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -4470,6 +4964,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -4478,6 +4973,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -4490,6 +4986,7 @@
       "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -4505,6 +5002,7 @@
       "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -4514,6 +5012,7 @@
       "resolved": "https://registry.npmmirror.com/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -4527,6 +5026,7 @@
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -4535,21 +5035,23 @@
       }
     },
     "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==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.8.0.tgz",
+      "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "acorn": "^8.14.0",
-        "pathe": "^2.0.1",
-        "pkg-types": "^1.3.0",
-        "ufo": "^1.5.4"
+        "acorn": "^8.15.0",
+        "pathe": "^2.0.3",
+        "pkg-types": "^1.3.1",
+        "ufo": "^1.6.1"
       }
     },
     "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==",
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -4557,18 +5059,20 @@
     "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=="
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.9.tgz",
-      "integrity": "sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==",
+      "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"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -4581,6 +5085,7 @@
       "resolved": "https://registry.npmmirror.com/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -4603,6 +5108,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -4616,6 +5122,7 @@
       "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -4629,6 +5136,7 @@
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -4641,6 +5149,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4650,6 +5159,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4659,6 +5169,7 @@
       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4666,18 +5177,21 @@
     "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=="
+      "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==",
+      "license": "BSD-3-Clause"
     },
     "node_modules/nprogress": {
       "version": "0.2.0",
       "resolved": "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz",
-      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
+      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
+      "license": "MIT"
     },
     "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,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -4688,13 +5202,15 @@
     "node_modules/nzh": {
       "version": "1.0.14",
       "resolved": "https://registry.npmmirror.com/nzh/-/nzh-1.0.14.tgz",
-      "integrity": "sha512-wKgaqCSZdrySvB4RWop5g+v6IDv2IErsT6rjq06Bg0yiT9hiHYZO12GMGx/xweGVLcO2lDjX5RqWD0S/Jy9z5Q=="
+      "integrity": "sha512-wKgaqCSZdrySvB4RWop5g+v6IDv2IErsT6rjq06Bg0yiT9hiHYZO12GMGx/xweGVLcO2lDjX5RqWD0S/Jy9z5Q==",
+      "license": "BSD-2-Clause"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4704,6 +5220,7 @@
       "resolved": "https://registry.npmmirror.com/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -4718,6 +5235,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -4730,6 +5248,7 @@
       "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
@@ -4743,6 +5262,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -4755,6 +5275,7 @@
       "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz",
       "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4766,6 +5287,7 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.6.tgz",
       "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1"
@@ -4781,6 +5303,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -4790,6 +5313,7 @@
       "resolved": "https://registry.npmmirror.com/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.0"
       },
@@ -4802,6 +5326,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4811,6 +5336,7 @@
       "resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.7.tgz",
       "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.3",
@@ -4831,6 +5357,7 @@
       "resolved": "https://registry.npmmirror.com/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -4843,6 +5370,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4852,6 +5380,7 @@
       "resolved": "https://registry.npmmirror.com/own-keys/-/own-keys-1.0.1.tgz",
       "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.6",
         "object-keys": "^1.1.1",
@@ -4864,15 +5393,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/pako": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
+      "license": "(MIT AND Zlib)"
+    },
     "node_modules/parchment": {
       "version": "1.1.4",
       "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz",
-      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==",
+      "license": "BSD-3-Clause"
     },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -4884,6 +5421,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -4902,6 +5440,7 @@
       "resolved": "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4909,12 +5448,14 @@
     "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=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
     },
     "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==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4923,23 +5464,27 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/pathe/-/pathe-2.0.3.tgz",
       "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -4951,6 +5496,7 @@
       "version": "2.1.7",
       "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz",
       "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==",
+      "license": "MIT",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0",
         "vue-demi": ">=0.14.5"
@@ -4977,6 +5523,7 @@
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -4998,9 +5545,10 @@
       }
     },
     "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==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/pinyin/-/pinyin-4.0.0.tgz",
+      "integrity": "sha512-vHpV5K+vpp6XUUpZNGRDuHoN+1xcmieM3EWlH4QjSX2kkpG/gVOwpqwV9EOJ9x9c9UERFKeLml5XVSukE/PLgQ==",
+      "license": "MIT",
       "dependencies": {
         "commander": "~1.1.1"
       },
@@ -5012,7 +5560,7 @@
       },
       "peerDependencies": {
         "@node-rs/jieba": "^1.6.0",
-        "nodejieba": "2.5.2",
+        "nodejieba": "^3.4.4",
         "segmentit": "^2.0.3"
       },
       "peerDependenciesMeta": {
@@ -5043,6 +5591,7 @@
       "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.3.1.tgz",
       "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "confbox": "^0.1.8",
         "mlly": "^1.7.4",
@@ -5054,6 +5603,7 @@
       "resolved": "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5063,14 +5613,15 @@
       "resolved": "https://registry.npmmirror.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
       "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "dev": true,
+      "license": "MIT",
       "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==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -5085,9 +5636,8 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -5100,6 +5650,7 @@
       "resolved": "https://registry.npmmirror.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.1.tgz",
       "integrity": "sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "postcss": ">4 <9"
       }
@@ -5109,6 +5660,7 @@
       "resolved": "https://registry.npmmirror.com/posthtml/-/posthtml-0.9.2.tgz",
       "integrity": "sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "posthtml-parser": "^0.2.0",
         "posthtml-render": "^1.0.5"
@@ -5122,6 +5674,7 @@
       "resolved": "https://registry.npmmirror.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz",
       "integrity": "sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "htmlparser2": "^3.8.3",
         "isobject": "^2.1.0"
@@ -5132,6 +5685,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "1.0.5"
       }
@@ -5141,6 +5695,7 @@
       "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -5150,6 +5705,7 @@
       "resolved": "https://registry.npmmirror.com/posthtml-render/-/posthtml-render-1.4.0.tgz",
       "integrity": "sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -5159,6 +5715,7 @@
       "resolved": "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz",
       "integrity": "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "merge-options": "1.0.1",
         "posthtml": "^0.9.2",
@@ -5170,6 +5727,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/preval.macro/-/preval.macro-4.0.0.tgz",
       "integrity": "sha512-sJJnE71X+MPr64CVD2AurmUj4JEDqbudYbStav3L9Xjcqm4AR0ymMm6sugw1mUmfI/7gw4JWA4JXo/k6w34crw==",
+      "license": "MIT",
       "dependencies": {
         "babel-plugin-preval": "^4.0.0"
       }
@@ -5178,14 +5736,15 @@
       "version": "8.5.8",
       "resolved": "https://registry.npmmirror.com/province-city-china/-/province-city-china-8.5.8.tgz",
       "integrity": "sha512-gUV5kSOWHVufemkq6lygb0ngNZ4snMcONmr3QzxHuj1MYOQPphiyjHplfmywcVGWdGQgim30RXia/mYB007eLg==",
+      "license": "MIT",
       "dependencies": {
         "@province-city-china/types": "8.5.8"
       }
     },
     "node_modules/quansync": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.8.tgz",
-      "integrity": "sha512-4+saucphJMazjt7iOM27mbFCk+D9dd/zmgMDCzRZ8MEoBfYp7lAvoN38et/phRQF6wOPMy/OROBGgoWeSKyluA==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.11.tgz",
+      "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
       "dev": true,
       "funding": [
         {
@@ -5196,13 +5755,15 @@
           "type": "individual",
           "url": "https://github.com/sponsors/sxzz"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "object-assign": "^4.1.0",
         "strict-uri-encode": "^1.0.0"
@@ -5229,12 +5790,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "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==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "clone": "^2.1.1",
         "deep-equal": "^1.0.1",
@@ -5248,6 +5811,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "fast-diff": "1.2.0",
         "lodash.clonedeep": "^4.5.0",
@@ -5257,12 +5821,14 @@
     "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=="
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==",
+      "license": "Apache-2.0"
     },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "deep-equal": "^1.0.1",
         "extend": "^3.0.2",
@@ -5276,6 +5842,7 @@
       "version": "3.4.1",
       "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "license": "MIT",
       "dependencies": {
         "performance-now": "^2.1.0"
       }
@@ -5285,6 +5852,7 @@
       "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -5299,6 +5867,7 @@
       "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -5311,6 +5880,7 @@
       "resolved": "https://registry.npmmirror.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
       "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -5331,13 +5901,15 @@
     "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=="
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
@@ -5351,6 +5923,7 @@
       "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -5364,6 +5937,7 @@
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -5375,6 +5949,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -5395,6 +5970,7 @@
       "resolved": "https://registry.npmmirror.com/repeat-element/-/repeat-element-1.1.4.tgz",
       "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5404,6 +5980,7 @@
       "resolved": "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
@@ -5412,6 +5989,7 @@
       "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==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5420,6 +5998,7 @@
       "version": "1.22.10",
       "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.10.tgz",
       "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
@@ -5439,6 +6018,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -5448,13 +6028,15 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12"
       }
@@ -5464,6 +6046,7 @@
       "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.1.0.tgz",
       "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -5473,6 +6056,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz",
       "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
+      "license": "MIT OR SEE LICENSE IN FEEL-FREE.md",
       "engines": {
         "node": ">= 0.8.15"
       }
@@ -5480,16 +6064,16 @@
     "node_modules/robust-predicates": {
       "version": "3.0.2",
       "resolved": "https://registry.npmmirror.com/robust-predicates/-/robust-predicates-3.0.2.tgz",
-      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.35.0",
-      "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.35.0.tgz",
-      "integrity": "sha512-kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.52.4.tgz",
+      "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -5499,25 +6083,28 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.35.0",
-        "@rollup/rollup-android-arm64": "4.35.0",
-        "@rollup/rollup-darwin-arm64": "4.35.0",
-        "@rollup/rollup-darwin-x64": "4.35.0",
-        "@rollup/rollup-freebsd-arm64": "4.35.0",
-        "@rollup/rollup-freebsd-x64": "4.35.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.35.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.35.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.35.0",
-        "@rollup/rollup-linux-arm64-musl": "4.35.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.35.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.35.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.35.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.35.0",
-        "@rollup/rollup-linux-x64-gnu": "4.35.0",
-        "@rollup/rollup-linux-x64-musl": "4.35.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.35.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.35.0",
-        "@rollup/rollup-win32-x64-msvc": "4.35.0",
+        "@rollup/rollup-android-arm-eabi": "4.52.4",
+        "@rollup/rollup-android-arm64": "4.52.4",
+        "@rollup/rollup-darwin-arm64": "4.52.4",
+        "@rollup/rollup-darwin-x64": "4.52.4",
+        "@rollup/rollup-freebsd-arm64": "4.52.4",
+        "@rollup/rollup-freebsd-x64": "4.52.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.52.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.52.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.52.4",
+        "@rollup/rollup-linux-arm64-musl": "4.52.4",
+        "@rollup/rollup-linux-loong64-gnu": "4.52.4",
+        "@rollup/rollup-linux-ppc64-gnu": "4.52.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.52.4",
+        "@rollup/rollup-linux-riscv64-musl": "4.52.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.52.4",
+        "@rollup/rollup-linux-x64-gnu": "4.52.4",
+        "@rollup/rollup-linux-x64-musl": "4.52.4",
+        "@rollup/rollup-openharmony-arm64": "4.52.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.52.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.52.4",
+        "@rollup/rollup-win32-x64-gnu": "4.52.4",
+        "@rollup/rollup-win32-x64-msvc": "4.52.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -5540,6 +6127,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -5547,13 +6135,15 @@
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmmirror.com/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -5572,7 +6162,8 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
@@ -5592,13 +6183,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "isarray": "^2.0.5"
@@ -5614,13 +6207,15 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "ret": "~0.1.10"
       }
@@ -5630,6 +6225,7 @@
       "resolved": "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
       "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -5645,14 +6241,14 @@
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
     },
     "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,
-      "peer": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -5669,7 +6265,8 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/scule/-/scule-1.3.0.tgz",
       "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/segmentit": {
       "version": "2.0.3",
@@ -5684,6 +6281,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -5700,6 +6298,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -5715,6 +6314,7 @@
       "resolved": "https://registry.npmmirror.com/set-proto/-/set-proto-1.0.0.tgz",
       "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.1",
         "es-errors": "^1.3.0",
@@ -5729,6 +6329,7 @@
       "resolved": "https://registry.npmmirror.com/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -5744,6 +6345,7 @@
       "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz",
       "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "object-inspect": "^1.13.3",
@@ -5763,6 +6365,7 @@
       "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz",
       "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
         "object-inspect": "^1.13.3"
@@ -5779,6 +6382,7 @@
       "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz",
       "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -5797,6 +6401,7 @@
       "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
       "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -5816,6 +6421,7 @@
       "resolved": "https://registry.npmmirror.com/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -5835,6 +6441,7 @@
       "resolved": "https://registry.npmmirror.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -5849,6 +6456,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5858,6 +6466,7 @@
       "resolved": "https://registry.npmmirror.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.2.0"
       },
@@ -5870,6 +6479,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -5882,6 +6492,7 @@
       "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -5891,6 +6502,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -5903,6 +6515,7 @@
       "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
@@ -5915,13 +6528,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5930,6 +6545,7 @@
       "version": "4.8.1",
       "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.8.1.tgz",
       "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
@@ -5944,6 +6560,7 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
       "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -5960,6 +6577,7 @@
       "version": "4.2.4",
       "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
       "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
@@ -5972,6 +6590,7 @@
       "version": "4.3.7",
       "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz",
       "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -5989,6 +6608,7 @@
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5997,6 +6617,7 @@
       "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==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6007,6 +6628,7 @@
       "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
@@ -6020,20 +6642,23 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "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
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^3.0.0"
       },
@@ -6046,6 +6671,7 @@
       "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -6059,6 +6685,7 @@
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -6071,12 +6698,14 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "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==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.1.14"
       }
@@ -6086,6 +6715,7 @@
       "resolved": "https://registry.npmmirror.com/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
@@ -6099,6 +6729,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-0.2.5.tgz",
       "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^0.1.0"
       },
@@ -6111,6 +6742,7 @@
       "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-0.1.7.tgz",
       "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-accessor-descriptor": "^1.0.1",
         "is-data-descriptor": "^1.0.1"
@@ -6119,11 +6751,26 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6133,6 +6780,7 @@
       "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -6142,6 +6790,7 @@
       "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
       "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -6163,6 +6812,7 @@
       "resolved": "https://registry.npmmirror.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
       "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -6181,6 +6831,7 @@
       "resolved": "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
       "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -6198,6 +6849,7 @@
       "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^2.0.0"
       },
@@ -6210,6 +6862,7 @@
       "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-2.1.1.tgz",
       "integrity": "sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "js-tokens": "^9.0.1"
       },
@@ -6217,11 +6870,19 @@
         "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,
+      "license": "MIT"
+    },
     "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,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -6233,6 +6894,7 @@
       "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==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6245,6 +6907,7 @@
       "resolved": "https://registry.npmmirror.com/svg-baker/-/svg-baker-1.7.0.tgz",
       "integrity": "sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bluebird": "^3.5.0",
         "clone": "^2.1.1",
@@ -6266,6 +6929,7 @@
       "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6275,6 +6939,7 @@
       "resolved": "https://registry.npmmirror.com/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -6296,6 +6961,7 @@
       "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^2.2.1",
         "escape-string-regexp": "^1.0.2",
@@ -6312,6 +6978,7 @@
       "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -6321,6 +6988,7 @@
       "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -6330,6 +6998,7 @@
       "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "extend-shallow": "^2.0.1",
         "is-number": "^3.0.0",
@@ -6345,6 +7014,7 @@
       "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz",
       "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6354,6 +7024,7 @@
       "resolved": "https://registry.npmmirror.com/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.0.2"
       },
@@ -6366,6 +7037,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -6378,6 +7050,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6387,6 +7060,7 @@
       "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz",
       "integrity": "sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -6411,6 +7085,7 @@
       "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz",
       "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^1.1.3",
         "js-base64": "^2.1.9",
@@ -6426,6 +7101,7 @@
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6435,6 +7111,7 @@
       "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-3.2.3.tgz",
       "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^1.0.0"
       },
@@ -6447,6 +7124,7 @@
       "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
@@ -6459,6 +7137,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
       "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
+      "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
       }
@@ -6468,6 +7147,7 @@
       "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",
       "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@trysound/sax": "0.2.0",
         "commander": "^7.2.0",
@@ -6488,6 +7168,7 @@
       "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==",
+      "license": "MIT",
       "dependencies": {
         "utrie": "^1.0.2"
       }
@@ -6497,6 +7178,7 @@
       "resolved": "https://registry.npmmirror.com/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^3.0.2"
       },
@@ -6509,6 +7191,7 @@
       "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz",
       "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-buffer": "^1.1.5"
       },
@@ -6521,6 +7204,7 @@
       "resolved": "https://registry.npmmirror.com/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -6536,6 +7220,7 @@
       "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -6548,6 +7233,7 @@
       "resolved": "https://registry.npmmirror.com/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -6561,6 +7247,7 @@
       "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -6574,6 +7261,7 @@
       "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -6586,6 +7274,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6595,6 +7284,7 @@
       "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.6.11.tgz",
       "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "gopd": "^1.2.0",
         "typedarray.prototype.slice": "^1.0.5",
@@ -6610,13 +7300,15 @@
     "node_modules/tslib": {
       "version": "2.3.0",
       "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
+      "license": "0BSD"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -6631,6 +7323,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
@@ -6650,6 +7343,7 @@
       "resolved": "https://registry.npmmirror.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
       "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
@@ -6671,6 +7365,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,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
@@ -6691,6 +7386,7 @@
       "resolved": "https://registry.npmmirror.com/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
       "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -6709,16 +7405,18 @@
       }
     },
     "node_modules/ufo": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.5.4.tgz",
-      "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
-      "dev": true
+      "version": "1.6.1",
+      "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.6.1.tgz",
+      "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==",
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
@@ -6733,16 +7431,18 @@
       }
     },
     "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
+      "version": "7.14.0",
+      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-7.14.0.tgz",
+      "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "@rollup/pluginutils": "^5.1.4",
         "acorn": "^8.14.0",
@@ -6761,29 +7461,32 @@
       }
     },
     "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
+      "version": "0.2.2",
+      "resolved": "https://registry.npmmirror.com/confbox/-/confbox-0.2.2.tgz",
+      "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "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==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-1.1.2.tgz",
+      "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mlly": "^1.7.4",
-        "pkg-types": "^2.0.1",
-        "quansync": "^0.2.8"
+        "pkg-types": "^2.3.0",
+        "quansync": "^0.2.11"
       },
       "engines": {
         "node": ">=14"
@@ -6793,21 +7496,23 @@
       }
     },
     "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==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-2.3.0.tgz",
+      "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "confbox": "^0.2.1",
-        "exsolve": "^1.0.1",
+        "confbox": "^0.2.2",
+        "exsolve": "^1.0.7",
         "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==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6820,6 +7525,7 @@
       "resolved": "https://registry.npmmirror.com/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -6835,6 +7541,7 @@
       "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
@@ -6844,6 +7551,7 @@
       "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.16.1.tgz",
       "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.14.0",
         "webpack-virtual-modules": "^0.6.2"
@@ -6857,6 +7565,7 @@
       "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.17.1.tgz",
       "integrity": "sha512-QvdJKtFK0COSuRXzVnwjG3ir870zVhdMg6O8GKG3UO/O5W4fmJm5h71QvzI7Gp8Sx0qfCvC3f+2v0Vm489fnqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@antfu/utils": "^0.7.6",
         "@rollup/pluginutils": "^5.0.5",
@@ -6891,6 +7600,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "@vue/compiler-sfc": "^3.2.37",
         "magic-string": "^0.26.2",
@@ -6902,6 +7612,7 @@
       "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.7.tgz",
       "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sourcemap-codec": "^1.4.8"
       },
@@ -6914,6 +7625,7 @@
       "resolved": "https://registry.npmmirror.com/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -6927,6 +7639,7 @@
       "resolved": "https://registry.npmmirror.com/has-value/-/has-value-0.3.1.tgz",
       "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-value": "^2.0.3",
         "has-values": "^0.1.4",
@@ -6941,6 +7654,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz",
       "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isarray": "1.0.0"
       },
@@ -6953,6 +7667,7 @@
       "resolved": "https://registry.npmmirror.com/has-values/-/has-values-0.1.4.tgz",
       "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6962,6 +7677,7 @@
       "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6971,13 +7687,15 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6986,37 +7704,41 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/utrie": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
       "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "license": "MIT",
       "dependencies": {
         "base64-arraybuffer": "^1.0.2"
       }
     },
     "node_modules/v-dropdown": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmmirror.com/v-dropdown/-/v-dropdown-3.3.0.tgz",
-      "integrity": "sha512-OkNipbg+V4vQ6xyYLxTk+WQOs3A17nXtoqY9kqHRSAXnpE6mlwdsxar/qIgAAbhDpF0RYI8v4p75809S6ch+Rg==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmmirror.com/v-dropdown/-/v-dropdown-3.5.1.tgz",
+      "integrity": "sha512-shX+jBf+RXLPYiaklE5l2XvJFWd/4eNMN2oVKeITzBMMOAFjI9pGxCMm8g3nz3tCbpOLzD3mwv+WfygeBTpSsg==",
+      "license": "MIT",
       "dependencies": {
-        "vue": "^3.5.13"
+        "vue": "^3.5.21"
       },
       "peerDependencies": {
-        "vue": "^3.3.0"
+        "vue": "^3.5.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==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmmirror.com/v-region/-/v-region-3.5.0.tgz",
+      "integrity": "sha512-KBCmp8vEvzt9A2wepqtDLFPstJuNA2c8QUuVi9z3mV1/XtzWCxEBwVCMVpzvA9SReZcmcZ7jbyFCLTpvRo9fIA==",
+      "license": "MIT",
       "dependencies": {
-        "v-dropdown": "^3.3.0",
-        "vue": "^3.5.13"
+        "v-dropdown": "^3.5.1",
+        "vue": "^3.5.20"
       },
       "peerDependencies": {
-        "vue": "^3.4.0"
+        "vue": "^3.5.0"
       }
     },
     "node_modules/vary": {
@@ -7024,6 +7746,7 @@
       "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -7033,7 +7756,6 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.4.tgz",
       "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.19.3",
         "postcss": "^8.4.31",
@@ -7089,6 +7811,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.2",
         "debug": "^4.3.3",
@@ -7103,6 +7826,7 @@
       "resolved": "https://registry.npmmirror.com/vite-plugin-svg-icons/-/vite-plugin-svg-icons-2.0.1.tgz",
       "integrity": "sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/svgo": "^2.6.1",
         "cors": "^2.8.5",
@@ -7121,19 +7845,19 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmmirror.com/pathe/-/pathe-0.2.0.tgz",
       "integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vue": {
       "version": "3.5.13",
       "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.13.tgz",
       "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
-      "peer": true,
       "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"
+        "@vue/compiler-dom": "3.5.22",
+        "@vue/compiler-sfc": "3.5.22",
+        "@vue/runtime-dom": "3.5.22",
+        "@vue/server-renderer": "3.5.22",
+        "@vue/shared": "3.5.22"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -7148,6 +7872,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmmirror.com/vue-area-linkage/-/vue-area-linkage-5.1.0.tgz",
       "integrity": "sha512-86WD4O6PD9e2koWZ81Zlfcyey17U1+3B3fpWoyIZlBIe2V6qfvrg9BTozWdTpdF4CmKBiz138LBRTKhawl/UWw==",
+      "license": "MIT",
       "dependencies": {
         "lodash.find": "^4.6.0"
       },
@@ -7163,12 +7888,14 @@
     "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=="
+      "integrity": "sha512-WsqKMpaBf9Osi1LQlE/5AKdD0nHWOy1asLXocaG8NomOWO07jiZi968+/PbMmnD0QbPJOumDQaGuGa13qys85A==",
+      "license": "ISC"
     },
     "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==",
+      "license": "MIT",
       "dependencies": {
         "@claviska/jquery-minicolors": "^2.3.6",
         "@wtto00/html2canvas": "^1.4.3",
@@ -7189,12 +7916,14 @@
       "version": "2.5.8",
       "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-2.5.8.tgz",
       "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
       "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==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2",
         "atob": "^2.1.2",
@@ -7212,6 +7941,7 @@
       "version": "4.2.5",
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.5.tgz",
       "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+      "license": "MIT",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0"
       },
@@ -7223,60 +7953,66 @@
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz",
+      "integrity": "sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.4",
+        "@vue/shared": "3.5.22",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz",
+      "integrity": "sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.22",
+        "@vue/shared": "3.5.22"
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.22.tgz",
+      "integrity": "sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==",
+      "license": "MIT",
       "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",
+        "@babel/parser": "^7.28.4",
+        "@vue/compiler-core": "3.5.22",
+        "@vue/compiler-dom": "3.5.22",
+        "@vue/compiler-ssr": "3.5.22",
+        "@vue/shared": "3.5.22",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.11",
-        "postcss": "^8.4.48",
-        "source-map-js": "^1.2.0"
+        "magic-string": "^0.30.19",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
       }
     },
     "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==",
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz",
+      "integrity": "sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==",
+      "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.22",
+        "@vue/shared": "3.5.22"
       }
     },
     "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=="
+      "version": "3.5.22",
+      "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
+      "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
+      "license": "MIT"
     },
     "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==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -7288,13 +8024,15 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "is-bigint": "^1.1.0",
         "is-boolean-object": "^1.2.1",
@@ -7314,6 +8052,7 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
         "function.prototype.name": "^1.1.6",
@@ -7340,13 +8079,15 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "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,
+      "license": "MIT",
       "dependencies": {
         "is-map": "^2.0.3",
         "is-set": "^2.0.3",
@@ -7365,6 +8106,7 @@
       "resolved": "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.19.tgz",
       "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
@@ -7385,6 +8127,7 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmmirror.com/ws/-/ws-8.17.1.tgz",
       "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -7413,6 +8156,7 @@
       "version": "1.10.2",
       "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "license": "ISC",
       "engines": {
         "node": ">= 6"
       }
@@ -7421,6 +8165,7 @@
       "version": "5.4.4",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
       "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tslib": "2.3.0"
       }
@@ -7687,11 +8432,6 @@
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
-    "@kurkle/color": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmmirror.com/@kurkle/color/-/color-0.3.4.tgz",
-      "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w=="
-    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7906,7 +8646,6 @@
       "version": "4.17.12",
       "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
-      "peer": true,
       "requires": {
         "@types/lodash": "*"
       }
@@ -7916,7 +8655,6 @@
       "resolved": "https://registry.npmmirror.com/@types/node/-/node-22.13.10.tgz",
       "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
       "dev": true,
-      "peer": true,
       "requires": {
         "undici-types": "~6.20.0"
       }
@@ -8511,14 +9249,6 @@
         "supports-color": "^7.1.0"
       }
     },
-    "chart.js": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmmirror.com/chart.js/-/chart.js-4.5.1.tgz",
-      "integrity": "sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==",
-      "requires": {
-        "@kurkle/color": "^0.3.0"
-      }
-    },
     "china-division": {
       "version": "2.7.0",
       "resolved": "https://registry.npmmirror.com/china-division/-/china-division-2.7.0.tgz",
@@ -8634,6 +9364,17 @@
       "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
       "dev": true
     },
+    "copy-anything": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz",
+      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "is-what": "^3.14.1"
+      }
+    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -8971,8 +9712,7 @@
     "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==",
-      "peer": true
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="
     },
     "d3-shape": {
       "version": "3.2.0",
@@ -9333,6 +10073,17 @@
       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
       "dev": true
     },
+    "errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
@@ -10307,6 +11058,14 @@
         "get-intrinsic": "^1.2.6"
       }
     },
+    "is-what": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz",
@@ -10331,8 +11090,7 @@
     "jquery": {
       "version": "3.7.1",
       "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "peer": true
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
     },
     "js-base64": {
       "version": "2.6.4",
@@ -10411,6 +11169,26 @@
       "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
       "dev": true
     },
+    "less": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/less/-/less-4.2.2.tgz",
+      "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "copy-anything": "^2.0.1",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "needle": "^3.1.0",
+        "parse-node-version": "^1.0.1",
+        "source-map": "~0.6.0",
+        "tslib": "^2.3.0"
+      }
+    },
     "lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -10440,14 +11218,12 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "peer": true
+      "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==",
-      "peer": true
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
     "lodash-unified": {
       "version": "1.0.3",
@@ -10478,6 +11254,18 @@
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz",
@@ -10534,6 +11322,14 @@
         "picomatch": "^2.3.1"
       }
     },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
@@ -10672,6 +11468,18 @@
         }
       }
     },
+    "needle": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmmirror.com/needle/-/needle-3.3.1.tgz",
+      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "requires": {
+        "iconv-lite": "^0.6.3",
+        "sax": "^1.2.4"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -10852,6 +11660,14 @@
         "lines-and-columns": "^1.1.6"
       }
     },
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -10890,6 +11706,14 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "pinia": {
       "version": "2.1.7",
       "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz",
@@ -10952,7 +11776,6 @@
       "version": "8.5.3",
       "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.3.tgz",
       "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
-      "peer": true,
       "requires": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -11037,6 +11860,14 @@
         "@province-city-china/types": "8.5.8"
       }
     },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "quansync": {
       "version": "0.2.8",
       "resolved": "https://registry.npmmirror.com/quansync/-/quansync-0.2.8.tgz",
@@ -11257,7 +12088,6 @@
       "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.35.0.tgz",
       "integrity": "sha512-kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@rollup/rollup-android-arm-eabi": "4.35.0",
         "@rollup/rollup-android-arm64": "4.35.0",
@@ -11371,13 +12201,20 @@
       "resolved": "https://registry.npmmirror.com/sass/-/sass-1.69.5.tgz",
       "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==",
       "dev": true,
-      "peer": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       }
     },
+    "sax": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "scule": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/scule/-/scule-1.3.0.tgz",
@@ -11388,11 +12225,18 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmmirror.com/segmentit/-/segmentit-2.0.3.tgz",
       "integrity": "sha512-7mn2XL3OdTUQ+AhHz7SbgyxLTaQRzTWQNVwiK+UlTO8aePGbSwvKUzTwE4238+OUY9MoR6ksAg35zl8sfTunQQ==",
-      "peer": true,
       "requires": {
         "preval.macro": "^4.0.0"
       }
     },
+    "semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -12441,10 +13285,9 @@
     },
     "vite": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/vite/-/vite-5.0.4.tgz",
       "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "esbuild": "^0.19.3",
         "fsevents": "~2.3.3",
@@ -12491,7 +13334,6 @@
       "version": "3.5.13",
       "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.13.tgz",
       "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
-      "peer": true,
       "requires": {
         "@vue/compiler-dom": "3.5.13",
         "@vue/compiler-sfc": "3.5.13",
diff --git a/openhis-ui-vue3/src/api/gf/ratioApplicationRecord.js b/openhis-ui-vue3/src/api/gf/ratioApplicationRecord.js
new file mode 100644
index 00000000..56c1d46b
--- /dev/null
+++ b/openhis-ui-vue3/src/api/gf/ratioApplicationRecord.js
@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询比例调整申请记录分页
+export function getPage(query) {
+  return request({
+    url: '/nenu/gf-ratio-application-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询比例调整申请记录详情
+export function getDetail(id) {
+  return request({
+    url: `/nenu/gf-ratio-application-record/${id}`,
+    method: 'get'
+  })
+}
+
+// 创建比例调整申请
+export function add(gfRatioApplicationRecordDto) {
+  return request({
+    url: '/nenu/gf-ratio-application-record',
+    method: 'post',
+    data: gfRatioApplicationRecordDto
+  })
+}
+
+// 取消比例调整申请
+export function cancel(id) {
+  return request({
+    url: `/nenu/gf-ratio-application-record/${id}`,
+    method: 'delete'
+  })
+}
+
+// 处理比例调整申请
+export function process(gfRatioApplicationProcessDto) {
+  return request({
+    url: '/nenu/gf-ratio-application-record',
+    method: 'put',
+    data: gfRatioApplicationProcessDto
+  })
+}
+
+// 查询申请项目选择弹窗分页
+export function getDefinitionSelectPage(query) {
+  return request({
+    url: '/nenu/gf-ratio-application-record/definition-select-page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询申请单打印列表
+export function getPrintList(ids) {
+  return request({
+    url: '/nenu/gf-ratio-application-record/print-list?ids='+ids,
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/api/gf/ratioManage.js b/openhis-ui-vue3/src/api/gf/ratioManage.js
new file mode 100644
index 00000000..6f4c8863
--- /dev/null
+++ b/openhis-ui-vue3/src/api/gf/ratioManage.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询大项比例列表
+export function getTypeRatioList() {
+  return request({
+    url: `/nenu/gf-ratio-manage/type-ratio-list`,
+    method: 'get'
+  })
+}
+
+// 保存大项比例列表
+export function saveTypeRatioList(gfTypeRatioSaveDto) {
+  return request({
+    url: '/nenu/gf-ratio-manage/type-ratio-list',
+    method: 'put',
+    data: gfTypeRatioSaveDto
+  })
+}
+
+// 查询单项比例分页
+export function getIndividualRatioPage(query) {
+  return request({
+    url: '/nenu/gf-ratio-manage/individual-ratio-page',
+    method: 'get',
+    params: query
+  })
+}
+
diff --git a/openhis-ui-vue3/src/api/gf/studentList.js b/openhis-ui-vue3/src/api/gf/studentList.js
new file mode 100644
index 00000000..70600967
--- /dev/null
+++ b/openhis-ui-vue3/src/api/gf/studentList.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询学生名单分页
+export function getPage(query) {
+  return request({
+    url: '/nenu/gf-student-list/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询学生名单详情
+export function getDetail(id) {
+  return request({
+    url: `/nenu/gf-student-list/${id}`,
+    method: 'get'
+  })
+}
+
+// 添加学生名单
+export function add(gfStudentListDto) {
+  return request({
+    url: '/nenu/gf-student-list',
+    method: 'post',
+    data: gfStudentListDto
+  })
+}
+
+// 编辑学生名单
+export function edit(gfStudentListDto) {
+  return request({
+    url: '/nenu/gf-student-list',
+    method: 'put',
+    data: gfStudentListDto
+  })
+}
+
+// 删除学生名单
+export function remove(id) {
+  return request({
+    url: `/nenu/gf-student-list/${id}`,
+    method: 'delete'
+  })
+}
diff --git a/openhis-ui-vue3/src/api/public.js b/openhis-ui-vue3/src/api/public.js
index 1c35f3d7..d8428b93 100644
--- a/openhis-ui-vue3/src/api/public.js
+++ b/openhis-ui-vue3/src/api/public.js
@@ -18,6 +18,33 @@ export function advicePrint(data) {
   })
 }
 
+// 获取全部科室列表
+export function getOrgList(data) {
+  return request({
+    url:'/app-common/department-list', 
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取全部病区列表
+export function getWardList(data) {
+  return request({
+    url:'/app-common/ward-list', 
+    method: 'get',
+    params: data,
+  })
+}
+
+// 获取全部供应商列表
+export function getSupplierList(data) {
+  return request({
+    url:'/app-common/supplier', 
+    method: 'get',
+    params: data,
+  })
+}
+
 import axios from 'axios';
 
 const env = import.meta.env.MODE;
@@ -27,7 +54,7 @@ if(env == 'development'){
   return axios.create(
     {
       // axios中请求配置有baseURL选项，表示请求URL公共部分
-      baseURL: '',//ybplugin
+      baseURL: '/ybplugin',//ybplugin
       // 超时
       timeout: 60000
     }
@@ -43,4 +70,4 @@ if(env == 'development'){
     }
   ).post('http://localhost:5000/api/data/', data);
 }
-}
\ No newline at end of file
+}
diff --git a/openhis-ui-vue3/src/assets/icons/svg/foldup.svg b/openhis-ui-vue3/src/assets/icons/svg/foldup.svg
new file mode 100644
index 00000000..20f32813
--- /dev/null
+++ b/openhis-ui-vue3/src/assets/icons/svg/foldup.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1760526251510" class="icon" viewBox="0 0 4096 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19701" width="480" height="120" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M174.073172 628.114881L1846.7293 65.622417a613.293618 613.293618 0 0 1 390.668035 0l1676.949184 562.594679A255.539008 255.539008 0 0 1 4088.624122 870.468076v12.470303a141.057532 141.057532 0 0 1-186.032397 133.698009L2240.054941 457.925902a613.293618 613.293618 0 0 0-390.565819 0L186.032398 1016.636388A141.057532 141.057532 0 0 1 0 882.938379v-12.572519a255.539008 255.539008 0 0 1 174.073172-242.250979z" fill="#CCD3D9" p-id="19702"></path></svg>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/layout/components/Navbar.vue b/openhis-ui-vue3/src/layout/components/Navbar.vue
index 2716d518..ded300f6 100644
--- a/openhis-ui-vue3/src/layout/components/Navbar.vue
+++ b/openhis-ui-vue3/src/layout/components/Navbar.vue
@@ -49,7 +49,7 @@
       </div>
     </div>
     <el-dialog title="切换科室" v-model="showDialog" width="400px" append-to-body destroy-on-close>
-      <el-select v-model="orgId">
+      <el-select v-model="orgId" filterable clearable>
         <el-option
           v-for="item in orgOptions"
           :key="item.orgId"
diff --git a/openhis-ui-vue3/src/layout/components/TagsView/index.vue b/openhis-ui-vue3/src/layout/components/TagsView/index.vue
index c6b5af83..8932578a 100644
--- a/openhis-ui-vue3/src/layout/components/TagsView/index.vue
+++ b/openhis-ui-vue3/src/layout/components/TagsView/index.vue
@@ -14,42 +14,40 @@
       >
         {{ tag.title }}
         <span v-if="!isAffix(tag)" @click.prevent.stop="closeSelectedTag(tag)">
-          <close class="el-icon-close" style="width: 1em; height: 1em;vertical-align: middle;" />
+          <close class="el-icon-close" style="width: 1em; height: 1em; vertical-align: middle" />
         </span>
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">
-        <refresh-right style="width: 1em; height: 1em;" /> 刷新页面
+        <refresh-right style="width: 1em; height: 1em" /> 刷新页面
       </li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
-        <close style="width: 1em; height: 1em;" /> 关闭当前
-      </li>
-      <li @click="closeOthersTags">
-        <circle-close style="width: 1em; height: 1em;" /> 关闭其他
+        <close style="width: 1em; height: 1em" /> 关闭当前
       </li>
+      <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em" /> 关闭其他</li>
       <li v-if="!isFirstView()" @click="closeLeftTags">
-        <back style="width: 1em; height: 1em;" /> 关闭左侧
+        <back style="width: 1em; height: 1em" /> 关闭左侧
       </li>
       <li v-if="!isLastView()" @click="closeRightTags">
-        <right style="width: 1em; height: 1em;" /> 关闭右侧
+        <right style="width: 1em; height: 1em" /> 关闭右侧
       </li>
       <li @click="closeAllTags(selectedTag)">
-        <circle-close style="width: 1em; height: 1em;" /> 全部关闭
+        <circle-close style="width: 1em; height: 1em" /> 全部关闭
       </li>
     </ul>
   </div>
 </template>
 
 <script setup>
-import ScrollPane from './ScrollPane'
-import { getNormalPath } from '@/utils/openhis'
-import useTagsViewStore from '@/store/modules/tagsView'
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
-import { toRaw } from 'vue'
-import { toArray } from 'lodash'
-import { toReactive, toRef } from '@vueuse/core'
+import ScrollPane from './ScrollPane';
+import { getNormalPath } from '@/utils/openhis';
+import useTagsViewStore from '@/store/modules/tagsView';
+import useSettingsStore from '@/store/modules/settings';
+import usePermissionStore from '@/store/modules/permission';
+import { toRaw } from 'vue';
+import { toArray } from 'lodash';
+import { toReactive, toRef } from '@vueuse/core';
 
 const visible = ref(false);
 const top = ref(0);
@@ -67,103 +65,115 @@ const routes = computed(() => usePermissionStore().routes);
 const theme = computed(() => useSettingsStore().theme);
 
 watch(route, () => {
-  addTags()
-  moveToCurrentTag()
-})
+  addTags();
+  moveToCurrentTag();
+});
 watch(visible, (value) => {
   if (value) {
-    document.body.addEventListener('click', closeMenu)
+    document.body.addEventListener('click', closeMenu);
   } else {
-    document.body.removeEventListener('click', closeMenu)
+    document.body.removeEventListener('click', closeMenu);
   }
-})
+});
 onMounted(() => {
-  initTags()
-  addTags()
-  if(sessionStorage.getItem('visitedViews')){
-    isVisitedViews()
+  initTags();
+  addTags();
+  if (sessionStorage.getItem('visitedViews')) {
+    isVisitedViews();
   }
-})
-function isVisitedViews(){
-  if(sessionStorage.getItem('visitedViews')!= "TransferManagent"){ //调拨单据号删除
-    sessionStorage.setItem('busNo',"")
-  }  
-  if(sessionStorage.getItem('visitedViews')!= "BatchTransfer"){ //批量调拨单据号删除
-    sessionStorage.setItem('busNopl',"")
-  }  
-  if(sessionStorage.getItem('visitedViews')!= "RequisitionManagement"){ //领用单据号删除
-    sessionStorage.setItem('busNoLY',"")
-  }  
-  if(sessionStorage.getItem('visitedViews')!= "ReturningInventory"){ //领用退货单据号删除
-    sessionStorage.setItem('busNoLYTH',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')!= "LossReportingManagement"){ //报损单据号删除
-    sessionStorage.setItem('busNoBS',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')!= "ChkstockPart"){ //盘点单据号删除
-    sessionStorage.setItem('busNopd',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')!= "ChkstockBatch"){ //批量盘点单据号删除
-    sessionStorage.setItem('busNoplpd',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')&&sessionStorage.getItem('visitedViewsQuery')!=""){
-    sessionStorage.setItem('busNo',"")
-    sessionStorage.setItem('busNopl',"")
-    sessionStorage.setItem('busNoLY',"")
-    sessionStorage.setItem('busNoLYTH',"")
-    sessionStorage.setItem('busNoBS',"")
-    sessionStorage.setItem('busNopd',"")
-    sessionStorage.setItem('busNoplpd',"")
+});
+function isVisitedViews() {
+  if (sessionStorage.getItem('visitedViews') != 'TransferManagent') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNo', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'BatchTransfer') {
+    //批量调拨单据号删除
+    sessionStorage.setItem('busNopl', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'RequisitionManagement') {
+    //领用单据号删除
+    sessionStorage.setItem('busNoLY', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'ReturningInventory') {
+    //领用退货单据号删除
+    sessionStorage.setItem('busNoLYTH', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'LossReportingManagement') {
+    //报损单据号删除
+    sessionStorage.setItem('busNoBS', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'ChkstockPart') {
+    //盘点单据号删除
+    sessionStorage.setItem('busNopd', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'ChkstockBatch') {
+    //批量盘点单据号删除
+    sessionStorage.setItem('busNoplpd', '');
+  }
+  if (sessionStorage.getItem('visitedViews') && sessionStorage.getItem('visitedViewsQuery') != '') {
+    sessionStorage.setItem('busNo', '');
+    sessionStorage.setItem('busNopl', '');
+    sessionStorage.setItem('busNoLY', '');
+    sessionStorage.setItem('busNoLYTH', '');
+    sessionStorage.setItem('busNoBS', '');
+    sessionStorage.setItem('busNopd', '');
+    sessionStorage.setItem('busNoplpd', '');
   }
 }
 
 function isActive(r) {
-  return r.path === route.path
+  return r.path === route.path;
 }
 function activeStyle(tag) {
   if (!isActive(tag)) return {};
   return {
-    "background-color": theme.value,
-    "border-color": theme.value
+    'background-color': theme.value,
+    'border-color': theme.value,
   };
 }
 function isAffix(tag) {
-  return tag.meta && tag.meta.affix
+  return tag.meta && tag.meta.affix;
 }
 function isFirstView() {
   try {
-    return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath
+    return (
+      selectedTag.value.fullPath === '/index' ||
+      selectedTag.value.fullPath === visitedViews.value[1].fullPath
+    );
   } catch (err) {
-    return false
+    return false;
   }
 }
 function isLastView() {
   try {
-    return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath
+    return (
+      selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath
+    );
   } catch (err) {
-    return false
+    return false;
   }
 }
 function filterAffixTags(routes, basePath = '') {
-  let tags = []
-  routes.forEach(route => {
+  let tags = [];
+  routes.forEach((route) => {
     if (route.meta && route.meta.affix) {
-      const tagPath = getNormalPath(basePath + '/' + route.path)
+      const tagPath = getNormalPath(basePath + '/' + route.path);
       tags.push({
         fullPath: tagPath,
         path: tagPath,
         name: route.name,
-        meta: { ...route.meta }
-      })
+        meta: { ...route.meta },
+      });
     }
     if (route.children) {
-      const tempTags = filterAffixTags(route.children, route.path)
+      const tempTags = filterAffixTags(route.children, route.path);
       if (tempTags.length >= 1) {
-        tags = [...tags, ...tempTags]
+        tags = [...tags, ...tempTags];
       }
     }
-  })
-  return tags
+  });
+  return tags;
 }
 function initTags() {
   const res = filterAffixTags(routes.value);
@@ -171,19 +181,19 @@ function initTags() {
   for (const tag of res) {
     // Must have tag name
     if (tag.name) {
-       useTagsViewStore().addVisitedView(tag)
+      useTagsViewStore().addVisitedView(tag);
     }
   }
 }
 function addTags() {
-  const { name } = route
+  const { name } = route;
   if (name) {
-    useTagsViewStore().addView(route)
+    useTagsViewStore().addView(route);
     if (route.meta.link) {
       useTagsViewStore().addIframeView(route);
     }
   }
-  return false
+  return false;
 }
 function moveToCurrentTag() {
   nextTick(() => {
@@ -192,118 +202,118 @@ function moveToCurrentTag() {
         scrollPaneRef.value.moveToTarget(r);
         // when query is different then update
         if (r.fullPath !== route.fullPath) {
-          useTagsViewStore().updateVisitedView(route)
+          useTagsViewStore().updateVisitedView(route);
         }
       }
     }
-  })
+  });
 }
 function refreshSelectedTag(view) {
-     console.log("latestViewall11www1770",view)
   proxy.$tab.refreshPage(view);
   if (route.meta.link) {
     useTagsViewStore().delIframeView(route);
   }
 }
 function closeSelectedTag(view) {
-   console.log("latestViewall11www177",view)
   proxy.$tab.closePage(view).then(({ visitedViews }) => {
     if (isActive(view)) {
-      toLastView(visitedViews, view)
+      toLastView(visitedViews, view);
     }
-  })
+  });
 }
 function closeRightTags() {
-    console.log("latestViewall11www1",selectedTag.value,3)
-  proxy.$tab.closeRightPage(selectedTag.value).then(visitedViews => {
-    if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
-      toLastView(visitedViews)
+  proxy.$tab.closeRightPage(selectedTag.value).then((visitedViews) => {
+    if (!visitedViews.find((i) => i.fullPath === route.fullPath)) {
+      toLastView(visitedViews);
     }
-  })
+  });
 }
 function closeLeftTags() {
-      console.log("latestViewall11177",selectedTag.value,11)
-  proxy.$tab.closeLeftPage(selectedTag.value).then(visitedViews => {
-    if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
-      toLastView(visitedViews)
+  proxy.$tab.closeLeftPage(selectedTag.value).then((visitedViews) => {
+    if (!visitedViews.find((i) => i.fullPath === route.fullPath)) {
+      toLastView(visitedViews);
     }
-  })
+  });
 }
 function closeOthersTags() {
-    console.log("latestViewall111",selectedTag.value,view)
-  router.push(selectedTag.value).catch(() => { });
+  router.push(selectedTag.value).catch(() => {});
   proxy.$tab.closeOtherPage(selectedTag.value).then(() => {
-    moveToCurrentTag()
-  })
+    moveToCurrentTag();
+  });
 }
 function closeAllTags(view) {
-   console.log("latestViewall",visitedViews,view)
   proxy.$tab.closeAllPage().then(({ visitedViews }) => {
-    if (affixTags.value.some(tag => tag.path === route.path)) {
-      return
+    if (affixTags.value.some((tag) => tag.path === route.path)) {
+      return;
     }
-    toLastView(visitedViews, view)
-  })
+    toLastView(visitedViews, view);
+  });
 }
 function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0]
-  console.log(latestView,"latestView",visitedViews,view)
-  if(view.name== "TransferManagent"){ //调拨单据号删除
-    sessionStorage.setItem('busNo',"")
-  }  
-  if(view.name== "BatchTransfer"){ //批量调拨单据号删除
-    sessionStorage.setItem('busNopl',"")
-  }  
-  if(view.name== "RequisitionManagement"){ //领用单据号删除
-    sessionStorage.setItem('busNoLY',"")
-  }  
-  if(view.name== "ReturningInventory"){ //领用退货单据号删除
-    sessionStorage.setItem('busNoLYTH',"")
-  } 
-  if(view.name== "LossReportingManagement"){ //报损单据号删除
-    sessionStorage.setItem('busNoBS',"")
-  } 
-  if(view.name== "ChkstockPart"){ //盘点单据号删除
-    sessionStorage.setItem('busNopd',"")
-  } 
-  if(view.name== "ChkstockBatch"){ //批量盘点单据号删除
-    sessionStorage.setItem('busNoplpd',"")
-  } 
+  const latestView = visitedViews.slice(-1)[0];
+  if (view.name == 'TransferManagent') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNo', '');
+  }
+  if (view.name == 'BatchTransfer') {
+    //批量调拨单据号删除
+    sessionStorage.setItem('busNopl', '');
+  }
+  if (view.name == 'RequisitionManagement') {
+    //领用单据号删除
+    sessionStorage.setItem('busNoLY', '');
+  }
+  if (view.name == 'ReturningInventory') {
+    //领用退货单据号删除
+    sessionStorage.setItem('busNoLYTH', '');
+  }
+  if (view.name == 'LossReportingManagement') {
+    //报损单据号删除
+    sessionStorage.setItem('busNoBS', '');
+  }
+  if (view.name == 'ChkstockPart') {
+    //盘点单据号删除
+    sessionStorage.setItem('busNopd', '');
+  }
+  if (view.name == 'ChkstockBatch') {
+    //批量盘点单据号删除
+    sessionStorage.setItem('busNoplpd', '');
+  }
   if (latestView) {
-    router.push(latestView.fullPath)
+    router.push(latestView.fullPath);
   } else {
     // now the default is to redirect to the home page if there is no tags-view,
     // you can adjust it according to your needs.
     if (view.name === 'Dashboard') {
       // to reload home page
-      router.replace({ path: '/redirect' + view.fullPath })
-    }else {
-      router.push('/')
+      router.replace({ path: '/redirect' + view.fullPath });
+    } else {
+      router.push('/');
     }
   }
 }
 function openMenu(tag, e) {
-  const menuMinWidth = 105
-  const offsetLeft = proxy.$el.getBoundingClientRect().left // container margin left
-  const offsetWidth = proxy.$el.offsetWidth // container width
-  const maxLeft = offsetWidth - menuMinWidth // left boundary
-  const l = e.clientX - offsetLeft + 15 // 15: margin right
+  const menuMinWidth = 105;
+  const offsetLeft = proxy.$el.getBoundingClientRect().left; // container margin left
+  const offsetWidth = proxy.$el.offsetWidth; // container width
+  const maxLeft = offsetWidth - menuMinWidth; // left boundary
+  const l = e.clientX - offsetLeft + 15; // 15: margin right
 
   if (l > maxLeft) {
-    left.value = maxLeft
+    left.value = maxLeft;
   } else {
-    left.value = l
+    left.value = l;
   }
 
-  top.value = e.clientY
-  visible.value = true
-  selectedTag.value = tag
+  top.value = e.clientY;
+  visible.value = true;
+  selectedTag.value = tag;
 }
 function closeMenu() {
-  visible.value = false
+  visible.value = false;
 }
 function handleScroll() {
-  closeMenu()
+  closeMenu();
 }
 </script>
 
@@ -339,7 +349,7 @@ function handleScroll() {
         color: #fff;
         border-color: #42b983;
         &::before {
-          content: "";
+          content: '';
           background: #fff;
           display: inline-block;
           width: 8px;
diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js
index ee4c1691..f7d266e8 100644
--- a/openhis-ui-vue3/src/main.js
+++ b/openhis-ui-vue3/src/main.js
@@ -3,6 +3,7 @@ import { createApp } from 'vue'
 import Cookies from 'js-cookie'
 
 import ElementPlus from 'element-plus'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 import 'element-plus/dist/index.css'
 import locale from 'element-plus/es/locale/lang/zh-cn'
 
@@ -15,7 +16,7 @@ import directive from './directive' // directive
 
 // 注册指令
 import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import { download, downloadGet } from '@/utils/request'
 
 // svg图标
 import 'virtual:svg-icons-register'
@@ -27,6 +28,8 @@ import './permission' // permission control
 import { useDict } from '@/utils/dict'
 import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels} from '@/utils/openhis'
 
+import { formatDateStr } from '@/utils/index';
+
 // 分页组件
 import Pagination from '@/components/Pagination'
 // 自定义表格工具组件
@@ -61,12 +64,14 @@ if(chrome.webview !== undefined) {
 // 全局方法挂载
 app.config.globalProperties.useDict = useDict
 app.config.globalProperties.download = download
+app.config.globalProperties.downloadGet = downloadGet
 app.config.globalProperties.parseTime = parseTime
 app.config.globalProperties.resetForm = resetForm
 app.config.globalProperties.handleTree = handleTree
 app.config.globalProperties.addDateRange = addDateRange
 app.config.globalProperties.selectDictLabel = selectDictLabel
 app.config.globalProperties.selectDictLabels = selectDictLabels
+app.config.globalProperties.formatDateStr = formatDateStr
 
 // 全局挂载请求实例
 app.config.globalProperties.$http = request
@@ -91,7 +96,7 @@ directive(app)
 ElDialog.props.closeOnClickModal.default = false;
 // 使用element-plus 并且设置全局的大小
 app.use(ElementPlus, {
-  locale: locale,
+  locale: zhCn,
   // 支持 large、default、small
   size: Cookies.get('size') || 'default'
 })
diff --git a/openhis-ui-vue3/src/router/index.js b/openhis-ui-vue3/src/router/index.js
index aaa4be90..64ebbc71 100644
--- a/openhis-ui-vue3/src/router/index.js
+++ b/openhis-ui-vue3/src/router/index.js
@@ -1,6 +1,6 @@
-import { createWebHistory, createRouter } from 'vue-router'
+import { createWebHistory, createRouter } from 'vue-router';
 /* Layout */
-import Layout from '@/layout'
+import Layout from '@/layout';
 
 /**
  * Note: 路由配置项
@@ -34,24 +34,29 @@ export const constantRoutes = [
     children: [
       {
         path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect/index.vue')
-      }
-    ]
+        component: () => import('@/views/redirect/index.vue'),
+      },
+    ],
   },
   {
     path: '/login',
     component: () => import('@/views/login'),
-    hidden: true
+    hidden: true,
   },
   {
     path: '/register',
     component: () => import('@/views/register'),
-    hidden: true
+    hidden: true,
+  },
+  {
+    path: '/:pathMatch(.*)*',
+    component: () => import('@/views/error/404'),
+    hidden: true,
   },
   {
     path: '/401',
     component: () => import('@/views/error/401'),
-    hidden: true
+    hidden: true,
   },
   {
     path: '',
@@ -62,10 +67,11 @@ export const constantRoutes = [
         path: '/index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+        meta: { title: '首页', icon: 'dashboard', affix: true },
+      },
+    ],
   },
+
   {
     path: '/user',
     component: Layout,
@@ -76,6 +82,11 @@ export const constantRoutes = [
         path: 'profile',
         component: () => import('@/views/system/user/profile/index'),
         name: 'Profile',
+        meta: { title: '个人中心', icon: 'user' },
+      },
+    ],
+  },
+];
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
@@ -234,6 +245,9 @@ export const constantRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setUser'),
         name: 'SetUser',
+        meta: { title: '所属用户', activeMenu: '/system/basicmanage/tenant' },
+      },
+    ],
         meta: { title: '所属用户', activeMenu: '/system/tenant' }
       }
     ]
@@ -248,6 +262,9 @@ export const constantRoutes = [
         path: 'set/:tenantId(\\d+)',
         component: () => import('@/views/system/tenant/setContract'),
         name: 'SetContract',
+        meta: { title: '合同管理', activeMenu: '/system/basicmanage/tenant' },
+      },
+    ],
         meta: { title: '合同管理', activeMenu: '/system/tenant' }
       }
     ]
@@ -262,9 +279,9 @@ export const constantRoutes = [
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole'),
         name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
-      }
-    ]
+        meta: { title: '分配角色', activeMenu: '/system/user' },
+      },
+    ],
   },
   {
     path: '/system/role-auth',
@@ -276,9 +293,9 @@ export const constantRoutes = [
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser'),
         name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
-      }
-    ]
+        meta: { title: '分配用户', activeMenu: '/system/role' },
+      },
+    ],
   },
   {
     path: '/system/dict-data',
@@ -290,9 +307,9 @@ export const constantRoutes = [
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data'),
         name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
-      }
-    ]
+        meta: { title: '字典数据', activeMenu: '/system/dict' },
+      },
+    ],
   },
   {
     path: '/monitor',
@@ -346,9 +363,9 @@ export const constantRoutes = [
         path: 'index/:jobId(\\d+)',
         component: () => import('@/views/monitor/job/log'),
         name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
+        meta: { title: '调度日志', activeMenu: '/monitor/job' },
+      },
+    ],
   },
   {
     path: '/tool/gen-edit',
@@ -360,6 +377,11 @@ export const constantRoutes = [
         path: 'index/:tableId(\\d+)',
         component: () => import('@/views/tool/gen/editTable'),
         name: 'GenEdit',
+        meta: { title: '修改生成配置', activeMenu: '/tool/gen' },
+      },
+    ],
+  },
+];
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
@@ -381,9 +403,9 @@ const router = createRouter({
   routes: allRoutes,
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
-      return savedPosition
+      return savedPosition;
     } else {
-      return { top: 0 }
+      return { top: 0 };
     }
   },
 });
diff --git a/openhis-ui-vue3/src/store/modules/user.js b/openhis-ui-vue3/src/store/modules/user.js
index c8f0feb2..a19e941c 100644
--- a/openhis-ui-vue3/src/store/modules/user.js
+++ b/openhis-ui-vue3/src/store/modules/user.js
@@ -19,6 +19,7 @@ const useUserStore = defineStore(
       roles: [],
       permissions: [],
       tenantId: '',
+      hospitalName:'',
       status: '' // 用户状态：0-启用(管理员), 1-禁用(普通人员)
     }),
     actions: {
@@ -53,6 +54,7 @@ const useUserStore = defineStore(
             } else {
               this.roles = ['ROLE_DEFAULT']
             }
+            // console.log('user info:', user);
             this.id = user.userId
             this.name = user.userName // 用户账号（对应数据库的user_name字段，如'admin'）
             this.orgId = user.orgId
@@ -61,6 +63,8 @@ const useUserStore = defineStore(
             this.practitionerId = res.practitionerId
             this.fixmedinsCode = res.optionJson.fixmedinsCode
             this.avatar = avatar
+            this.hospitalName = res.optionJson.hospitalName
+
             this.status = user.status // 保存用户状态
             resolve(res)
           }).catch(error => {
diff --git a/openhis-ui-vue3/src/store/store.js b/openhis-ui-vue3/src/store/store.js
index bc05d27b..144504e9 100644
--- a/openhis-ui-vue3/src/store/store.js
+++ b/openhis-ui-vue3/src/store/store.js
@@ -14,6 +14,7 @@ export const useStore = defineStore('current', {
     currentDataBS:null, //报损
     currentDataLYCK:null, //领用出库
     currentDataLYTK:null, //领用退库
+    remainingDays:null, //有效期天数
   }),
   actions: {
     setCurrentData(data) {
@@ -54,6 +55,9 @@ export const useStore = defineStore('current', {
     setCurrentDataLYTK(data) {
       this.currentDataLYTK = data
     },
+    setRemainingDays(data) {
+      this.remainingDays = data
+    },
     
     clearCurrentDataDBAll() {
       this.currentDataDBAll = null
@@ -92,6 +96,10 @@ export const useStore = defineStore('current', {
     },
     clearCurrentDataDB() {
       this.currentDataDB = null
-    }
+    },
+
+    clearRemainingDays() {
+      this.remainingDays = null
+    },
   }
 })
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/FallBedFallAssessment.vue b/openhis-ui-vue3/src/template/FallBedFallAssessment.vue
new file mode 100644
index 00000000..0d680f04
--- /dev/null
+++ b/openhis-ui-vue3/src/template/FallBedFallAssessment.vue
@@ -0,0 +1,897 @@
+<template>
+  <div>
+    <div class="business">
+      <el-table
+        :data="tableDataSource"
+        border
+        stripe
+        fit
+        :header-cell-style="{ background: '#f2f2f2', color: 'black' }"
+      >
+        <el-table-column prop="content.recordTime" label="记录时间" />
+        <el-table-column prop="content.totalScore" label="评估分数" />
+        <el-table-column prop="content.patientCareSessionsTableList" label="护理措施" />
+        <el-table-column prop="content.nurseSignature" label="责任护士" />
+        <el-table-column label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              plain
+              type="primary"
+              size="small"
+              @click="handleUpdate(scope.row)"
+              :disabled="admissionDataForm !== undefined"
+            >
+              编辑
+            </el-button>
+            <el-button
+              plain
+              type="danger"
+              size="small"
+              @click="handleDelete(scope.row)"
+              :disabled="admissionDataForm !== undefined"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div name="跌倒/坠床评估护理记录单" class="changeMajor" style="width: 99.9%">
+        <div>
+          <el-form ref="formRef" :model="form" style="width: 99.9%">
+            <el-form-item style="text-align: center">
+              <div
+                style="
+                  width: 100%;
+                  font-size: 14pt;
+                  color: black;
+                  text-align: center;
+                  font-weight: 600;
+                  line-height: 36px;
+                "
+              >
+                <span class="space">跌倒/坠床评估护理记录单</span>
+              </div>
+            </el-form-item>
+
+            <el-form-item label="日期：" class="changeMajorFromItem" style="width: 100%">
+              <el-row :span="20">
+                <el-col :span="8" style="padding-left: 0px !important">
+                  <el-form-item>
+                    <el-date-picker
+                      v-model="form.ZKDATE"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      format="YYYY-MM-DD    HH:mm:ss"
+                      style="width: 800px"
+                      :disabled="admissionDataForm !== undefined"
+                    />
+                    <!-- <span style="margin-left: 5px">时间：</span>
+                    <el-time-picker
+                      v-model="form.ZKTIME"
+                      placeholder="选择时间"
+                      value-format="HH:mm:ss"
+                      style="width: 40%"
+                      :disabled="admissionDataForm !== undefined"
+                    /> -->
+                  </el-form-item>
+                </el-col>
+                <el-col :span="5">
+                  <el-button
+                    v-if="!updateFlag"
+                    type="primary"
+                    size="medium"
+                    style="margin-left: 25px"
+                    @click="onSubmit"
+                  >
+                    新增记录
+                  </el-button>
+                  <el-button
+                    v-else
+                    type="primary"
+                    size="small"
+                    style="margin-left: 5px"
+                    @click="onSubmit"
+                  >
+                    保存记录
+                  </el-button>
+                </el-col>
+              </el-row>
+            </el-form-item>
+
+            <el-form-item style="padding-top: 10px; margin: 0px !important">
+              <el-table
+                :data="dangerData"
+                border
+                :span-method="handleSpan"
+                style="text-align: center"
+              >
+                <el-table-column
+                  v-for="column in dangerColumns"
+                  :key="column.key"
+                  :prop="column.key"
+                  :width="column.width"
+                  :label="column.title"
+                  align="center"
+                />
+                <el-table-column prop="id" label="选择" width="80" align="center">
+                  <template #default="{ row }">
+                    <el-checkbox v-model="row.checked" @change="handleDangerChange(row)" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+
+            <el-form-item
+              style="text-align: center; margin-bottom: 0px; padding: 0px"
+              class="changeMajorFromItem"
+            >
+              <el-row :span="24">
+                <el-col :span="24">
+                  <span style="font-size: large">总分：</span>
+                  <span>{{ totalScore }}</span>
+                </el-col>
+              </el-row>
+            </el-form-item>
+
+            <el-form-item style="padding-top: 10px">
+              <el-table
+                :data="nursingData"
+                border
+                :span-method="arraySpanMethod"
+                style="width: 100%"
+              >
+                <el-table-column
+                  v-for="column in nursingColumns"
+                  :key="column.key"
+                  :prop="column.key"
+                  :width="column.width"
+                  :label="column.title"
+                  align="center"
+                />
+                <el-table-column prop="id" label="选择" width="80" align="center">
+                  <template #default="{ row }">
+                    <el-checkbox v-model="row.checked" @change="handleNursingChange(row)" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+
+            <el-form-item
+              style="text-align: center; margin-bottom: 0px; padding: 0px"
+              class="changeMajorFromItem"
+            >
+              <el-row
+                :span="24"
+                style="display: flex; justify-content: center; align-items: center"
+              >
+                <div style="display: flex; align-items: center; gap: 10px">
+                  <span style="font-size: large; margin-left: 10vh">护士签字：</span>
+                  <el-input
+                    v-model="form.nurseSignature"
+                    style="width: 300px; padding: 8px"
+                    disabled
+                  />
+                </div>
+              </el-row>
+            </el-form-item>
+
+            <el-form-item>
+              <el-row :span="20">
+                <el-col :span="5">
+                  <span>备注：</span>
+                </el-col>
+              </el-row>
+              <el-form-item label-width="15px">
+                <ul class="instructions-list">
+                  <li v-for="(item, index) in instructions" :key="index">{{ item }}</li>
+                </ul>
+              </el-form-item>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineOptions({
+  name: 'FallBedFallAssessment',
+});
+import { ref, reactive, computed, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+
+// import { webapp_ws_ajax_run, urlAddRandomNo } from '@/utils/grwebapp';
+// import { useRoute, useRouter } from 'vue-router';
+
+// 响应式数据
+const route = useRoute();
+const router = useRouter();
+
+const queryRef = ref();
+const formRef = ref();
+
+const wardCode = ref('');
+const patientId = ref('');
+const visitId = ref('');
+const type = '跌倒/坠床评估护理记录单';
+const updateFlag = ref(false);
+const info = ref('返回信息');
+const updateId = ref('');
+const tableDataSource = ref([]);
+const content = ref({});
+const totalScore = ref(0);
+const lastSubmit = ref('');
+const admissionDataForm = ref(route.params.admissionData);
+
+const form = reactive({
+  ZKDATE: '',
+  ZKTIME: '',
+  recordTime: '',
+  totalScore: 0,
+  bedFallRiskAssessmentList: [],
+  nurseSignature: '',
+  patientCareSessionsCheckedList: [],
+});
+
+// 危险因素表格列
+const dangerColumns = [
+  {
+    key: 'content',
+    title: '内容',
+    width: '100',
+  },
+  {
+    key: 'project',
+    title: '项目',
+  },
+  {
+    key: 'evalContent',
+    title: '评定内容',
+  },
+  {
+    key: 'score',
+    title: '分数',
+  },
+];
+
+// 危险因素数据 - 使用ref确保响应性
+const dangerData = ref([
+  {
+    id: '1',
+    content: '危险因素',
+    project: '年龄',
+    evalContent: '≥80周岁',
+    score: 5,
+    checked: false,
+  },
+  { id: '2', content: '', evalContent: '≤3周岁，≥3个月', score: 5, checked: false },
+  { id: '3', content: '', evalContent: '>70周岁', score: 3, checked: false },
+  { id: '4', content: '', evalContent: '≤5周岁', score: 5, checked: false },
+  { id: '5', project: '既往史', evalContent: '跌倒史', score: 1, checked: false },
+  { id: '6', evalContent: '坠床史', score: 2, checked: false },
+  { id: '7', evalContent: '癫痫史', score: 2, checked: false },
+  { id: '8', project: '意识状态', evalContent: '嗜睡', score: 2, checked: false },
+  { id: '9', evalContent: '意识模糊', score: 2, checked: false },
+  { id: '10', evalContent: '谵妄', score: 3, checked: false },
+  { id: '11', evalContent: '躁动', score: 3, checked: false },
+  { id: '12', project: '感官因素', evalContent: '头晕', score: 4, checked: false },
+  { id: '13', evalContent: '听力障碍', score: 2, checked: false },
+  { id: '14', evalContent: '视力障碍', score: 2, checked: false },
+  {
+    id: '15',
+    project: '肢体活动',
+    evalContent: '关节僵硬、变形、疼痛',
+    score: 1,
+    checked: false,
+  },
+  { id: '16', evalContent: '借助器械', score: 2, checked: false },
+  { id: '17', evalContent: '肢体偏瘫', score: 3, checked: false },
+  { id: '18', evalContent: '肌肉震颤麻痹', score: 3, checked: false },
+  { id: '19', evalContent: '体质虚弱、乏力', score: 1, checked: false },
+  { id: '20', evalContent: '尿频、尿急', score: 1, checked: false },
+  { id: '21', evalContent: '腹泻、便秘', score: 2, checked: false },
+  { id: '22', project: '药物因素', evalContent: '散瞳剂', score: 1, checked: false },
+  { id: '23', evalContent: '降压药', score: 1, checked: false },
+  { id: '24', evalContent: '降糖药', score: 1, checked: false },
+  { id: '25', evalContent: '镇静安眠药', score: 2, checked: false },
+  { id: '26', evalContent: '镇痛抗癫痫', score: 2, checked: false },
+  { id: '27', evalContent: '麻醉止痛剂', score: 2, checked: false },
+]);
+
+// 护理措施表格列
+const nursingColumns = [
+  {
+    key: 'content',
+    width: '100',
+    title: '',
+  },
+  {
+    key: 'project',
+    title: '内容',
+  },
+];
+
+// 护理措施数据 - 使用ref确保响应性
+const nursingData = ref([
+  {
+    id: '1',
+    content: '护理措施',
+    project: '告知患者及家属可能导致跌倒、坠床的原因，并采取相应防范措施',
+    checked: false,
+  },
+  { id: '2', project: '悬挂预防跌倒、坠床标识，必要时班班交接', checked: false },
+  { id: '3', project: '患者日常用物放于可及处', checked: false },
+  { id: '4', project: '将呼叫器放于可及处，提醒患者下床时若有必要寻求帮助', checked: false },
+  { id: '5', project: '依据风险程度，必要时专人陪住', checked: false },
+  { id: '6', project: '保持地面无水渍、障碍物，病室及活动区域灯光充足', checked: false },
+  { id: '7', project: '指导患者穿长短合适的衣裤及防滑鞋', checked: false },
+  { id: '8', project: '适当使用床栏或约束带', checked: false },
+]);
+
+// 说明信息
+const instructions = [
+  '1.评估对象：新入患者、术后患者、有病情变化时必须评估；',
+  '2.评分<5分，低度风险，无需连续评估，无需采取预防措施；',
+  '3.评分≥5，高度风险，每周至少评估一次，需采取适宜的预防措施，同时填写《预防患者跌倒/坠床知情告知书》',
+];
+
+// 计算属性
+const calculate = computed(() => {
+  return dangerData.value
+    .filter((option) => option.checked)
+    .reduce((total, option) => total + option.score, 0);
+});
+
+const isFormEmpty = computed(() => {
+  return (
+    form.ZKDATE === '' && form.ZKTIME === '' && form.recordTime === '' && form.nurseSignature === ''
+  );
+});
+
+// 方法 - 不再需要handleData方法，通过表单输入和按钮加载数据
+
+const handleDangerChange = (row) => {
+  totalScore.value = calculate.value;
+  form.bedFallRiskAssessmentList = dangerData.value
+    .filter((item) => item.checked)
+    .map((item) => item.id);
+};
+
+const handleNursingChange = (row) => {
+  form.patientCareSessionsCheckedList = nursingData.value
+    .filter((item) => item.checked)
+    .map((item) => item.id);
+};
+
+const init = async () => {
+  // 使用模拟数据，不再调用后端API
+  try {
+    console.log('使用模拟数据初始化表格');
+
+    // 生成一些模拟数据
+    const mockData = [
+      {
+        id: '1',
+        content: {
+          ZKDATE: '2023-01-15',
+          ZKTIME: '09:30:00',
+          recordTime: '2023-01-15 09:30:00',
+          totalScore: 8,
+          bedFallRiskAssessmentList: ['1', '5', '12'],
+          nurseSignature: '张护士',
+          patientCareSessionsCheckedList: ['1', '2', '3'],
+          patientCareSessionsTableList: '1,2,3',
+        },
+      },
+      {
+        id: '2',
+        content: {
+          ZKDATE: '2023-01-20',
+          ZKTIME: '14:20:00',
+          recordTime: '2023-01-20 14:20:00',
+          totalScore: 5,
+          bedFallRiskAssessmentList: ['3', '11'],
+          nurseSignature: '李护士',
+          patientCareSessionsCheckedList: ['1', '4'],
+          patientCareSessionsTableList: '1,4',
+        },
+      },
+    ];
+
+    tableDataSource.value = [];
+    if (mockData && mockData.length > 0) {
+      mockData.forEach((item) => {
+        tableDataSource.value.push(item);
+      });
+
+      if (admissionDataForm.value !== undefined) {
+        const rowData = tableDataSource.value.filter(
+          (item) => item.content.recordTime === JSON.parse(admissionDataForm.value).assessmentDate
+        );
+
+        if (rowData.length > 0) {
+          handleUpdate(rowData[0]);
+        }
+      }
+    } else {
+      tableDataSource.value = [];
+      reset();
+    }
+
+    ElMessage.success('模拟数据加载成功');
+  } catch (error) {
+    console.error('初始化失败:', error);
+  }
+};
+
+const handleSpan = ({ row, column, rowIndex, columnIndex }) => {
+  if (columnIndex === 0) {
+    if (rowIndex === 0) {
+      return [dangerData.value.length, 1];
+    } else if (rowIndex > 0 && rowIndex < 27) {
+      return [0, 0];
+    }
+    if (rowIndex === 27) {
+      return [1, 4];
+    }
+  }
+  if (columnIndex === 1) {
+    if (rowIndex === 0) {
+      return [4, 1];
+    } else if (rowIndex > 0 && rowIndex < 4) {
+      return [0, 0];
+    }
+    if (rowIndex === 4) {
+      return [3, 1];
+    } else if (rowIndex > 0 && rowIndex < 7) {
+      return [0, 0];
+    }
+    if (rowIndex === 7) {
+      return [4, 1];
+    } else if (rowIndex > 0 && rowIndex < 11) {
+      return [0, 0];
+    }
+    if (rowIndex === 11) {
+      return [3, 1];
+    } else if (rowIndex > 0 && rowIndex < 14) {
+      return [0, 0];
+    }
+    if (rowIndex === 14) {
+      return [7, 1];
+    } else if (rowIndex > 0 && rowIndex < 21) {
+      return [0, 0];
+    }
+    if (rowIndex === 21) {
+      return [6, 1];
+    } else if (rowIndex > 0 && rowIndex < 27) {
+      return [0, 0];
+    }
+  }
+  return [1, 1];
+};
+
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+  // 护理措施
+  if (columnIndex === 0) {
+    if (rowIndex === 0) {
+      return [nursingData.value.length, 1];
+    } else if (rowIndex > 0 && rowIndex < 8) {
+      return [0, 0];
+    }
+    // 护士签名
+    if (rowIndex === 8) {
+      return [1, 2];
+    }
+  }
+  return [1, 1];
+};
+
+const onSubmit = async () => {
+  // 检查上次提交时间
+  if (lastSubmit.value && new Date() - lastSubmit.value < 2000) {
+    ElMessage.error('禁止重复提交！');
+    return;
+  }
+
+  // 更新上次提交时间
+  lastSubmit.value = new Date();
+
+  // 时间处理
+  if (form.ZKDATE) {
+    form.recordTime = form.ZKDATE;
+  }
+  if (form.ZKTIME) {
+    form.recordTime = form.ZKTIME;
+  }
+
+  if (form.ZKDATE && form.ZKTIME) {
+    form.recordTime = form.ZKDATE + ' ' + form.ZKTIME;
+  }
+
+  form.recordTime ? new Date(form.recordTime) : null;
+
+  if (isFormEmpty.value) {
+    ElMessage.error('请填写跌倒/坠床评估护理记录单后再进行操作');
+  } else {
+    form.totalScore = totalScore.value;
+
+    // 模拟保存数据，不再调用后端API
+    console.log('保存的数据:', form);
+
+    if (updateFlag.value) {
+      // 模拟更新操作
+      const updatedIndex = tableDataSource.value.findIndex((item) => item.id === updateId.value);
+      if (updatedIndex !== -1) {
+        tableDataSource.value[updatedIndex].content = { ...form };
+      }
+      ElMessage.success('模拟更新成功');
+    } else {
+      // 模拟新增操作
+      const newRecord = {
+        id: Date.now().toString(),
+        content: { ...form },
+      };
+      tableDataSource.value.unshift(newRecord);
+      ElMessage.success('模拟新增成功');
+    }
+
+    if (admissionDataForm.value !== undefined) {
+      const admissionDataBack = JSON.parse(admissionDataForm.value);
+      admissionDataBack.project2 = totalScore.value;
+
+      if (route.params.updateId !== undefined) {
+        router.push({
+          name: 'admissionEvaluation',
+          params: {
+            admissionData: JSON.stringify(admissionDataBack),
+            updateId: route.params.updateId,
+          },
+        });
+      } else {
+        router.push({
+          name: 'admissionEvaluation',
+          params: { admissionData: JSON.stringify(admissionDataBack) },
+        });
+      }
+    }
+
+    reset();
+  }
+};
+
+const handleUpdate = (row) => {
+  const loginUser = JSON.parse(window.localStorage.getItem('loginUser'));
+
+  if (
+    row.content.nurseSignature !== loginUser.userName &&
+    window.localStorage.getItem('editFlg') === '0'
+  ) {
+    window.confirm('没有操作该数据的权限！');
+  } else {
+    reset();
+    updateFlag.value = true;
+
+    // 深拷贝数据
+    Object.assign(form, JSON.parse(JSON.stringify(row.content)));
+    totalScore.value = row.content.totalScore;
+
+    // 评估项目
+    dangerData.forEach((item) => {
+      item.checked = form.bedFallRiskAssessmentList.includes(item.id);
+    });
+
+    nursingData.forEach((item) => {
+      item.checked = form.patientCareSessionsCheckedList.includes(item.id);
+    });
+
+    updateId.value = row.id;
+  }
+};
+
+const reset = () => {
+  Object.assign(form, {
+    ZKDATE: '',
+    ZKTIME: '',
+    recordTime: '',
+    totalScore: 0,
+    bedFallRiskAssessmentList: [],
+    nurseSignature: '',
+    patientCareSessionsCheckedList: [],
+  });
+
+  // 初始化评估项目
+  dangerData.forEach((session) => {
+    session.checked = false;
+  });
+
+  // 初始化护理措施
+  nursingData.forEach((session) => {
+    session.checked = false;
+  });
+
+  totalScore.value = 0;
+  updateId.value = '';
+  updateFlag.value = false;
+
+  if (admissionDataForm.value !== undefined) {
+    const [date, time] = JSON.parse(admissionDataForm.value).assessmentDate.split(' ');
+    form.ZKDATE = date;
+    form.ZKTIME = time;
+  }
+};
+
+const handleDelete = (row) => {
+  const loginUser = JSON.parse(window.localStorage.getItem('loginUser'));
+
+  if (
+    row.content.nurseSignature !== loginUser.userName &&
+    window.localStorage.getItem('editFlg') === '0'
+  ) {
+    window.confirm('没有操作该数据的权限！');
+  } else {
+    reset();
+
+    // 模拟删除操作，不再调用后端API
+    const index = tableDataSource.value.findIndex((item) => item.id === row.id);
+    if (index !== -1) {
+      tableDataSource.value.splice(index, 1);
+      updateFlag.value = false;
+      ElMessage.success('模拟删除成功');
+    } else {
+      ElMessage.error('删除失败');
+    }
+  }
+};
+
+const dc_ajax_preview = () => {
+  var args = {
+    report: urlAddRandomNo('./grf/NurseRecord_Pressure_208.grf'),
+    data: transformData(),
+    type: 'preview',
+  };
+
+  webapp_ws_ajax_run(args);
+};
+
+const transformData = () => {
+  const jsonDate = [...tableDataSource.value];
+
+  jsonDate.forEach((element) => {
+    element.content.bedFallRiskAssessmentList.forEach((i) => {
+      switch (i) {
+        case '1':
+          element.FS1 = '√';
+          break;
+        case '2':
+          element.FS2 = '√';
+          break;
+        case '3':
+          element.FS3 = '√';
+          break;
+        case '4':
+          element.FS4 = '√';
+          break;
+        case '5':
+          element.FS5 = '√';
+          break;
+        case '6':
+          element.FS6 = '√';
+          break;
+        case '7':
+          element.FS7 = '√';
+          break;
+        case '8':
+          element.FS8 = '√';
+          break;
+        case '9':
+          element.FS9 = '√';
+          break;
+        case '10':
+          element.FS10 = '√';
+          break;
+        case '11':
+          element.FS11 = '√';
+          break;
+        case '12':
+          element.FS12 = '√';
+          break;
+        case '13':
+          element.FS13 = '√';
+          break;
+        case '14':
+          element.FS14 = '√';
+          break;
+        case '15':
+          element.FS15 = '√';
+          break;
+        case '16':
+          element.FS16 = '√';
+          break;
+        case '17':
+          element.FS17 = '√';
+          break;
+        case '18':
+          element.FS18 = '√';
+          break;
+        case '19':
+          element.FS19 = '√';
+          break;
+        case '20':
+          element.FS20 = '√';
+          break;
+        case '21':
+          element.FS21 = '√';
+          break;
+        case '22':
+          element.FS22 = '√';
+          break;
+        case '23':
+          element.FS23 = '√';
+          break;
+        case '24':
+          element.FS24 = '√';
+          break;
+        case '25':
+          element.FS25 = '√';
+          break;
+        case '26':
+          element.FS26 = '√';
+          break;
+        case '27':
+          element.FS27 = '√';
+          break;
+      }
+    });
+
+    element.countsum = element.content.totalScore;
+    element.RQ = element.content.ZKDATE;
+    element.SJ = element.content.ZKTIME;
+    element.recordTime = element.content.ZKDATE + ' ' + element.content.ZKTIME;
+    element.SIGN = element.content.nurseSignature;
+
+    element.content.patientCareSessionsCheckedList.forEach((i) => {
+      switch (i) {
+        case '1':
+          element.HL1 = '√';
+          break;
+        case '2':
+          element.HL2 = '√';
+          break;
+        case '3':
+          element.HL3 = '√';
+          break;
+        case '4':
+          element.HL4 = '√';
+          break;
+        case '5':
+          element.HL5 = '√';
+          break;
+        case '6':
+          element.HL6 = '√';
+          break;
+        case '7':
+          element.HL7 = '√';
+          break;
+        case '8':
+          element.HL8 = '√';
+          break;
+      }
+    });
+  });
+
+  if (jsonDate.length == 0) {
+    jsonDate[0] = {};
+  }
+
+  jsonDate[0].RYRQ = patientInfo.value.admissionDateTime;
+  jsonDate[0].KS = patientInfo.value.deptName;
+  jsonDate[0].CH = patientInfo.value.bedLabel;
+  jsonDate[0].name = patientInfo.value.name;
+  jsonDate[0].sex = patientInfo.value.sex;
+  jsonDate[0].AGE = patientInfo.value.age;
+  jsonDate[0].ZYH = patientInfo.value.patientIdAndVisitId;
+  jsonDate[0].ZD = patientInfo.value.diagnosis;
+
+  const transformedData = {
+    master: jsonDate,
+  };
+
+  return transformedData;
+};
+
+// 生命周期钩子
+onMounted(() => {
+  try {
+    // 安全获取用户信息
+    let loginUser = {};
+    const userStr = window.localStorage.getItem('loginUser');
+    if (userStr) {
+      loginUser = JSON.parse(userStr);
+    }
+    form.nurseSignature = loginUser.userName || '测试护士';
+    wardCode.value = window.localStorage.getItem('wardInfo') || '';
+    admissionDataForm.value = route.params.admissionData;
+
+    // 自动初始化表格数据，不再依赖患者ID参数
+    // 延迟执行，确保所有数据都已初始化
+    setTimeout(() => {
+      init();
+    }, 100);
+  } catch (error) {
+    console.error('初始化错误:', error);
+    // 即使出错也要初始化表格，显示默认数据
+    setTimeout(() => {
+      init();
+    }, 100);
+  }
+});
+</script>
+
+<style scoped>
+.business {
+  background: white;
+  border-radius: 5px;
+  padding: 10px 16px;
+  height: calc(100vh - var(--barHeight) * 1px - 50px);
+  overflow: auto;
+  display: grid;
+  grid-row-gap: 16px;
+
+  .changeMajor {
+    border: 2px solid gray;
+    padding: 20px;
+    border-radius: 5px;
+  }
+
+  .changeMajorFromItem {
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    padding: 5px;
+    margin-bottom: 1px;
+  }
+
+  .tableBorder {
+    border: 1px solid #ebeef5;
+  }
+
+  .tableBorderRight {
+    border-right: 1px solid #ebeef5;
+  }
+
+  .tableBorderRightBottom {
+    border-right: 1px solid #ebeef5;
+    border-bottom: 1px solid #ebeef5;
+  }
+
+  .tableBorderBottom {
+    border-bottom: 1px solid #ebeef5;
+  }
+
+  .el-textarea {
+    overflow-y: auto;
+    min-height: 50px;
+    max-height: 300px;
+  }
+
+  .bed-no-label {
+    padding-right: 10px;
+  }
+
+  .title-inline {
+    display: inline-block;
+  }
+
+  .arrowhead {
+    margin-left: 6px;
+    font-size: 15px;
+    padding: 5px 10px;
+  }
+
+  .el-form-item {
+    margin-bottom: 0px !important;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/HospitalRecordForm.vue b/openhis-ui-vue3/src/template/HospitalRecordForm.vue
similarity index 83%
rename from openhis-ui-vue3/src/views/hospitalRecord/HospitalRecordForm.vue
rename to openhis-ui-vue3/src/template/HospitalRecordForm.vue
index 38cff998..ff8eba3c 100644
--- a/openhis-ui-vue3/src/views/hospitalRecord/HospitalRecordForm.vue
+++ b/openhis-ui-vue3/src/template/HospitalRecordForm.vue
@@ -7,7 +7,9 @@
       <el-tab-pane label="病案首页(二)" name="second">
         <medicalRecordSecond :formData="formData"></medicalRecordSecond>
       </el-tab-pane>
-      <el-tab-pane label="病案附页(一)" name="third"></el-tab-pane>
+      <el-tab-pane label="病案附页(一)" name="third">
+        <medicalRecordThird :formData="formData"></medicalRecordThird>
+      </el-tab-pane>
     </el-tabs>
 
     <div class="form-footer">
@@ -18,10 +20,17 @@
 </template>
 
 <script setup>
+defineOptions({
+  name: 'HospitalRecordForm',
+});
 import { ref, reactive } from 'vue';
-import medicalRecordFirst from './components/medicalRecordFirst.vue';
-import medicalRecordSecond from './components/medicalRecordSecond.vue';
-import medicalRecordFirstPrint from './components/medicalRecordFirstPrint.json';
+// import medicalRecordFirst from './components/medicalRecordFirst.vue';
+import medicalRecordFirst from '@/views/hospitalRecord/components/medicalRecordFirst.vue';
+import medicalRecordSecond from '@/views/hospitalRecord/components/medicalRecordSecond.vue';
+import medicalRecordThird from '@/views/hospitalRecord/components/medicalRecordThird.vue';
+import medicalRecordFirstPrint from '@/views/hospitalRecord/components/medicalRecordFirstPrint.json';
+import medicalRecordSecondPrint from '@/views/hospitalRecord/components/medicalRecordSecondPrint.json';
+import medicalRecordThirdPrint from '@/views/hospitalRecord/components/medicalRecordThirdPrint.json';
 
 // 表单数据
 const formData = reactive({
@@ -95,16 +104,15 @@ const printForm = () => {
   if(activeName.value == 'first') {
     printContent = medicalRecordFirstPrint.printContent;
   }else if(activeName.value == 'second') {
-
+    printContent = medicalRecordSecondPrint.printContent;
   }else {
-
+    printContent = medicalRecordThirdPrint.printContent;
   }
   // 这里可以进行实际的数据替换操作
   printContent = printContent.replace(/\$\{([^}]+)\}/g, (match, expr) => {
     // 简单示例：实际应根据expr内容进行数据提取
     return eval(expr); // 注意：实际使用中应避免eval，这里仅为示例
   });
-  
   // 将内容写入打印窗口并打印
   printWindow.document.write(printContent);
   printWindow.document.close();
@@ -139,9 +147,10 @@ const resetForm = () => {
 </script>
 
 <style scoped>
+/*max-width: 1000px;*/
 .hospital-record-form {
   font-family: 'SimSun', serif;
-  max-width: 1000px;
+  width: 100%;
   margin: 0 auto;
   padding: 20px;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
diff --git a/openhis-ui-vue3/src/template/inHospitalRecord.vue b/openhis-ui-vue3/src/template/inHospitalRecord.vue
new file mode 100644
index 00000000..c5c542fb
--- /dev/null
+++ b/openhis-ui-vue3/src/template/inHospitalRecord.vue
@@ -0,0 +1,828 @@
+<template>
+  <div class="medical-form">
+    <h2 style="text-align: center;">{{ userStore.hospitalName || '长春市朝阳区中医院' }} -入院记录</h2>
+    
+    <!-- 滚动内容区域 -->
+    <div class="form-scroll-container">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="80px"
+        label-align="left"
+        class="medical-full-form"
+      >
+        <!-- 1. 基础信息区域（自适应两列布局） -->
+        <h4 class="section-title">基础信息</h4>
+        <div class="adaptive-grid form-section">
+          <el-form-item label="姓名" prop="patientName" class="grid-item required">
+            <el-input 
+              v-model="formData.patientName" 
+              placeholder="请输入姓名" 
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="住院号" prop="hospitalNo" class="grid-item required">
+            <el-input 
+              v-model="formData.hospitalNo" 
+              placeholder="请输入住院号" 
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="性别" prop="gender" class="grid-item required">
+            <el-select v-model="formData.gender" placeholder="请选择" style="width: 100%;">
+              <el-option label="男" value="男"></el-option>
+              <el-option label="女" value="女"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="年龄" prop="age" class="grid-item required">
+            <div class="input-with-unit">
+              <el-input 
+                v-model.number="formData.age" 
+                placeholder="请输入年龄" 
+                clearable
+              />
+              <span class="unit">岁</span>
+            </div>
+          </el-form-item>
+          <el-form-item label="民族" prop="nation" class="grid-item">
+            <el-input 
+              v-model="formData.nation" 
+              placeholder="请输入民族" 
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="职业" prop="occupation" class="grid-item">
+            <el-input 
+              v-model="formData.occupation" 
+              placeholder="请输入职业" 
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="婚姻状况" prop="marriage" class="grid-item">
+            <el-select v-model="formData.marriage" placeholder="请选择" clearable style="width: 100%;">
+              <el-option label="已婚" value="已婚"></el-option>
+              <el-option label="未婚" value="未婚"></el-option>
+              <el-option label="离异" value="离异"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出生地" prop="birthplace" class="grid-item">
+            <el-input 
+              v-model="formData.birthplace" 
+              placeholder="请输入出生地" 
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="入院时间" prop="admissionTime" class="grid-item required">
+            <el-date-picker 
+              v-model="formData.admissionTime" 
+              type="datetime" 
+              placeholder="选择入院时间" 
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%;"
+            />
+          </el-form-item>
+          <el-form-item label="记录时间" prop="recordTime" class="grid-item required">
+            <el-date-picker 
+              v-model="formData.recordTime" 
+              type="datetime" 
+              placeholder="选择记录时间" 
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%;"
+            />
+          </el-form-item>
+          <el-form-item label="病史陈述者" prop="historyReporter" class="grid-item">
+            <el-input 
+              v-model="formData.historyReporter" 
+              placeholder="请输入陈述者" 
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="可靠程度" prop="reliability" class="grid-item">
+            <el-select v-model="formData.reliability" placeholder="请选择" style="width: 100%;">
+              <el-option label="可靠" value="可靠"></el-option>
+              <el-option label="基本可靠" value="基本可靠"></el-option>
+              <el-option label="不可靠" value="不可靠"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+
+        <!-- 2. 病史信息 -->
+        <h4 class="section-title">病史信息</h4>
+        <div class="form-section">
+          <el-form-item label="主诉" prop="complaint" class="history-item required">
+            <el-input 
+              v-model="formData.complaint" 
+              type="textarea" 
+              placeholder="请输入主诉" 
+              autosize
+              maxlength="200"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="现病史" prop="presentIllness" class="history-item">
+            <el-input 
+              v-model="formData.presentIllness" 
+              type="textarea" 
+              placeholder="请详细描述现病史" 
+              autosize
+              maxlength="1000"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="既往史" prop="pastHistory" class="history-item">
+            <el-input 
+              v-model="formData.pastHistory" 
+              type="textarea" 
+              placeholder="请输入既往史" 
+              autosize
+              maxlength="800"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="个人史" prop="personalHistory" class="history-item">
+            <el-input 
+              v-model="formData.personalHistory" 
+              type="textarea" 
+              placeholder="请输入个人史" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="婚育史" prop="maritalHistory" class="history-item">
+            <el-input 
+              v-model="formData.maritalHistory" 
+              type="textarea" 
+              placeholder="请输入婚育史" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="月经史" prop="menstrualHistory" class="history-item">
+            <el-input 
+              v-model="formData.menstrualHistory" 
+              type="textarea" 
+              placeholder="请输入月经史" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="家族史" prop="familyHistory" class="history-item">
+            <el-input 
+              v-model="formData.familyHistory" 
+              type="textarea" 
+              placeholder="请输入家族史" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 3. 中医望闻问切 -->
+        <h4 class="section-title">中医望闻问切</h4>
+        <div class="form-section">
+          <el-form-item label="望闻问切" prop="tcmInfo" class="history-item">
+            <el-input 
+              v-model="formData.tcmInfo" 
+              type="textarea" 
+              placeholder="请输入中医望闻问切结果" 
+              autosize
+              maxlength="600"
+              show-word-limit
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 4. 体格检查 -->
+        <h4 class="section-title">体格检查</h4>
+        <div class="form-section">
+          <div class="adaptive-grid">
+            <el-form-item label="体温" prop="temp" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model.number="formData.temp" 
+                  type="number" 
+                  step="0.1" 
+                  placeholder="如36.0" 
+                  clearable
+                />
+                <span class="unit">℃</span>
+              </div>
+            </el-form-item>
+            
+            <el-form-item label="脉搏" prop="pulse" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model.number="formData.pulse" 
+                  type="number" 
+                  placeholder="如76" 
+                  clearable
+                />
+                <span class="unit">次/分</span>
+              </div>
+            </el-form-item>
+            
+            <el-form-item label="呼吸" prop="respiration" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model.number="formData.respiration" 
+                  type="number" 
+                  placeholder="如16" 
+                  clearable
+                />
+                <span class="unit">次/分</span>
+              </div>
+            </el-form-item>
+            
+            <el-form-item label="血压" prop="bp" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model="formData.bp" 
+                  placeholder="如188/94" 
+                  clearable
+                  @blur="validateBloodPressure"
+                />
+                <span class="unit">mmHg</span>
+              </div>
+            </el-form-item>
+            
+            <el-form-item label="身高" prop="height" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model.number="formData.height" 
+                  type="number" 
+                  placeholder="如165" 
+                  clearable
+                />
+                <span class="unit">cm</span>
+              </div>
+            </el-form-item>
+            
+            <el-form-item label="体重" prop="weight" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model.number="formData.weight" 
+                  type="number" 
+                  placeholder="如79" 
+                  clearable
+                />
+                <span class="unit">kg</span>
+              </div>
+            </el-form-item>
+            
+            <el-form-item label="BMI" prop="bmi" class="grid-item">
+              <div class="input-with-unit">
+                <el-input 
+                  v-model="formData.bmi" 
+                  placeholder="如29.02" 
+                  readonly
+                />
+                <span class="unit">kg/m²</span>
+              </div>
+            </el-form-item>
+          </div>
+
+          <el-form-item label="一般情况" prop="general" class="history-item">
+            <el-input 
+              v-model="formData.general" 
+              type="textarea" 
+              placeholder="请输入一般情况" 
+              autosize
+              maxlength="300"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="皮肤粘膜" prop="skin" class="history-item">
+            <el-input 
+              v-model="formData.skin" 
+              type="textarea" 
+              placeholder="请输入皮肤粘膜情况" 
+              autosize
+              maxlength="300"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="胸部（心、肺）" prop="chest" class="history-item">
+            <el-input 
+              v-model="formData.chest" 
+              type="textarea" 
+              placeholder="请输入胸部检查结果" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="腹部" prop="abdomen" class="history-item">
+            <el-input 
+              v-model="formData.abdomen" 
+              type="textarea" 
+              placeholder="请输入腹部检查结果" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="四肢/神经系统" prop="limbsNervous" class="history-item">
+            <el-input 
+              v-model="formData.limbsNervous" 
+              type="textarea" 
+              placeholder="请输入四肢及神经系统检查结果" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 5. 辅助检查 -->
+        <h4 class="section-title">辅助检查</h4>
+        <div class="form-section">
+          <el-form-item label="检查结果" prop="auxExam" class="history-item">
+            <el-input 
+              v-model="formData.auxExam" 
+              type="textarea" 
+              placeholder="请输入辅助检查结果" 
+              autosize
+              maxlength="1000"
+              show-word-limit
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 6. 初步诊断 -->
+        <h4 class="section-title">初步诊断</h4>
+        <div class="form-section">
+          <el-form-item label="中医诊断" prop="tcmDiagnosis" class="history-item">
+            <el-input 
+              v-model="formData.tcmDiagnosis" 
+              type="textarea" 
+              placeholder="如：胸痹心痛（气阴两虚证）" 
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="西医诊断" prop="westernDiagnosis" class="history-item">
+            <el-input 
+              v-model="formData.westernDiagnosis" 
+              type="textarea" 
+              placeholder="如：1.冠状动脉粥样硬化性心脏病" 
+              autosize
+              maxlength="800"
+              show-word-limit
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 7. 签名信息（三列布局） -->
+        <h4 class="section-title">签名信息</h4>
+        <div class="adaptive-grid form-section" style="grid-template-columns: repeat(3, 1fr);">
+          <el-form-item label="医师签名" prop="doctorSign" class="grid-item">
+            <el-input 
+              v-model="formData.doctorSign" 
+              placeholder="请签名" 
+              clearable
+            />
+          </el-form-item>
+          
+          <el-form-item label="上级医师签名" prop="superiorSign" class="grid-item">
+            <el-input 
+              v-model="formData.superiorSign" 
+              placeholder="请签名" 
+              clearable
+            />
+          </el-form-item>
+          
+          <el-form-item label="记录日期" prop="signDate" class="grid-item">
+            <el-date-picker 
+              v-model="formData.signDate" 
+              type="datetime" 
+              placeholder="选择日期" 
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </div>
+
+        <!-- 新增：表单操作按钮组（重置按钮） -->
+        <div class="form-btn-group">
+          <el-button type="warning" @click="handleReset">重置表单</el-button>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, watch, onMounted } from 'vue';
+import { ElInput, ElSelect, ElOption, ElDatePicker, ElButton, ElMessage, ElMessageBox, ElForm, ElFormItem } from 'element-plus';
+import useUserStore from '../store/modules/user';
+
+defineOptions({
+  name: 'InHospitalRecord',
+  components: { ElInput, ElSelect, ElOption, ElDatePicker, ElButton, ElForm, ElFormItem }
+});
+
+// Props与事件
+const props = defineProps({
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+});
+
+const emits = defineEmits(['submitOk']);
+
+// 数据初始化
+const userStore = useUserStore();
+const patient = props.patientInfo;
+const formRef = ref(null);
+
+// 表单数据
+const formData = reactive({
+  // 基础信息
+  patientName: patient?.name || '',
+  hospitalNo: patient?.busNo || '',
+  gender: patient?.genderEnum_enumText || '',
+  age: patient?.age || '',
+  nation: '',
+  occupation: '',// 职业
+  marriage: '',// 婚姻状况
+  birthplace: '',// 出生地
+  admissionTime: '',// 入院时间
+  recordTime: '',// 记录时间
+  historyReporter: '',// 病史陈述者
+  reliability: '可靠',// 可靠程度
+  // 病史信息
+  complaint: '',// 主诉
+  presentIllness: '',// 现病史
+  pastIllness: '',// 既往史
+  personalHistory: '',// 个人史
+  allergyHistory: '',// 过敏史
+  pastHistory: '',// 既往史
+  familyHistory: '',// 家族史
+  maritalHistory: '',// 婚姻史
+  menstrualHistory: '',// 月经史
+  // 中医信息
+  tcmInfo: '',
+  
+  // 体格检查
+  temp: '',
+  pulse: '',
+  respiration: '',
+  bp: '',
+  height: '',
+  weight: '',
+  bmi: '',
+  general: '',
+  skin: '',
+  chest: '',
+  abdomen: '',
+  limbsNervous: '',
+  
+  // 辅助检查
+  auxExam: '',
+  
+  // 诊断信息
+  tcmDiagnosis: '',
+  westernDiagnosis: '',
+  
+  // 签名信息
+  doctorSign: '',
+  superiorSign: '',
+  signDate: ''
+});
+
+// 表单校验规则
+const rules = reactive({
+  name: [
+    { required: true, message: '请填写姓名', trigger: ['blur', 'submit'] }
+  ],
+  hospitalNo: [
+    { required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }
+  ],
+  gender: [
+    { required: true, message: '请选择性别', trigger: ['change', 'submit'] }
+  ],
+  age: [
+    { required: true, message: '请填写年龄', trigger: ['blur', 'submit'] },
+    { type: 'number', min: 1, max: 120, message: '年龄需在1-120岁之间', trigger: ['blur', 'submit'] }
+  ],
+  admissionTime: [
+    { required: true, message: '请选择入院时间', trigger: ['change', 'submit'] }
+  ],
+  recordTime: [
+    { required: true, message: '请选择记录时间', trigger: ['change', 'submit'] }
+  ],
+  chiefComplaint: [
+    { required: true, message: '请填写主诉', trigger: ['blur', 'submit'] }
+  ]
+});
+
+// 生命周期
+onMounted(() => {
+  // 初始化记录时间为当前时间
+  if (!formData.recordTime) {
+    formData.recordTime = formatDateTime(new Date());
+  }
+  if (!formData.admissionTime) {
+    formData.admissionTime = formatDateTime(new Date());
+  }
+  if (!formData.signDate) {
+    formData.signDate = formatDateTime(new Date());
+  }
+  if (!formData.patientName) {
+    formData.patientName = patient?.patientName || '';
+    }
+    if (!formData.gender) {
+    formData.gender = patient?.genderEnum_enumText || '';
+    }
+    if (!formData.age) {
+    formData.age = patient?.age || '';
+  }
+  if (!formData.hospitalNo) {
+    formData.hospitalNo = patient?.busNo || '';
+  }
+});
+
+// BMI自动计算
+watch([() => formData.height, () => formData.weight], ([newHeight, newWeight]) => {
+  if (newHeight && newWeight && newHeight > 0 && newWeight > 0) {
+    const heightM = newHeight / 100;
+    formData.bmi = (newWeight / (heightM * heightM)).toFixed(2);
+  } else {
+    formData.bmi = '';
+  }
+});
+
+// 入院时间变化处理
+watch(() => formData.admissionTime, (val) => {
+  if (val && !formData.recordTime) {
+    ElMessageBox.confirm(
+      '是否将记录时间同步为入院时间？',
+      '时间同步提示',
+      {
+        confirmButtonText: '同步',
+        cancelButtonText: '手动设置',
+        type: 'info'
+      }
+    ).then(() => {
+      formData.recordTime = val;
+    }).catch(() => {});
+  }
+});
+
+// 血压格式校验
+const validateBloodPressure = () => {
+  const bp = formData.bp;
+  if (!bp) return;
+  const reg = /^\d{2,3}\/\d{2,3}$/;
+  if (!reg.test(bp)) {
+    ElMessage.warning('血压格式不正确，请输入如 "120/80" 的格式');
+    formData.bp = '';
+  }
+};
+
+// 提交表单
+const submit = () => {
+  formRef.value.validate((isValid) => {
+    if (isValid) {
+      // 额外校验血压格式
+      if (formData.bp) {
+        validateBloodPressure();
+        if (!formData.bp) return; // 格式错误时终止提交
+      }
+      
+      emits('submitOk', formData);
+      ElMessage.success('记录保存成功！');
+    }
+  });
+};
+
+// 新增：重置表单方法（带确认提示）
+const handleReset = () => {
+  ElMessageBox.confirm(
+    '确定要重置表单吗？所有已填写内容将被清空，且不可恢复',
+    '重置确认',
+    {
+      confirmButtonText: '确认重置',
+      cancelButtonText: '取消',
+      type: 'warning',
+      center: true
+    }
+  ).then(() => {
+    // 执行表单重置
+    formRef.value.resetFields();
+    // 保留患者基础信息和默认值（避免清空关键基础数据）
+    formData.patientName = patient?.name || '';
+    formData.hospitalNo = patient?.busNo || '';
+    formData.gender = patient?.genderEnum_enumText || '';
+    formData.age = patient?.age || '';
+    formData.reliability = '可靠';
+    // 重置时间为当前时间
+    const today = new Date();
+    formData.admissionTime = formatDateTime(today);
+    formData.recordTime = formatDateTime(today);
+    formData.signDate = formatDateTime(today);
+    // 重置成功提示
+    ElMessage.success('表单已成功重置');
+  }).catch(() => {
+    // 取消重置提示
+    ElMessage.info('已取消表单重置');
+  });
+};
+
+// 表单数据赋值
+const setFormData = (data) => {
+  if (data) {
+    Object.assign(formData, data);
+  }
+};
+
+// 日期格式化工具
+const formatDateTime = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hour = String(date.getHours()).padStart(2, '0');
+  const minute = String(date.getMinutes()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hour}:${minute}`;
+};
+
+// 暴露接口
+defineExpose({ formData, submit, setFormData, handleReset });
+</script>
+
+<style scoped>
+/* 表单外层容器 */
+.medical-form {
+  max-width: 1200px;
+  width: 100%;
+  height: 700px;
+  margin: 15px auto;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  font-family: Arial, sans-serif;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+/* 滚动内容容器 */
+.form-scroll-container {
+  height: calc(100% - 80px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  scrollbar-width: thin;
+  scrollbar-color: #ccc #f5f5f5;
+}
+.form-scroll-container::-webkit-scrollbar {
+  width: 6px;
+}
+.form-scroll-container::-webkit-scrollbar-thumb {
+  background-color: #ccc;
+  border-radius: 3px;
+}
+.form-scroll-container::-webkit-scrollbar-track {
+  background-color: #f5f5f5;
+}
+
+/* 完整表单容器 */
+.medical-full-form {
+  width: 100%;
+}
+
+/* 区域通用样式 */
+.form-section {
+  margin-bottom: 25px;
+  padding: 10px;
+  background-color: #fafafa;
+  border-radius: 6px;
+}
+.section-title {
+  margin: 0 0 15px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #e0e0e0;
+  color: #333;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/* 自适应网格布局（核心调整） */
+.adaptive-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 15px;
+}
+.grid-item {
+  margin-bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+.grid-item .el-form-item__content {
+  flex: 1;
+  min-width: 0; /* 关键：允许内容收缩以适应容器 */
+}
+
+/* 病史项目样式 */
+.history-item {
+  margin-bottom: 15px;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+.history-item .el-form-item__content {
+  width: 100%;
+}
+.history-item .el-input__inner {
+  width: 100%;
+  min-height: 40px;
+  resize: vertical;
+}
+
+/* 带单位的输入框样式 */
+.input-with-unit {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+}
+.input-with-unit .el-input {
+  flex: 1;
+  min-width: 0; /* 允许输入框收缩 */
+}
+.unit {
+  font-weight: 500;
+  color: #333;
+  white-space: nowrap;
+  font-size: 14px;
+}
+
+/* 新增：表单按钮组样式 */
+.form-btn-group {
+  margin-top: 30px;
+  margin-bottom: 15px;
+  text-align: center; /* 按钮居中对齐 */
+}
+.form-btn-group .el-button {
+  padding: 8px 20px;
+}
+
+/* 必填项红色星号 */
+.required .el-form-item__label::before {
+  content: '* ';
+  color: #ff4d4f;
+}
+
+/* 按钮组 */
+.btn-group {
+  text-align: center;
+  margin-top: 15px;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .medical-form {
+    height: 80vh;
+    padding: 10px;
+  }
+  .form-scroll-container {
+    height: calc(100% - 70px);
+  }
+  .el-form {
+    label-width: 60px !important;
+  }
+  .adaptive-grid {
+    grid-template-columns: 1fr; /* 小屏幕下单列显示 */
+  }
+  .grid-item, .history-item {
+    margin-bottom: 10px;
+  }
+  /* 小屏幕按钮居中 */
+  .form-btn-group {
+    text-align: center;
+  }
+}
+
+/* 中等屏幕调整 */
+@media (min-width: 769px) and (max-width: 1024px) {
+  .adaptive-grid {
+    grid-template-columns: repeat(2, 1fr); /* 中等屏幕下两列显示 */
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue b/openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue
new file mode 100644
index 00000000..7696def0
--- /dev/null
+++ b/openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue
@@ -0,0 +1,555 @@
+<template>
+  <div class="medical-document">
+    <!-- 标题区域 -->
+    <div class="doc-header">
+      <h1 class="doc-title">{{ hospitalName }} 住院手术记录单</h1>
+      <div class="doc-subtitle">住院号: {{ formData.busNo || '待填写' }}</div>
+    </div>
+
+    <!-- 内容区域 -->
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      label-width="120px"
+      label-align="left"
+      class="doc-content"
+      style="height: 60vh; overflow: scroll;"
+    >
+      <!-- 患者与手术基础信息 -->
+      <section class="doc-section">
+        <h2 class="section-title">一、患者与手术基本信息</h2>
+        <div class="adaptive-grid">
+          <el-form-item label="患者姓名" prop="patientName" class="grid-item required">
+            <el-input v-model="formData.patientName" placeholder="请输入患者姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="性别" prop="gender" class="grid-item required">
+            <el-select v-model="formData.gender" placeholder="请选择性别">
+              <el-option label="男" value="男" />
+              <el-option label="女" value="女" />
+            </el-select>
+          </el-form-item>
+          
+          <el-form-item label="年龄" prop="age" class="grid-item required">
+            <div class="input-with-unit">
+              <el-input v-model.number="formData.age" type="number" placeholder="请输入年龄" />
+              <span class="unit">岁</span>
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="科室" prop="department" class="grid-item required">
+            <el-input v-model="formData.department" placeholder="如：普外科" clearable />
+          </el-form-item>
+          
+          <el-form-item label="病房/床号" prop="bedNo" class="grid-item required">
+            <el-input v-model="formData.bedNo" placeholder="如：502-03" clearable />
+          </el-form-item>
+          
+          <el-form-item label="手术日期/时间" prop="operationDateTime" class="grid-item required">
+            <el-date-picker
+              v-model="formData.operationDateTime"
+              type="datetime"
+              placeholder="选择手术日期时间"
+              value-format="YYYY-MM-DD HH:mm"
+            />
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 手术团队信息 -->
+      <section class="doc-section">
+        <h2 class="section-title">二、手术团队信息</h2>
+        <div class="adaptive-grid">
+          <el-form-item label="手术者" prop="surgeon" class="grid-item required">
+            <el-input v-model="formData.surgeon" placeholder="主刀医师姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="第一助手" prop="firstAssistant" class="grid-item required">
+            <el-input v-model="formData.firstAssistant" placeholder="第一助手姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="第二助手" prop="secondAssistant" class="grid-item">
+            <el-input v-model="formData.secondAssistant" placeholder="第二助手姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="麻醉医师" prop="anesthesiologist" class="grid-item required">
+            <el-input v-model="formData.anesthesiologist" placeholder="麻醉医师姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="巡回护士" prop="circulatingNurse" class="grid-item required">
+            <el-input v-model="formData.circulatingNurse" placeholder="巡回护士姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="器械护士" prop="scrubNurse" class="grid-item required">
+            <el-input v-model="formData.scrubNurse" placeholder="器械护士姓名" clearable />
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 手术详情 -->
+      <section class="doc-section">
+        <h2 class="section-title">三、手术详情</h2>
+        
+        <el-form-item label="手术名称" prop="operationName" class="full-width-item required">
+          <el-input v-model="formData.operationName" placeholder="规范手术名称（如：腹腔镜下胆囊切除术）" clearable />
+        </el-form-item>
+        
+        <el-form-item label="手术方式" prop="operationMethod" class="full-width-item required">
+          <el-select v-model="formData.operationMethod" placeholder="选择手术方式">
+            <el-option label="开放手术" value="开放手术" />
+            <el-option label="微创手术" value="微创手术" />
+            <el-option label="介入手术" value="介入手术" />
+          </el-select>
+        </el-form-item>
+        
+        <el-form-item label="手术入路" prop="surgicalApproach" class="full-width-item required">
+          <el-input v-model="formData.surgicalApproach" placeholder="如：右上腹经腹直肌切口" clearable />
+        </el-form-item>
+        
+        <el-form-item label="术中发现" prop="intraoperativeFindings" class="full-width-item required">
+          <el-input
+            v-model="formData.intraoperativeFindings"
+            type="textarea"
+            placeholder="详细描述术中所见器官、病变情况"
+            autosize
+            maxlength="1000"
+            show-word-limit
+          />
+        </el-form-item>
+        
+        <el-form-item label="手术过程" prop="operationProcess" class="full-width-item required">
+          <el-input
+            v-model="formData.operationProcess"
+            type="textarea"
+            placeholder="按操作顺序描述手术步骤（如：游离胆囊三角→结扎胆囊管→切除胆囊...）"
+            autosize
+            maxlength="1500"
+            show-word-limit
+          />
+        </el-form-item>
+      </section>
+
+      <!-- 术后情况 -->
+      <section class="doc-section">
+        <h2 class="section-title">四、术后情况</h2>
+        <div class="adaptive-grid">
+          <el-form-item label="术中出血量" prop="bloodLoss" class="grid-item required">
+            <div class="input-with-unit">
+              <el-input v-model.number="formData.bloodLoss" type="number" placeholder="请输入出血量" />
+              <span class="unit">ml</span>
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="输血情况" prop="bloodTransfusion" class="grid-item">
+            <el-select v-model="formData.bloodTransfusion" placeholder="是否输血">
+              <el-option label="是" value="是" />
+              <el-option label="否" value="否" />
+            </el-select>
+          </el-form-item>
+          
+          <el-form-item label="引流管放置" prop="drainageTube" class="grid-item">
+            <el-input v-model="formData.drainageTube" placeholder="如：腹腔引流管1根" clearable />
+          </el-form-item>
+          
+          <el-form-item label="标本处理" prop="specimenDisposal" class="grid-item required">
+            <el-input v-model="formData.specimenDisposal" placeholder="如：胆囊标本送病理检查" clearable />
+          </el-form-item>
+          
+          <el-form-item label="手术结束时间" prop="operationEndTime" class="grid-item required">
+            <el-date-picker
+              v-model="formData.operationEndTime"
+              type="datetime"
+              placeholder="选择手术结束时间"
+              value-format="YYYY-MM-DD HH:mm"
+            />
+          </el-form-item>
+          
+          <el-form-item label="患者去向" prop="patientDestination" class="grid-item required">
+            <el-select v-model="formData.patientDestination" placeholder="选择去向">
+              <el-option label="ICU" value="ICU" />
+              <el-option label="普通病房" value="普通病房" />
+            </el-select>
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 签署区域 -->
+      <section class="doc-section">
+        <h2 class="section-title">五、签署确认</h2>
+        <div class="adaptive-grid signature-area" style="grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));">
+          <el-form-item label="手术者签名" prop="surgeonSignature" class="grid-item required">
+            <el-input v-model="formData.surgeonSignature" placeholder="主刀医师签字" clearable />
+            <div class="signature-tip">请手术者亲笔签名</div>
+          </el-form-item>
+          
+          <el-form-item label="记录者签名" prop="recorderSignature" class="grid-item required">
+            <el-input v-model="formData.recorderSignature" placeholder="记录者签字" clearable />
+            <div class="signature-tip">请记录者（如第一助手）签字</div>
+          </el-form-item>
+          
+          <el-form-item label="记录日期" prop="recordDate" class="grid-item required">
+            <el-date-picker
+              v-model="formData.recordDate"
+              type="date"
+              placeholder="选择记录日期"
+              value-format="YYYY-MM-DD"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </div>
+      </section>
+    </el-form>
+
+    <!-- 操作按钮 -->
+    <div class="btn-group">
+      <el-button type="primary" @click="submit">保存记录</el-button>
+      <el-button type="success" @click="handlePrint">打印记录</el-button>
+      <el-button type="warning" @click="handleReset">重置表单</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage, ElMessageBox, ElForm, ElFormItem, ElInput, ElSelect, ElOption, ElDatePicker, ElButton } from 'element-plus';
+
+// 医院名称
+const hospitalName = '长春市朝阳区中医院';
+defineOptions({
+  name: 'iInHospitalSurgicalRecord'
+});
+// 表单引用
+const formRef = ref(null);
+
+// 表单数据
+const formData = reactive({
+  // 患者与手术基础信息
+  busNo: '',
+  patientName: '',
+  gender: '',
+  age: '',
+  department: '',
+  bedNo: '',
+  operationDateTime: '',// 手术日期时间
+  
+  // 手术团队信息
+  surgeon: '',// 主刀医师
+  firstAssistant: '',// 第一助手
+  secondAssistant: '',// 第二助手
+  anesthesiologist: '',// 麻醉医师
+  circulatingNurse: '',// 巡回护士
+  scrubNurse: '',// 器械护士
+  
+  // 手术详情
+  operationName: '',// 规范手术名称
+  operationMethod: '',// 手术方式
+  surgicalApproach: '',// 手术入路
+  intraoperativeFindings: '',// 术中发现
+  operationProcess: '',// 手术过程
+  
+  // 术后情况
+  bloodLoss: '',// 术中出血量
+  bloodTransfusion: '',// 输血情况
+  drainageTube: '',// 引流管放置
+  specimenDisposal: '',// 标本处理
+  operationEndTime: '',// 手术结束时间
+  patientDestination: '',// 患者去向
+  
+  // 签署信息
+  surgeonSignature: '',// 手术者签名
+  recorderSignature: '',// 记录者签名
+  recordDate: ''// 记录日期
+});
+
+// 表单验证规则
+const rules = reactive({
+  busNo: [
+    { required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }
+  ],
+  patientName: [
+    { required: true, message: '请填写患者姓名', trigger: ['blur', 'submit'] }
+  ],
+  gender: [
+    { required: true, message: '请选择性别', trigger: ['change', 'submit'] }
+  ],
+  age: [
+    { required: true, message: '请填写年龄', trigger: ['blur', 'submit'] },
+    { type: 'number', min: 0, max: 150, message: '年龄需在0-150之间', trigger: ['blur', 'submit'] }
+  ],
+  department: [
+    { required: true, message: '请填写科室', trigger: ['blur', 'submit'] }
+  ],
+  bedNo: [
+    { required: true, message: '请填写病房/床号', trigger: ['blur', 'submit'] }
+  ],
+  operationDateTime: [
+    { required: true, message: '请选择手术日期时间', trigger: ['change', 'submit'] }
+  ],
+  surgeon: [
+    { required: true, message: '请填写手术者姓名', trigger: ['blur', 'submit'] }
+  ],
+  firstAssistant: [
+    { required: true, message: '请填写第一助手姓名', trigger: ['blur', 'submit'] }
+  ],
+  anesthesiologist: [
+    { required: true, message: '请填写麻醉医师姓名', trigger: ['blur', 'submit'] }
+  ],
+  circulatingNurse: [
+    { required: true, message: '请填写巡回护士姓名', trigger: ['blur', 'submit'] }
+  ],
+  scrubNurse: [
+    { required: true, message: '请填写器械护士姓名', trigger: ['blur', 'submit'] }
+  ],
+  operationName: [
+    { required: true, message: '请填写手术名称', trigger: ['blur', 'submit'] }
+  ],
+  operationMethod: [
+    { required: true, message: '请选择手术方式', trigger: ['change', 'submit'] }
+  ],
+  surgicalApproach: [
+    { required: true, message: '请填写手术入路', trigger: ['blur', 'submit'] }
+  ],
+  intraoperativeFindings: [
+    { required: true, message: '请描述术中发现', trigger: ['blur', 'submit'] }
+  ],
+  operationProcess: [
+    { required: true, message: '请描述手术过程', trigger: ['blur', 'submit'] }
+  ],
+  bloodLoss: [
+    { required: true, message: '请填写术中出血量', trigger: ['blur', 'submit'] },
+    { type: 'number', min: 0, message: '出血量不能为负数', trigger: ['blur', 'submit'] }
+  ],
+  specimenDisposal: [
+    { required: true, message: '请填写标本处理方式', trigger: ['blur', 'submit'] }
+  ],
+  operationEndTime: [
+    { required: true, message: '请选择手术结束时间', trigger: ['change', 'submit'] }
+  ],
+  patientDestination: [
+    { required: true, message: '请选择患者去向', trigger: ['change', 'submit'] }
+  ],
+  surgeonSignature: [
+    { required: true, message: '请手术者签名', trigger: ['blur', 'submit'] }
+  ],
+  recorderSignature: [
+    { required: true, message: '请记录者签名', trigger: ['blur', 'submit'] }
+  ],
+  recordDate: [
+    { required: true, message: '请选择记录日期', trigger: ['change', 'submit'] }
+  ]
+});
+
+// 生命周期
+onMounted(() => {
+  // 初始化日期为当前日期时间
+  const today = new Date();
+  formData.operationDateTime = formatDateTime(today);
+  formData.operationEndTime = formatDateTime(today);
+  formData.recordDate = formatDate(today);
+});
+
+// 提交表单
+const submit = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      ElMessage.success('手术记录保存成功');
+      console.log('手术记录数据:', formData);
+    }
+  });
+};
+
+// 打印功能
+const handlePrint = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      window.print();
+    } else {
+      ElMessageBox.warning('请先完善表单信息再打印');
+    }
+  });
+};
+
+// 重置表单
+const handleReset = () => {
+  ElMessageBox.confirm(
+    '确定要重置表单吗？所有已填写内容将被清空',
+    '确认重置',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  ).then(() => {
+    formRef.value.resetFields();
+    const today = new Date();
+    formData.operationDateTime = formatDateTime(today);
+    formData.operationEndTime = formatDateTime(today);
+    formData.recordDate = formatDate(today);
+    ElMessage.success('表单已重置');
+  });
+};
+
+// 日期格式化工具
+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 formatDateTime = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hour = String(date.getHours()).padStart(2, '0');
+  const minute = String(date.getMinutes()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hour}:${minute}`;
+};
+</script>
+
+<style scoped>
+/* 样式与原代码保持一致，无需修改 */
+.medical-document {
+  max-width: 1200px;
+  margin: 20px auto;
+  padding: 30px;
+  background: #fff;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  font-family: 'SimSun', '宋体', serif;
+}
+
+.doc-header {
+  text-align: center;
+  margin-bottom: 30px;
+}
+
+.doc-title {
+  font-size: 22px;
+  margin: 0 0 10px;
+  font-weight: bold;
+}
+
+.doc-subtitle {
+  font-size: 16px;
+  color: #666;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #333;
+}
+
+.doc-content {
+  width: 100%;
+}
+
+.doc-section {
+  margin-bottom: 25px;
+  padding-bottom: 15px;
+  border-bottom: 1px dashed #ccc;
+}
+
+.section-title {
+  font-size: 18px;
+  margin: 0 0 15px;
+  color: #333;
+  font-weight: bold;
+}
+
+.adaptive-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 15px 20px;
+  margin-bottom: 15px;
+}
+
+.grid-item {
+  margin-bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+.grid-item .el-form-item__content {
+  flex: 1;
+  min-width: 0;
+}
+
+.full-width-item {
+  width: 100%;
+  margin-bottom: 15px;
+}
+
+.input-with-unit {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.unit {
+  white-space: nowrap;
+  color: #666;
+}
+
+.signature-area {
+  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+}
+
+.signature-tip {
+  font-size: 12px;
+  color: #f56c6c;
+  margin-top: 4px;
+}
+
+.btn-group {
+  display: flex;
+  justify-content: center;
+  gap: 15px;
+  margin-top: 30px;
+  padding-top: 20px;
+  border-top: 2px solid #333;
+}
+
+.required .el-form-item__label::before {
+  content: '*';
+  color: #ff4d4f;
+  margin-right: 4px;
+}
+
+@media (max-width: 768px) {
+  .medical-document {
+    padding: 15px;
+  }
+  
+  .adaptive-grid {
+    grid-template-columns: 1fr;
+  }
+  
+  .doc-title {
+    font-size: 18px;
+  }
+  
+  .section-title {
+    font-size: 16px;
+  }
+}
+
+@media print {
+  .btn-group {
+    display: none;
+  }
+  
+  .medical-document {
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
+  }
+  
+  .el-input__inner, .el-select__input, .el-textarea__inner {
+    border: none !important;
+    box-shadow: none !important;
+    background: transparent !important;
+  }
+  
+  .el-form-item__label {
+    font-weight: bold !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/inHosptialCommunicate.vue b/openhis-ui-vue3/src/template/inHosptialCommunicate.vue
new file mode 100644
index 00000000..1c81e14e
--- /dev/null
+++ b/openhis-ui-vue3/src/template/inHosptialCommunicate.vue
@@ -0,0 +1,553 @@
+<template>
+  <div class="medical-document">
+    <!-- 标题区域 -->
+    <div class="doc-header">
+      <h1 class="doc-title">{{ hospitalName }} 住院患者入院沟通记录单</h1>
+      <div class="doc-subtitle">住院号: {{ formData.hospitalNo || '待填写' }}</div>
+    </div>
+
+    <!-- 内容区域 -->
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      label-width="100px"
+      label-align="left"
+      class="doc-content"
+    >
+      <!-- 患者基础信息 -->
+      <section class="doc-section">
+        <h2 class="section-title">一、患者基础信息</h2>
+        <div class="adaptive-grid">
+          <el-form-item label="姓名" prop="patientName" class="grid-item required">
+            <el-input v-model="formData.patientName" placeholder="请输入患者姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="性别" prop="gender" class="grid-item required">
+            <el-select v-model="formData.gender" placeholder="请选择性别">
+              <el-option label="男" value="男" />
+              <el-option label="女" value="女" />
+            </el-select>
+          </el-form-item>
+          
+          <el-form-item label="年龄" prop="age" class="grid-item required">
+            <div class="input-with-unit">
+              <el-input v-model.number="formData.age" type="number" placeholder="请输入年龄" />
+              <span class="unit">岁</span>
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="科室/病区" prop="department" class="grid-item required">
+            <el-input v-model="formData.department" placeholder="如：内科疗区" clearable />
+          </el-form-item>
+          
+          <el-form-item label="病房/床号" prop="bedNo" class="grid-item required">
+            <el-input v-model="formData.bedNo" placeholder="如：307-12" clearable />
+          </el-form-item>
+          
+          <el-form-item label="入院日期" prop="admissionDate" class="grid-item required">
+            <el-date-picker
+              v-model="formData.admissionDate"
+              type="date"
+              placeholder="选择入院日期"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 医疗团队信息 -->
+      <section class="doc-section">
+        <h2 class="section-title">二、医疗团队信息</h2>
+        <div class="adaptive-grid">
+          <el-form-item label="经治医师" prop="treatingDoctor" class="grid-item required">
+            <el-input v-model="formData.treatingDoctor" placeholder="请输入医师姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="主治医师" prop="attendingDoctor" class="grid-item required">
+            <el-input v-model="formData.attendingDoctor" placeholder="请输入医师姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="科主任" prop="departmentHead" class="grid-item required">
+            <el-input v-model="formData.departmentHead" placeholder="请输入主任姓名" clearable />
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 病情与诊断 -->
+      <section class="doc-section">
+        <h2 class="section-title">三、病情与诊断</h2>
+        
+        <el-form-item label="病情状况" prop="condition" class="full-width-item required">
+          <el-input
+            v-model="formData.condition"
+            type="textarea"
+            placeholder="详细描述患者病情状况"
+            autosize
+            maxlength="1000"
+            show-word-limit
+          />
+        </el-form-item>
+        
+        <div class="diagnosis-container">
+          <el-form-item label="中医诊断" prop="tcmDiagnosis" class="diagnosis-item">
+            <el-input
+              v-model="formData.tcmDiagnosis"
+              type="textarea"
+              placeholder="如：胸痹心痛（气阴两虚证）"
+              autosize
+              maxlength="500"
+              show-word-limit
+            />
+          </el-form-item>
+          
+          <el-form-item label="西医诊断" prop="westernDiagnosis" class="diagnosis-item">
+            <el-input
+              v-model="formData.westernDiagnosis"
+              type="textarea"
+              placeholder="如：1.冠状动脉粥样硬化性心脏病..."
+              autosize
+              maxlength="800"
+              show-word-limit
+            />
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 治疗与检查计划 -->
+      <section class="doc-section">
+        <h2 class="section-title">四、治疗与检查计划</h2>
+        
+        <el-form-item label="治疗方案" prop="treatmentPlan" class="full-width-item required">
+          <el-input
+            v-model="formData.treatmentPlan"
+            type="textarea"
+            placeholder="详细描述治疗方案"
+            autosize
+            maxlength="1000"
+            show-word-limit
+          />
+        </el-form-item>
+        
+        <el-form-item label="进一步检查项目" prop="examinationItems" class="full-width-item required">
+          <el-input
+            v-model="formData.examinationItems"
+            type="textarea"
+            placeholder="列出需要进行的检查项目"
+            autosize
+            maxlength="1000"
+            show-word-limit
+          />
+        </el-form-item>
+      </section>
+
+      <!-- 风险告知 -->
+      <section class="doc-section">
+        <h2 class="section-title">五、风险告知</h2>
+        <el-form-item label="告知内容" prop="riskNotification" class="full-width-item required">
+          <el-input
+            v-model="formData.riskNotification"
+            type="textarea"
+            placeholder="告知患者可能存在的风险"
+            autosize
+            maxlength="800"
+            show-word-limit
+          />
+        </el-form-item>
+      </section>
+
+      <!-- 签署区域（优化后：三列自适应+细节样式） -->
+      <section class="doc-section">
+        <h2 class="section-title">六、签署确认</h2>
+        <div class="adaptive-grid signature-area" style="grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));">
+          <el-form-item label="患者或家属签字" prop="patientSignature" class="grid-item required">
+            <el-input v-model="formData.patientSignature" placeholder="请签字" clearable />
+            <div class="signature-tip">请填写患者或家属签字</div>
+          </el-form-item>
+          
+          <el-form-item label="与患者关系" prop="relationship" class="grid-item">
+            <el-input v-model="formData.relationship" placeholder="如：本人、配偶、子女" clearable />
+          </el-form-item>
+          
+          <el-form-item label="签字日期" prop="signatureDate" class="grid-item required">
+            <el-date-picker
+              v-model="formData.signatureDate"
+              type="date"
+              placeholder="选择签字日期"
+              value-format="YYYY-MM-DD"
+              style="width: 100%;"
+            />
+          </el-form-item>
+          
+          <el-form-item label="沟通医师签字" prop="doctorSignature" class="grid-item required">
+            <el-input v-model="formData.doctorSignature" placeholder="请签字" clearable />
+            <div class="signature-tip">请填写沟通医师签字</div>
+          </el-form-item>
+          
+          <el-form-item label="沟通日期" prop="communicationDate" class="grid-item required">
+            <el-date-picker
+              v-model="formData.communicationDate"
+              type="datetime"
+              placeholder="选择沟通日期时间"
+              value-format="YYYY-MM-DD HH:mm"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </div>
+      </section>
+    </el-form>
+
+    <!-- 操作按钮 -->
+    <div class="btn-group">
+      <el-button type="primary" @click="submit">保存记录</el-button>
+      <el-button type="success" @click="handlePrint">打印记录</el-button>
+      <el-button type="warning" @click="handleReset">重置表单</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage, ElMessageBox, ElForm, ElFormItem, ElInput, ElSelect, ElOption, ElDatePicker, ElButton } from 'element-plus';
+
+// 医院名称
+const hospitalName = '长春市朝阳区中医院';
+defineOptions({
+  name: 'InHospitalCommunicate'
+});
+// 表单引用
+const formRef = ref(null);
+
+// 表单数据
+const formData = reactive({
+  // 基础信息
+  hospitalNo: '',
+  patientName: '',
+  gender: '',
+  age: '',
+  department: '',
+  bedNo: '',
+  admissionDate: '',
+  
+  // 医疗团队
+  treatingDoctor: '',
+  attendingDoctor: '',
+  departmentHead: '',
+  
+  // 病情诊断
+  condition: '',
+  tcmDiagnosis: '',
+  westernDiagnosis: '',
+  
+  // 治疗检查
+  treatmentPlan: '',
+  examinationItems: '',
+  
+  // 风险告知
+  riskNotification: '',
+  
+  // 签署信息
+  patientSignature: '',
+  relationship: '',
+  signatureDate: '',
+  doctorSignature: '',
+  communicationDate: ''
+});
+
+// 表单验证规则
+const rules = reactive({
+  hospitalNo: [
+    { required: true, message: '请填写住院号', trigger: ['blur', 'submit'] }
+  ],
+  patientName: [
+    { required: true, message: '请填写患者姓名', trigger: ['blur', 'submit'] }
+  ],
+  gender: [
+    { required: true, message: '请选择性别', trigger: ['change', 'submit'] }
+  ],
+  age: [
+    { required: true, message: '请填写年龄', trigger: ['blur', 'submit'] },
+    { type: 'number', min: 0, max: 150, message: '年龄需在0-150之间', trigger: ['blur', 'submit'] }
+  ],
+  department: [
+    { required: true, message: '请填写科室/病区', trigger: ['blur', 'submit'] }
+  ],
+  bedNo: [
+    { required: true, message: '请填写病房/床号', trigger: ['blur', 'submit'] }
+  ],
+  admissionDate: [
+    { required: true, message: '请选择入院日期', trigger: ['change', 'submit'] }
+  ],
+  treatingDoctor: [
+    { required: true, message: '请填写经治医师', trigger: ['blur', 'submit'] }
+  ],
+  attendingDoctor: [
+    { required: true, message: '请填写主治医师', trigger: ['blur', 'submit'] }
+  ],
+  departmentHead: [
+    { required: true, message: '请填写科主任', trigger: ['blur', 'submit'] }
+  ],
+  condition: [
+    { required: true, message: '请描述病情状况', trigger: ['blur', 'submit'] }
+  ],
+  treatmentPlan: [
+    { required: true, message: '请填写治疗方案', trigger: ['blur', 'submit'] }
+  ],
+  examinationItems: [
+    { required: true, message: '请填写检查项目', trigger: ['blur', 'submit'] }
+  ],
+  riskNotification: [
+    { required: true, message: '请填写风险告知内容', trigger: ['blur', 'submit'] }
+  ],
+  patientSignature: [
+    { required: true, message: '请填写患者或家属签字', trigger: ['blur', 'submit'] }
+  ],
+  signatureDate: [
+    { required: true, message: '请选择签字日期', trigger: ['change', 'submit'] }
+  ],
+  doctorSignature: [
+    { required: true, message: '请填写医师签字', trigger: ['blur', 'submit'] }
+  ],
+  communicationDate: [
+    { required: true, message: '请选择沟通日期', trigger: ['change', 'submit'] }
+  ]
+});
+
+// 生命周期
+onMounted(() => {
+  // 初始化日期为当前日期
+  const today = new Date();
+  formData.admissionDate = formatDate(today);
+  formData.signatureDate = formatDate(today);
+  formData.communicationDate = formatDateTime(today);
+});
+
+// 提交表单
+const submit = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      ElMessage.success('记录保存成功');
+      console.log('表单数据:', formData);
+    }
+  });
+};
+
+// 打印功能
+const handlePrint = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      window.print();
+    } else {
+      ElMessageBox.warning('请先完善表单信息再打印');
+    }
+  });
+};
+
+// 重置表单
+const handleReset = () => {
+  ElMessageBox.confirm(
+    '确定要重置表单吗？所有已填写内容将被清空',
+    '确认重置',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  ).then(() => {
+    formRef.value.resetFields();
+    const today = new Date();
+    formData.admissionDate = formatDate(today);
+    formData.signatureDate = formatDate(today);
+    formData.communicationDate = formatDateTime(today);
+    ElMessage.success('表单已重置');
+  });
+};
+
+// 日期格式化工具
+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 formatDateTime = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hour = String(date.getHours()).padStart(2, '0');
+  const minute = String(date.getMinutes()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hour}:${minute}`;
+};
+</script>
+
+<style scoped>
+.medical-document {
+  max-width: 1200px;
+  margin: 20px auto;
+  padding: 30px;
+  background: #fff;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  font-family: 'SimSun', '宋体', serif;
+}
+
+/* 标题样式 */
+.doc-header {
+  text-align: center;
+  margin-bottom: 30px;
+}
+
+.doc-title {
+  font-size: 22px;
+  margin: 0 0 10px;
+  font-weight: bold;
+}
+
+.doc-subtitle {
+  font-size: 16px;
+  color: #666;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #333;
+}
+
+/* 内容区域 */
+.doc-content {
+  width: 100%;
+}
+
+.doc-section {
+  margin-bottom: 25px;
+  padding-bottom: 15px;
+  border-bottom: 1px dashed #ccc;
+}
+
+.section-title {
+  font-size: 18px;
+  margin: 0 0 15px;
+  color: #333;
+  font-weight: bold;
+}
+
+/* 自适应网格布局 */
+.adaptive-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 15px 20px;
+  margin-bottom: 15px;
+}
+
+.grid-item {
+  margin-bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+.grid-item .el-form-item__content {
+  flex: 1;
+  min-width: 0; /* 确保输入框可收缩适配列宽 */
+}
+
+/* 全宽项目 */
+.full-width-item {
+  width: 100%;
+  margin-bottom: 15px;
+}
+
+/* 诊断区域布局 */
+.diagnosis-container {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 20px;
+  margin-bottom: 15px;
+}
+
+.diagnosis-item {
+  margin-bottom: 0;
+}
+
+/* 带单位输入框 */
+.input-with-unit {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.unit {
+  white-space: nowrap;
+  color: #666;
+}
+
+/* 签名区域优化 */
+.signature-area {
+  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+}
+
+.signature-tip {
+  font-size: 12px;
+  color: #f56c6c;
+  margin-top: 4px;
+}
+
+/* 按钮组 */
+.btn-group {
+  display: flex;
+  justify-content: center;
+  gap: 15px;
+  margin-top: 30px;
+  padding-top: 20px;
+  border-top: 2px solid #333;
+}
+
+/* 必填项样式 */
+.required .el-form-item__label::before {
+  content: '*';
+  color: #ff4d4f;
+  margin-right: 4px;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .medical-document {
+    padding: 15px;
+  }
+  
+  .diagnosis-container {
+    grid-template-columns: 1fr;
+  }
+  
+  .adaptive-grid {
+    grid-template-columns: 1fr;
+  }
+  
+  .doc-title {
+    font-size: 18px;
+  }
+  
+  .section-title {
+    font-size: 16px;
+  }
+}
+
+/* 打印样式优化 */
+@media print {
+  .btn-group {
+    display: none;
+  }
+  
+  .medical-document {
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
+  }
+  
+  .el-input__inner, .el-select__input, .el-textarea__inner {
+    border: none !important;
+    box-shadow: none !important;
+    background: transparent !important;
+  }
+  
+  .el-form-item__label {
+    font-weight: bold !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/template/nursingRecordSheet.vue b/openhis-ui-vue3/src/template/nursingRecordSheet.vue
index 4213e3e3..f3d354f3 100644
--- a/openhis-ui-vue3/src/template/nursingRecordSheet.vue
+++ b/openhis-ui-vue3/src/template/nursingRecordSheet.vue
@@ -60,7 +60,7 @@
 
       <!-- 基本信息记录表格 -->
       <div class="vital-signs-table">
-        <el-table :data="state.vitalSigns" border style="width: 100%">
+        <el-table :data="state.formData.vitalSigns" border style="width: 100%">
           <el-table-column label="日期" width="100">
             <template #default="scope">
               <el-date-picker
@@ -128,7 +128,7 @@
           <el-table-column label="氧疗L/min" width="200">
             <el-table-column label="方式" >
               <template #default="scope">
-                <el-select v-model="scope.row.oxygenMethod" placeholder="选择">
+                <el-select v-model="scope.row.intake" placeholder="选择">
                   <el-option label="鼻导管" value="鼻导管"></el-option>
                   <el-option label="面罩" value="面罩"></el-option>
                   <el-option label="无" value="无"></el-option>
@@ -144,7 +144,7 @@
            <el-table-column label="入量" width="200">
             <el-table-column label="名称" >
               <template #default="scope">
-                <el-select v-model="scope.row.oxygenMethod" placeholder="选择">
+                <el-select v-model="scope.row.intake" placeholder="选择">
                   <el-option label="鼻导管" value="鼻导管"></el-option>
                   <el-option label="面罩" value="面罩"></el-option>
                   <el-option label="无" value="无"></el-option>
@@ -165,7 +165,7 @@
              <el-table-column label="出量" width="200">
             <el-table-column label="名称" >
               <template #default="scope">
-                <el-select v-model="scope.row.oxygenMethod" placeholder="选择">
+                <el-select v-model="scope.row.intake" placeholder="选择">
                   <el-option label="鼻导管" value="鼻导管"></el-option>
                   <el-option label="面罩" value="面罩"></el-option>
                   <el-option label="无" value="无"></el-option>
@@ -245,7 +245,7 @@ const props = defineProps({
 });
 
 // 表单数据
-const state = reactive({
+const state = ref({
   formData: {
     name: '',
     age: '',
@@ -254,8 +254,7 @@ const state = reactive({
     bedNumber: '',
     hospitalNumber: '',
     diagnosis: '',
-  },
-  vitalSigns: [
+    vitalSigns: [
     {
       date: new Date().toISOString().split('T')[0],
       time: new Date().toTimeString().slice(0, 5),
@@ -264,17 +263,19 @@ const state = reactive({
       heartRate: '',
       respiratoryRate: '',
       bloodPressure: '',
-      oxygenMethod: '无',
+      intake: '',
       flowRate: '',
       nurseSignature: '',
     },
   ],
+  },
+ 
   
 });
 
 // 添加生命体征记录
 const addVitalSign = () => {
-  state.vitalSigns.push({
+  state.value.formData.vitalSigns.push({
     date: new Date().toISOString().split('T')[0],
     time: new Date().toTimeString().slice(0, 5),
     consciousness: '清醒',
@@ -282,16 +283,17 @@ const addVitalSign = () => {
     heartRate: '',
     respiratoryRate: '',
     bloodPressure: '',
-    oxygenMethod: '无',
+    intake: '',
     flowRate: '',
     nurseSignature: '',
+
   });
 };
 
 // 删除生命体征记录
 const removeVitalSign = (index) => {
-  state.vitalSigns.splice(index, 1);
-  if (state.vitalSigns.length === 0) {
+  state.value.formData.vitalSigns.splice(index, 1);
+  if (state.value.formData.vitalSigns.length === 0) {
     addVitalSign();
   }
 };
@@ -300,7 +302,7 @@ const removeVitalSign = (index) => {
 
 // 重置表单
 const resetForm = () => {
-  state.formData = {
+  state.value.formData = {
     name: '',
     age: '',
     gender: '',
@@ -308,21 +310,9 @@ const resetForm = () => {
     bedNumber: '',
     hospitalNumber: '',
     diagnosis: '',
+    vitalSigns:[]
   };
-  state.vitalSigns = [
-    {
-      date: new Date().toISOString().split('T')[0],
-      time: new Date().toTimeString().slice(0, 5),
-      consciousness: '清醒',
-      temperature: '',
-      heartRate: '',
-      respiratoryRate: '',
-      bloodPressure: '',
-      oxygenMethod: '无',
-      flowRate: '',
-      nurseSignature: '',
-    },
-  ];
+ 
 };
 
 onBeforeMount(() => {
@@ -335,8 +325,16 @@ onBeforeMount(() => {
 onMounted(() => {
   // 组件挂载后的逻辑
 });
-
-defineExpose({ state });
+const submit = () => {
+  // ElMessage.success('提交成功');
+  emits('submitOk', state.formData);
+};
+const setFormData = (data) => {
+  if (data) {
+    state.value.formData = data;
+  }
+};
+defineExpose({ state, submit, setFormData });
 </script>
 
 <style lang="scss" scoped>
diff --git a/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue b/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue
new file mode 100644
index 00000000..cc3ed6df
--- /dev/null
+++ b/openhis-ui-vue3/src/template/outpatientMedicalRecord.vue
@@ -0,0 +1,413 @@
+<template>
+  <div class="medical-form">
+    <div class="patient-name">
+      患者姓名：{{ patient?.patientName || '未知' }} &nbsp;&nbsp; 病历号：{{
+        patient?.busNo || '未知'
+      }}
+    </div>
+    <h2 style="text-align: center">{{ userStore.hospitalName }}</h2>
+    <h2 style="text-align: center">门诊病历</h2>
+
+    <!-- 滚动内容区域 -->
+    <div class="form-scroll-container">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="100px"
+        label-align="left"
+        class="medical-full-form"
+      >
+        <h4 class="section-title">基础信息</h4>
+        <!-- 1. 基础信息：单行自适应排列 -->
+        <el-form-item class="form-section">
+          <div class="single-row-layout">
+            <el-form-item label="身高" prop="height" class="row-item">
+              <div class="input-with-unit">
+                <el-input v-model="formData.height" type="text" placeholder="请输入" />
+                <span class="unit">cm</span>
+              </div>
+            </el-form-item>
+            <el-form-item label="体重" prop="weight" class="row-item">
+              <div class="input-with-unit">
+                <el-input v-model="formData.weight" type="text" placeholder="请输入" />
+                <span class="unit">kg</span>
+              </div>
+            </el-form-item>
+            <el-form-item label="体温" prop="temperature" class="row-item">
+              <div class="input-with-unit">
+                <el-input v-model="formData.temperature" type="text" placeholder="请输入" />
+                <span class="unit">℃</span>
+              </div>
+            </el-form-item>
+            <el-form-item label="脉搏" prop="pulse" class="row-item">
+              <div class="input-with-unit">
+                <el-input v-model="formData.pulse" type="text" placeholder="请输入" />
+                <span class="unit">次/分</span>
+              </div>
+            </el-form-item>
+            <el-form-item label="发病日期" prop="onsetDate" class="row-item">
+              <el-date-picker
+                v-model="formData.onsetDate"
+                type="date"
+                placeholder="选择发病日期"
+                value-format="YYYY-MM-DD"
+                style="width: 100%"
+              />
+              <!-- <el-input v-model="formData.onsetDate" type="date" /> -->
+            </el-form-item>
+          </div>
+        </el-form-item>
+        <h4 class="section-title">病史信息</h4>
+        <!-- 2. 病史信息：单行自适应排列（新增调整） -->
+        <el-form-item class="form-section">
+          <div class="single-row-layout">
+            <el-form-item label="现病史" prop="presentIllness" class="row-item history-item">
+              <el-input
+                v-model="formData.presentIllness"
+                type="textarea"
+                placeholder="无"
+                autosize
+              />
+            </el-form-item>
+            <el-form-item label="既往史" prop="pastIllness" class="row-item history-item">
+              <el-input v-model="formData.pastIllness" type="textarea" placeholder="无" autosize />
+            </el-form-item>
+            <el-form-item label="个人史" prop="personalHistory" class="row-item history-item">
+              <el-input
+                v-model="formData.personalHistory"
+                type="textarea"
+                placeholder="无"
+                autosize
+              />
+            </el-form-item>
+            <el-form-item label="过敏史" prop="allergyHistory" class="row-item history-item">
+              <el-input
+                v-model="formData.allergyHistory"
+                type="textarea"
+                placeholder="无"
+                autosize
+              />
+            </el-form-item>
+            <el-form-item label="家族史" prop="familyHistory" class="row-item history-item">
+              <el-input
+                v-model="formData.familyHistory"
+                type="textarea"
+                placeholder="无"
+                autosize
+              />
+            </el-form-item>
+          </div>
+        </el-form-item>
+        <h4 class="section-title">主诉、查体(治疗)、处置、辅助检查</h4>
+        <!-- 3. 主诉（必填） -->
+        <el-form-item label="主诉" prop="complaint" class="required form-item-single">
+          <el-input
+            v-model="formData.complaint"
+            type="textarea"
+            placeholder="请输入主诉"
+            class="tall-textarea"
+            autosize
+          />
+        </el-form-item>
+        <!-- 4. 查体、处理、辅助检查 -->
+        <el-form-item label="查体(治疗)" prop="physicalExam" class="form-item-single">
+          <el-input
+            v-model="formData.physicalExam"
+            type="textarea"
+            placeholder="请输入查体结果"
+            class="tall-textarea"
+            autosize
+          />
+        </el-form-item>
+
+        <el-form-item label="处置" prop="treatment" class="form-item-single">
+          <el-input
+            v-model="formData.treatment"
+            type="textarea"
+            placeholder="请输入处理方案"
+            class="tall-textarea"
+            autosize
+          />
+        </el-form-item>
+
+        <el-form-item label="辅助检查" prop="auxiliaryExam" class="form-item-single">
+          <el-input
+            v-model="formData.auxiliaryExam"
+            type="textarea"
+            placeholder="请输入辅助检查结果"
+            class="tall-textarea"
+            autosize
+          />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, onBeforeMount, onMounted, watch } from 'vue';
+import useUserStore from '../store/modules/user';
+import { ElInput, ElMessage, ElForm, ElFormItem } from 'element-plus';
+import { patientInfo } from '../views/doctorstation/components/store/patient';
+import { pa } from 'element-plus/es/locales.mjs';
+
+defineOptions({
+  name: 'OutpatientMedicalRecord',
+  components: { ElInput, ElMessage, ElForm, ElFormItem },
+});
+
+// // Props与事件,去掉props.patientInfo改为直接从store获取
+// const props = defineProps({
+//   patientInfo: {
+//     type: Object,
+//     required: true,
+//   },
+// });
+const props = defineProps({});
+const emits = defineEmits(['submitOk']);
+
+// 数据初始化
+const userStore = useUserStore();
+const patient = ref(null);
+const formRef = ref(null);
+
+// 表单数据（全部字符类型）
+const formData = reactive({
+  height: '', // 身高
+  weight: '', // 体重
+  temperature: '', // 体温
+  pulse: '', // 脉搏
+  onsetDate: '', // 发病日期
+  complaint: '', // 主诉（必填）
+  presentIllness: '', // 现病史
+  pastIllness: '', // 既往史
+  personalHistory: '', // 个人史
+  allergyHistory: '', // 过敏史
+  physicalExam: '', // 查体
+  treatment: '', // 处理
+  auxiliaryExam: '', // 辅助检查
+  familyHistory: '', // 家族史
+});
+
+// 表单校验规则
+const rules = reactive({
+  complaint: [
+    {
+      required: true,
+      message: '请填写主诉',
+      trigger: ['blur', 'submit'],
+    },
+  ],
+});
+
+// 提交函数
+const submit = () => {
+  formRef.value.validate((isValid) => {
+    if (isValid) {
+      emits('submitOk', formData);
+      ElMessage.success('提交成功');
+    }
+  });
+};
+// 日期格式化工具
+const formatDateTime = (date) => {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hour = String(date.getHours()).padStart(2, '0');
+  const minute = String(date.getMinutes()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hour}:${minute}`;
+};
+// 表单数据赋值
+const setFormData = (data) => {
+  if (data) {
+    Object.assign(formData, data);
+  }
+};
+
+// 生命周期
+onBeforeMount(() => {});
+onMounted(() => {
+  console.log('当前患者信息:', patientInfo);
+  patient.value = patientInfo.value;
+  // 初始化发病日期为当前时间
+  if (!formData.onsetDate) {
+    formData.onsetDate = formatDateTime(new Date());
+  }
+});
+
+// 监听患者信息变化，实现联动显示
+watch(
+  () => patientInfo.value,
+  (newPatientInfo) => {
+    patient.value = newPatientInfo;
+  },
+  { deep: true }
+);
+
+// 暴露接口
+defineExpose({ formData, submit, setFormData });
+</script>
+
+<style scoped>
+/* 表单外层容器 */
+.medical-form {
+  max-width: 1200px;
+  width: 100%;
+  min-height: 800px;
+  height: 900px;
+  margin: 15px auto;
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  font-family: Arial, sans-serif;
+  box-sizing: border-box;
+  overflow: visible;
+}
+
+/* 顶部姓名样式 */
+.patient-name {
+  display: inline-block;
+  margin-bottom: 15px;
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+}
+
+/* 滚动内容容器 */
+.form-scroll-container {
+  width: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
+  overflow-x: hidden;
+  scrollbar-width: thin;
+  scrollbar-color: #ccc #f5f5f5;
+}
+.form-scroll-container::-webkit-scrollbar {
+  width: 6px;
+}
+.form-scroll-container::-webkit-scrollbar-thumb {
+  background-color: #ccc;
+  border-radius: 3px;
+}
+.form-scroll-container::-webkit-scrollbar-track {
+  background-color: #f5f5f5;
+}
+
+/* 完整表单容器 */
+.medical-full-form {
+  width: 100%;
+}
+
+/* 区域通用样式 */
+.form-section {
+  margin-bottom: 20px;
+}
+.section-title {
+  margin: 0 0 12px;
+  padding-bottom: 6px;
+  border-bottom: 1px solid #f0f0f0;
+  color: #333;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/* 通用单行自适应布局（基础信息+病史信息共用） */
+.single-row-layout {
+  display: flex;
+  flex-wrap: wrap; /* 自动换行 */
+  align-items: flex-start; /* 顶部对齐，适配文本域高度 */
+  gap: 15px; /* 统一元素间距 */
+}
+.row-item {
+  margin-bottom: 0; /* 取消底部间距，避免换行重叠 */
+  display: flex;
+  flex-direction: column;
+}
+
+/* 基础信息项：适配短输入框 */
+.row-item:not(.history-item) {
+  min-width: 160px; /* 基础信息项最小宽度 */
+}
+
+/* 病史信息项：适配文本域，设置更大最小宽度 */
+.history-item {
+  min-width: 220px; /* 确保文本域有足够宽度 */
+}
+
+/* 带单位的输入框样式 */
+.input-with-unit {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+}
+.input-with-unit .el-input {
+  flex: 1;
+}
+.unit {
+  font-weight: 500;
+  color: #333;
+  white-space: nowrap;
+  font-size: 14px;
+}
+
+/* 单行表单项样式（主诉、查体等） */
+.form-item-single {
+  margin-bottom: 18px;
+}
+
+/* 文本域高度控制 */
+.tall-textarea {
+  --el-input-textarea-min-height: 100px;
+}
+/* 病史信息文本域：适当降低高度，适配单行布局 */
+.history-item .el-input__inner {
+  --el-input-textarea-min-height: 60px;
+}
+
+/* 必填项红色星号 */
+.required .el-form-item__label::before {
+  content: '* ';
+  color: #ff4d4f;
+}
+
+/* 输入框统一样式 */
+.el-form-item .el-input,
+.el-form-item .el-input__wrapper {
+  width: 100%;
+  box-sizing: border-box;
+}
+.el-form-item .el-input__inner {
+  font-size: 14px;
+  padding: 8px 12px;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .medical-form {
+    height: 80vh;
+    padding: 10px;
+  }
+  .form-scroll-container {
+    height: calc(100% - 35px);
+  }
+  .el-form {
+    label-width: 70px !important;
+  }
+  .row-item:not(.history-item) {
+    min-width: 130px;
+  }
+  .history-item {
+    min-width: 100%; /* 移动端病史信息全屏宽度，单行显示 */
+  }
+  .form-item-single,
+  .form-section {
+    margin-bottom: 15px;
+  }
+  .tall-textarea {
+    --el-input-textarea-min-height: 80px;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/template/tySurgicalRecord.vue b/openhis-ui-vue3/src/template/tySurgicalRecord.vue
new file mode 100644
index 00000000..289040f1
--- /dev/null
+++ b/openhis-ui-vue3/src/template/tySurgicalRecord.vue
@@ -0,0 +1,359 @@
+<template>
+  <div class="medical-document" >
+      <!-- 操作按钮 -->
+      <div class="btn-group">
+        <el-button type="success" @click="handlePrint">打印记录</el-button>
+        <!-- <el-button type="warning" @click="handleReset">重置表单</el-button> -->
+      </div>
+    <!-- 标题区域 -->
+    <div class="doc-header">
+       <h2  class="doc-title">{{ userStore.hospitalName}}</h2>
+      <h1 class="doc-title">手术记录</h1>
+      <div class="doc-subtitle">病历号: {{ formData.busNo || '待填写' }}</div>
+    </div>
+
+    <!-- 内容区域 -->
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="rules"
+      label-width="100px"
+      label-align="left"
+      class="doc-content"
+      style="height: 50vh;overflow: scroll;"
+    >
+      <!-- 患者基础信息 -->
+      <section class="doc-section">
+        <h2 class="section-title">一、患者基础信息</h2>
+        <div class="adaptive-grid">
+          <el-form-item label="姓名" prop="patientName" class="grid-item required">
+            <el-input v-model="formData.patientName" placeholder="请输入患者姓名" clearable />
+          </el-form-item>
+          
+          <el-form-item label="性别" prop="gender" class="grid-item required">
+            <el-select v-model="formData.gender" placeholder="请选择性别">
+              <el-option label="男性" value="男性" />
+              <el-option label="女性" value="女性" />
+            </el-select>
+          </el-form-item>
+          
+          <el-form-item label="年龄" prop="age" class="grid-item required">
+            <div class="input-with-unit">
+              <el-input v-model.number="formData.age" placeholder="请输入年龄" />
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="科室" prop="department" class="grid-item required">
+            <el-input v-model="formData.department" placeholder="如：普外科" clearable />
+          </el-form-item>
+<!--           
+          <el-form-item label="病房/床号" prop="bedNo" class="grid-item required">
+            <el-input v-model="formData.bedNo" placeholder="如：502-03" clearable />
+          </el-form-item> -->
+          
+          <el-form-item label="手术日期" prop="operationDate" class="grid-item required">
+            <el-date-picker
+              v-model="formData.operationDate"
+              type="date"
+              placeholder="选择手术日期"
+              value-format="YYYY-MM-DD"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </div>
+      </section>
+
+      <!-- 手术综合信息 -->
+      <section class="doc-section">
+        <h2 class="section-title">二、手术综合信息</h2>
+        <el-form-item label="详细记录" prop="surgicalDetails" class="full-width-item required">
+          <el-input
+            v-model="formData.surgicalDetails"
+            type="textarea"
+            placeholder="请整合记录：手术团队、手术名称、术中发现、术后情况、签署信息等"
+            autosize
+          />
+        </el-form-item>
+      </section>
+
+    
+    </el-form>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage, ElMessageBox, ElForm, ElFormItem, ElInput, ElSelect, ElOption, ElDatePicker, ElButton } from 'element-plus';
+import { patientInfo } from '../views/doctorstation/components/store/patient';
+import useUserStore from '../store/modules/user';
+
+defineOptions({
+  name: 'tySurgicalRecord'
+});
+// 表单引用
+const formRef = ref(null);
+// // Props与事件,去掉props.patientInfo改为直接从store获取
+// const props = defineProps({
+//   patientInfo: {
+//     type: Object,
+//     required: true,
+//   },
+// });
+const props = defineProps({});
+const emits = defineEmits(['submitOk']);
+const userStore = useUserStore();
+const patient = patientInfo.value;
+// 表单数据
+const formData = reactive({
+  busNo:  patient?.busNo || '',
+  patientName:  patient?.patientName || '',
+  gender: patient?.genderEnum_enumText || '',
+  age: patient?.age || '',
+  department: '',
+  bedNo: '',
+  operationDate: '',
+  surgicalDetails: ''
+});
+
+// 表单验证规则
+const rules = reactive({
+  busNo: [
+    { required: true, message: '请填写病历号', trigger: ['blur', 'submit'] }
+  ],
+  patientName: [
+    { required: true, message: '请填写患者姓名', trigger: ['blur', 'submit'] }
+  ],
+  gender: [
+    { required: true, message: '请选择性别', trigger: ['change', 'submit'] }
+  ],
+  age: [
+    { required: true, message: '请填写年龄', trigger: ['blur', 'submit'] }
+    // { type: 'number', min: 0, max: 150, message: '年龄需在0-150之间', trigger: ['blur', 'submit'] }
+  ],
+  department: [
+    { required: true, message: '请填写科室', trigger: ['blur', 'submit'] }
+  ],
+//   bedNo: [
+//     { required: true, message: '请填写病房/床号', trigger: ['blur', 'submit'] }
+//   ],
+  operationDate: [
+    { required: true, message: '请选择手术日期', trigger: ['change', 'submit'] }
+  ],
+  surgicalDetails: [
+    { required: true, message: '请填写手术综合信息', trigger: ['blur', 'submit'] }
+  ]
+});
+
+// 提交表单
+const submit = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      emits('submitOk', formData);
+      ElMessage.success('手术记录保存成功');
+      console.log('手术记录数据:', formData);
+    }
+  });
+};
+
+// 打印功能
+const handlePrint = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+    //   window.print();
+        ElMessage.warning('打印功能待实现');
+    } else {
+      ElMessage.warning('请先完善表单信息再打印');
+    }
+  });
+};
+
+// 重置表单
+const handleReset = () => {
+  ElMessageBox.confirm(
+    '确定要重置表单吗？所有已填写内容将被清空',
+    '确认重置',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
+  ).then(() => {
+    formRef.value.resetFields();
+    const today = new Date();
+    formData.operationDate = formatDate(today);
+    ElMessage.success('表单已重置');
+  });
+};
+
+// 日期格式化
+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 setFormData = (data) => {
+  if (data) {
+    Object.assign(formData, data);
+  }
+};
+
+// 生命周期
+onBeforeMount(() => {});
+onMounted(() => {
+   // 初始化手术日期为当前时间
+   console.log('patientInfo', patient);
+   console.log('userStore', userStore, formData.department);
+  if (!formData.operationDate) {
+   formData.operationDate = formatDate(new Date());
+  }
+  if(formData.department==='' ){
+    formData.department=userStore.orgName;
+  }
+});
+// 暴露接口
+defineExpose({ formData, submit, setFormData });
+</script>
+
+<style scoped>
+.medical-document {
+  max-width: 1200px;
+  height: auto;
+  margin: 20px auto;
+  padding: 30px;
+  background: #fff;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  font-family: 'SimSun', '宋体', serif;
+}
+
+.doc-header {
+  text-align: center;
+  margin-bottom: 30px;
+}
+
+.doc-title {
+  font-size: 24px;
+  margin: 0 0 10px;
+  font-weight: bold;
+}
+
+.doc-subtitle {
+  font-size: 16px;
+  color: #666;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #333;
+}
+
+.doc-content {
+  width: 100%;
+}
+
+.doc-section {
+  margin-bottom: 30px;
+  padding-bottom: 20px;
+  border-bottom: 1px dashed #ccc;
+}
+
+.section-title {
+  font-size: 18px;
+  margin: 0 0 15px;
+  color: #333;
+  font-weight: bold;
+}
+
+.adaptive-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 15px 20px;
+  margin-bottom: 15px;
+}
+
+.grid-item {
+  margin-bottom: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.grid-item .el-form-item__content {
+  flex: 1;
+  min-width: 0;
+}
+
+.full-width-item {
+  width: 100%;
+  margin-bottom: 15px;
+}
+
+.input-with-unit {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.unit {
+  white-space: nowrap;
+  color: #666;
+}
+
+/* 按钮组：强制靠右，增加margin确保间距 */
+.btn-group {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20px;
+  margin-bottom: 30px;
+  width: 100%; /* 确保容器占满宽度，实现真正靠右 */
+}
+
+.required .el-form-item__label::before {
+  content: '*';
+  color: #ff4d4f;
+  margin-right: 4px;
+}
+
+.el-textarea__inner {
+  line-height: 1.6;
+  padding: 12px;
+}
+
+@media (max-width: 768px) {
+  .medical-document {
+    padding: 15px;
+  }
+  
+  .adaptive-grid {
+    grid-template-columns: 1fr;
+  }
+  
+  .doc-title {
+    font-size: 20px;
+  }
+  
+  .section-title {
+    font-size: 16px;
+  }
+}
+
+@media print {
+  .btn-group {
+    display: none;
+  }
+  
+  .medical-document {
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
+  }
+  
+  .el-input__inner, .el-select__input, .el-textarea__inner {
+    border: none !important;
+    box-shadow: none !important;
+    background: transparent !important;
+  }
+  
+  .el-form-item__label {
+    font-weight: bold !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/utils/his.js b/openhis-ui-vue3/src/utils/his.js
index 35c66b3a..65c89f1b 100644
--- a/openhis-ui-vue3/src/utils/his.js
+++ b/openhis-ui-vue3/src/utils/his.js
@@ -459,3 +459,46 @@ export async function selectPrinterAndPrint(data, template, showPrinterDialog, m
     modal.msgError(error.message || '获取打印机列表失败');
   }
 }
+
+// 分组标记处理
+export function getGroupMarkers(tableData) {
+  // 初始化所有行的 groupIcon 为 null
+  tableData.forEach((item) => {
+    item.groupIcon = null;
+  });
+
+  // 创建一个映射来存储每个 groupId 对应的行索引
+  const groupMap = {};
+
+  // 遍历列表，按 groupId 分组（忽略无 groupId 的项）
+  tableData.forEach((item, index) => {
+    if (!item.groupId) {
+      return;
+    }
+
+    if (!groupMap[item.groupId]) {
+      groupMap[item.groupId] = [];
+    }
+    groupMap[item.groupId].push(index);
+  });
+
+  // 为每个组设置 groupIcon
+  Object.values(groupMap).forEach((indices) => {
+    // 只有当组内元素大于1个时才需要显示分组标记
+    if (indices.length > 1) {
+      indices.forEach((index, i) => {
+        if (i === 0) {
+          // 第一行
+          tableData[index].groupIcon = '┏';
+        } else if (i === indices.length - 1) {
+          // 最后一行
+          tableData[index].groupIcon = '┗';
+        } else {
+          // 中间行
+          tableData[index].groupIcon = '┃';
+        }
+      });
+    }
+  });
+  return tableData;
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/utils/printUtils.js b/openhis-ui-vue3/src/utils/printUtils.js
new file mode 100644
index 00000000..1ba2cac5
--- /dev/null
+++ b/openhis-ui-vue3/src/utils/printUtils.js
@@ -0,0 +1,293 @@
+/**
+ * 打印工具类
+ * 集中管理所有打印相关功能
+ */
+
+// 打印模板映射表
+const TEMPLATE_MAP = {
+  // CLINIC_CHARGE: () => import('@/views/charge/cliniccharge/components/template.json'),
+  // DISPOSAL: () => import('@/views/clinicmanagement/disposal/components/disposalTemplate.json'),
+  //处方签
+  PRESCRIPTION: () => import('@/components/Print/Prescription.json'),
+  //处置单
+  DISPOSAL: () => import('@/components/Print/Disposal.json'),
+  //门诊日结
+  DAY_END: () => import('@/components/Print/DailyOutpatientSettlement.json'),
+  WESTERN_MEDICINE: () =>
+    import('@/views/pharmacymanagement/westernmedicine/components/templateJson.json'),
+  IN_HOSPITAL_DISPENSING: () =>
+    import('@/views/drug/inHospitalDispensing/components/templateJson.json'),
+  //门诊挂号
+  OUTPATIENT_REGISTRATION: () => import('@/components/Print/OutpatientRegistration.json'),
+  //门诊收费
+  OUTPATIENT_CHARGE: () => import('@/components/Print/OutpatientBilling.json'),
+};
+
+/**
+ * 极简打印方法
+ * @param {string} templateName 打印模板名称（常量或字符串）
+ * @param {Array|Object} data 打印数据
+ * @param {string} printerName 打印机名称（可选）
+ * @param {Object} options 打印选项（可选）
+ * @returns {Promise} 打印结果Promise
+ */
+export async function simplePrint(templateName, data, printerName, options = {}) {
+  try {
+    // 获取模板
+    const template = await loadTemplate(templateName);
+
+    // 执行打印，业务名称默认为模板名称
+    return await executePrint(data, template, printerName, options, templateName);
+  } catch (error) {
+    console.error('打印失败:', error);
+    throw error;
+  }
+}
+
+/**
+ * 加载打印模板
+ * @param {string} templateName 模板名称
+ * @returns {Promise<Object>} 模板对象
+ */
+async function loadTemplate(templateName) {
+  // 如果是常量形式，获取实际的键名
+  const templateKey = typeof templateName === 'symbol' ? templateName.description : templateName;
+
+  if (!TEMPLATE_MAP[templateKey]) {
+    throw new Error(`未找到打印模板: ${templateKey}`);
+  }
+
+  try {
+    const templateModule = await TEMPLATE_MAP[templateKey]();
+    return templateModule.default || templateModule;
+  } catch (error) {
+    console.error(`加载模板 ${templateKey} 失败:`, error);
+    throw error;
+  }
+}
+
+/**
+ * 带打印机选择的极简打印方法
+ * @param {string} templateName 打印模板名称
+ * @param {Array|Object} data 打印数据
+ * @param {Function} showPrinterDialog 显示打印机选择对话框的函数
+ * @param {Object} modal 消息提示对象
+ * @param {Function} callback 打印完成后的回调函数（可选）
+ * @returns {Promise} 打印结果Promise
+ */
+export async function simplePrintWithDialog(
+  templateName,
+  data,
+  showPrinterDialog,
+  modal,
+  callback
+) {
+  try {
+    // 获取模板
+    const template = await loadTemplate(templateName);
+
+    // 执行打印
+    await selectPrinterAndPrint(data, template, showPrinterDialog, modal, callback, templateName);
+  } catch (error) {
+    modal.msgError(error.message || '打印失败');
+    if (callback) callback(error);
+  }
+}
+
+// 导出模板名称常量
+export const PRINT_TEMPLATE = {
+  // CLINIC_CHARGE: 'CLINIC_CHARGE',
+  DAY_END: 'DAY_END',
+  WESTERN_MEDICINE: 'WESTERN_MEDICINE',
+  IN_HOSPITAL_DISPENSING: 'IN_HOSPITAL_DISPENSING',
+  //门诊挂号
+  OUTPATIENT_REGISTRATION: 'OUTPATIENT_REGISTRATION',
+  //门诊收费
+  OUTPATIENT_CHARGE: 'OUTPATIENT_CHARGE',
+  //处方签
+  PRESCRIPTION: 'PRESCRIPTION',
+  //处置单
+  DISPOSAL: 'DISPOSAL',
+};
+
+/**
+ * 获取打印机列表
+ * @returns {Array} 打印机列表
+ */
+export function getPrinterList() {
+  try {
+    const printerList =
+      window.hiprint && window.hiprint.hiwebSocket
+        ? window.hiprint.hiwebSocket.getPrinterList()
+        : [];
+    return printerList || [];
+  } catch (error) {
+    console.error('获取打印机列表失败:', error);
+    return [];
+  }
+}
+
+import useUserStore from '@/store/modules/user';
+
+/**
+ * 获取当前登录用户ID
+ * @returns {string} 用户ID
+ */
+function getCurrentUserId() {
+  try {
+    // 从Pinia store中获取当前用户ID
+    const userStore = useUserStore();
+    return userStore.id || '';
+  } catch (e) {
+    console.error('获取用户ID失败:', e);
+    return '';
+  }
+}
+
+/**
+ * 生成打印机缓存键
+ * @param {string} businessName 打印业务名称
+ * @returns {string} 缓存键
+ */
+function getPrinterCacheKey(businessName) {
+  const userId = getCurrentUserId();
+  return `selectedPrinter_${businessName || 'default'}_${userId}`;
+}
+
+/**
+ * 从缓存获取上次选择的打印机
+ * @param {string} businessName 打印业务名称
+ * @returns {string} 打印机名称
+ */
+export function getCachedPrinter(businessName = 'default') {
+  const cacheKey = getPrinterCacheKey(businessName);
+  return localStorage.getItem(cacheKey) || '';
+}
+
+/**
+ * 保存打印机选择到缓存
+ * @param {string} printerName 打印机名称
+ * @param {string} businessName 打印业务名称
+ */
+export function savePrinterToCache(printerName, businessName = 'default') {
+  if (printerName) {
+    const cacheKey = getPrinterCacheKey(businessName);
+    localStorage.setItem(cacheKey, printerName);
+  }
+}
+
+/**
+ * 执行打印操作
+ * @param {Array} data 打印数据
+ * @param {Object} template 打印模板
+ * @param {string} printerName 打印机名称（可选）
+ * @param {Object} options 打印选项（可选）
+ * @param {string} businessName 打印业务名称（可选）
+ * @returns {Promise} 打印结果Promise
+ */
+export function executePrint(data, template, printerName, options = {}, businessName = 'default') {
+  return new Promise((resolve, reject) => {
+    try {
+      if (!window.hiprint) {
+        throw new Error('打印插件未加载');
+      }
+
+      const hiprintTemplate = new window.hiprint.PrintTemplate({ template });
+      const printOptions = {
+        title: '打印标题',
+        height: 210,
+        width: 148,
+        ...options,
+      };
+
+      // 如果指定了打印机，添加到打印选项中
+      if (printerName) {
+        printOptions.printer = printerName;
+        // 保存到缓存
+        savePrinterToCache(printerName, businessName);
+      }
+
+      // 打印成功回调
+      hiprintTemplate.on('printSuccess', function (e) {
+        resolve({ success: true, event: e });
+      });
+
+      // 打印失败回调
+      hiprintTemplate.on('printError', function (e) {
+        reject({ success: false, event: e, message: '打印失败' });
+      });
+
+      // 执行打印
+      hiprintTemplate.print2(data, printOptions);
+    } catch (error) {
+      reject({ success: false, error: error, message: error.message || '打印过程中发生错误' });
+    }
+  });
+}
+
+/**
+ * 选择打印机并执行打印
+ * @param {Array} data 打印数据
+ * @param {Object} template 打印模板
+ * @param {Function} showPrinterDialog 显示打印机选择对话框的函数
+ * @param {Object} modal 消息提示对象
+ * @param {Function} callback 打印完成后的回调函数
+ * @param {string} businessName 打印业务名称（可选）
+ */
+export async function selectPrinterAndPrint(
+  data,
+  template,
+  showPrinterDialog,
+  modal,
+  callback,
+  businessName = 'default'
+) {
+  try {
+    // 获取打印机列表
+    const printerList = getPrinterList();
+
+    if (printerList.length === 0) {
+      modal.msgWarning('未检测到可用打印机');
+      return;
+    }
+
+    // 获取缓存的打印机
+    const cachedPrinter = getCachedPrinter(businessName);
+    let selectedPrinter = '';
+
+    // 判断打印机选择逻辑
+    if (printerList.length === 1) {
+      selectedPrinter = printerList[0].name;
+      await executePrint(data, template, selectedPrinter, {}, businessName);
+      if (callback) callback();
+    } else if (cachedPrinter && printerList.some((printer) => printer.name === cachedPrinter)) {
+      selectedPrinter = cachedPrinter;
+      await executePrint(data, template, selectedPrinter, {}, businessName);
+      if (callback) callback();
+    } else {
+      // 调用显示打印机选择对话框的函数
+      showPrinterDialog(printerList, async (chosenPrinter) => {
+        try {
+          await executePrint(data, template, chosenPrinter, {}, businessName);
+          if (callback) callback();
+        } catch (error) {
+          modal.msgError(error.message || '打印失败');
+        }
+      });
+    }
+  } catch (error) {
+    modal.msgError(error.message || '获取打印机列表失败');
+  }
+}
+
+// 默认导出简化的打印方法
+export default {
+  print: simplePrint,
+  printWithDialog: simplePrintWithDialog,
+  TEMPLATE: PRINT_TEMPLATE,
+  executePrint,
+  selectPrinterAndPrint,
+  getPrinterList,
+  getCachedPrinter,
+  savePrinterToCache,
+};
diff --git a/openhis-ui-vue3/src/views/basicmanage/caseTemplates/components/editTemplate.vue b/openhis-ui-vue3/src/views/basicmanage/caseTemplates/components/editTemplate.vue
index bf937212..93256bad 100644
--- a/openhis-ui-vue3/src/views/basicmanage/caseTemplates/components/editTemplate.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/caseTemplates/components/editTemplate.vue
@@ -116,7 +116,7 @@ const props = defineProps({
 })
 const userStore = useUserStore();
 const formRef = ref(null)
-
+console.log(components,'----components');
 const dialogVisible= defineModel( 'dialogVisible', {
   type: Boolean,
   default: false
diff --git a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/batchAddDialog.vue b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/batchAddDialog.vue
new file mode 100644
index 00000000..aff4fd40
--- /dev/null
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/batchAddDialog.vue
@@ -0,0 +1,195 @@
+<template>
+  <div class="LaboratoryTests-container">
+    <el-dialog
+      title="批量导入项目"
+      :model-value="props.dialogVisible"
+      @update:modelValue="(val) => emit('update:dialogVisible', val)"
+      width="842"
+      append-to-body
+      destroy-on-close
+      :draggable="true"
+    >
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form ref="formEl" :rules="rules" :model="form" label-width="100px">
+            <el-form-item label="项目类型" prop="clinicalType">
+              <el-select
+                v-model="form.clinicalType"
+                placeholder="请选择"
+                @change="getList()"
+                filterable
+                clearable
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="item in categoryCodeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30" style="margin-top: 30px">
+        <el-col :span="24">
+          <el-transfer
+            v-model="transferValue"
+            :data="applicationList"
+            filter-placeholder="项目代码/名称"
+            filterable
+            :titles="['未选择', '已选择']"
+            style="width: 100%"
+          />
+        </el-col>
+      </el-row>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="onCancel">取消</el-button>
+          <el-button type="primary" @click="onConfirm"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script setup name="LaboratoryTests">
+import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
+import {
+  getApplicationList,
+  editImplementDepartment,
+  addImplementDepartment,
+} from './implementDepartment.js';
+const { proxy } = getCurrentInstance();
+// 属性
+const props = defineProps({
+  // 弹框显示信息
+  dialogVisible: {
+    type: Boolean,
+    default: false,
+  },
+  // 选择科室
+  organizationId: {
+    type: String,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['update:dialogVisible', 'confirm', 'cancel', 'submitOk']);
+// 申请项目列表
+const applicationListAll = ref();
+// 获取所有申请项目
+const applicationList = ref();
+// 申请项目列表
+const transferValue = ref([]);
+// 项目类型
+const formEl = ref();
+const form = reactive({ clinicalType: '23' });
+// 加载中
+const loading = ref(false);
+// 弹窗显隐由父组件控制，通过 v-model 事件同步
+// 项目类型
+const categoryCodeList = ref([
+  { label: '治疗', value: '21' },
+  { label: '检验', value: '22' },
+  { label: '检查', value: '23' },
+  { label: '手术', value: '24' },
+]);
+// 规则校验
+const rules = ref({
+  clinicalType: [{ required: true, message: '请选择项目类型', trigger: 'change' }],
+});
+const getList = () => {
+  if (!form.clinicalType) {
+    return;
+  }
+  loading.value = true;
+  getApplicationList({
+    pageSize: 10000,
+    pageNum: 1,
+    // 项目类型 枚举类中
+    categoryCode: form.clinicalType,
+    adviceTypes: '3', //1 药品 2耗材 3诊疗
+  }).then((res) => {
+    if (res.code === 200) {
+      loading.value = false;
+      applicationListAll.value = res.data.records;
+      applicationList.value = res.data.records.map((item) => {
+        return {
+          label: item.adviceName + item.adviceDefinitionId,
+          key: item.adviceDefinitionId,
+        };
+      });
+    } else {
+      proxy.$message.error(res.message);
+      applicationList.value = [];
+    }
+  });
+};
+
+function onCancel() {
+  emit('cancel');
+  emit('update:dialogVisible', false);
+}
+
+// 批量添加
+async function onConfirm() {
+  if (!formEl) return;
+  formEl.value.validate(async (valid) => {
+    if (!valid) return;
+    if (!transferValue.value || transferValue.value.length === 0) {
+      proxy.$message.error('请选择至少一个项目');
+      return;
+    }
+    const requests = (transferValue.value || []).map((defId) => {
+      const params = {
+        // 诊疗定义id
+        activityDefinitionId: defId,
+        // 科室ID
+        organizationId: props.organizationId,
+        // 诊疗类型
+        activityCategoryCode: form.clinicalType,
+        // 开始时间
+        startTime: '00:00:00',
+        // 结束时间
+        endTime: '23:59:59',
+        /*
+          方法类别：DistributionCategoryCodeEnum 枚举
+          desription: 8代表诊疗
+        */
+        distributionCategoryCode: '8',
+      };
+      return handleSave(params);
+    });
+    await Promise.all(requests);
+    emit('submitOk');
+    emit('update:dialogVisible', false);
+    transferValue.value = [];
+  });
+}
+// 保存
+async function handleSave(params) {
+  if (params.id) {
+    return editImplementDepartment(params).then((res) => {
+      proxy.$modal.msgSuccess('保存成功！');
+      return res;
+    });
+  } else {
+    delete params.id;
+    return addImplementDepartment(params).then((res) => {
+      proxy.$modal.msgSuccess('保存成功！');
+      return res;
+    });
+  }
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
+<style lang="scss" scoped>
+:deep(.el-transfer-panel) {
+  width: 300px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js
index dd1d9042..1de7d418 100644
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/components/implementDepartment.js
@@ -1,68 +1,83 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 初始化
-export function getImplementDepartmentList(query) {
-  return request({
+export function getImplementDepartmentList (query) {
+  return request ({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 // 查询诊疗目录列表
-export function getDiagnosisTreatmentList(query) {
-  return request({
+export function getDiagnosisTreatmentList (query) {
+  return request ({
     url: '/base-data-manage/org-loc/org-loc',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 //查询诊疗目录详细
-export function getImplementDepartmentOne(query) {
-  return request({
+export function getImplementDepartmentOne (query) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-page',
     method: 'get',
-    params: query // 确保参数正确传递
-  })
+    params: query, // 确保参数正确传递
+  });
 }
 
 // 新增
-export function addImplementDepartment(data) {
-  return request({
+export function addImplementDepartment (data) {
+  return request ({
     url: '/base-data-manage/org-loc/org-loc',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 修改
-export function editImplementDepartment(data) {
-  return request({
+export function editImplementDepartment (data) {
+  return request ({
     url: '/base-data-manage/org-loc/org-loc',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 删除
-export function deleteImplementDepartment(data) {
-  return request({
+export function deleteImplementDepartment (data) {
+  return request ({
     url: '/base-data-manage/org-loc/org-loc?orgLocId=' + data.orgLocId,
     method: 'delete',
-  })
+  });
 }
 
 // 目录分类查询
-export function getDiseaseTreatmentInit() {
-  return request({
+export function getDiseaseTreatmentInit () {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/init',
-    method: 'get'
-  })
+    method: 'get',
+  });
 }
 
 // 目录分类子查询
-export function getDiseaseTreatmentInitLoc(id) {
-  return request({
+export function getDiseaseTreatmentInitLoc (id) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-one?id=' + id,
-    method: 'get'
-  })
+    method: 'get',
+  });
+}
+//医嘱大下拉
+export function getApplicationList (queryParams) {
+  return request ({
+    url: '/doctor-station/advice/advice-base-info',
+    method: 'get',
+    params: queryParams,
+  });
+}
+// 获取所有诊疗项目
+export function getAllTreatmentList () {
+  return request ({
+    url: '/app-common/activity-definition',
+    method: 'get',
+  });
 }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
index 2f0e5745..01a65b8b 100644
--- a/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -33,6 +33,17 @@
               >添加新项目</el-button
             >
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="Plus"
+              :disabled="isAddDisable"
+              @click="handleBacthAddItem"
+              v-hasPermi="['system:user:add']"
+              >批量新增项目配置</el-button
+            >
+          </el-col>
         </el-row>
 
         <el-table
@@ -41,54 +52,49 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="100" align="center" />
-          <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
-                  v-model="scope.row.activityCategoryCode"
-                  placeholder="请选择"
-                  ref="dropdown"
-                  @change="DiagnosisTreatmentList(scope.row,scope.$index,1)"
-                  :class="{ 'error-border': scope.row.error }"
-                  clearable
-                >
-                  <el-option
-                    v-for="dict in catagoryDicts"
-                    :key="dict.value"
-                    :label="dict.info"
-                    :value="dict.value"
-                  />
-                </el-select>
-              </div>
-            </template>
-          </el-table-column>
           <el-table-column
-            label="项目名称"
+            label="诊疗目录"
+            width="150"
             align="center"
             :show-overflow-tooltip="true"
           >
             <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="请选择"
-                  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="item in scope.row.projectList"
-                    :key="item.value"
-                    :label="item.info"
-                    :value="item.value"
-                  />
-                </el-select>
-              </div>
+              <el-select
+                v-model="scope.row.activityCategoryCode"
+                placeholder="请选择"
+                ref="dropdown"
+                :class="{ 'error-border': scope.row.error }"
+                clearable
+              >
+                <el-option
+                  v-for="dict in catagoryDicts"
+                  :key="dict.value"
+                  :label="dict.info"
+                  :value="dict.value"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目名称" align="center" :show-overflow-tooltip="true">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.activityDefinitionId"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="请选择"
+                remote-show-suffix
+                style="width: 400px; max-width: 500px"
+                :class="{ 'error-border': scope.row.error }"
+                clearable
+              >
+                <el-option
+                  v-for="item in allImplementDepartmentList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column
@@ -97,18 +103,15 @@
             key="startTime"
             prop="startTime"
             :show-overflow-tooltip="true"
-            width="300"
           >
             <template #default="scope">
-              <div style="display: flex; align-items: center; justify-content: center">
-                <el-time-picker
-                  v-model="scope.row.startTime"
-                  placeholder="选择时间"
-                  format="HH:mm:ss"
-                  value-format="HH:mm:ss"
-                >
-                </el-time-picker>
-              </div>
+              <el-time-picker
+                v-model="scope.row.startTime"
+                placeholder="选择时间"
+                format="HH:mm:ss"
+                value-format="HH:mm:ss"
+              >
+              </el-time-picker>
             </template>
           </el-table-column>
 
@@ -117,19 +120,16 @@
             align="center"
             key="endTime"
             prop="endTime"
-            :show-overflow-tooltip="true"
-            width="300"
+            show-overflow-tooltip
           >
             <template #default="scope">
-              <div style="display: flex; align-items: center; justify-content: center">
-                <el-time-picker
-                  v-model="scope.row.endTime"
-                  placeholder="选择时间"
-                  format="HH:mm:ss"
-                  value-format="HH:mm:ss"
-                >
-                </el-time-picker>
-              </div>
+              <el-time-picker
+                v-model="scope.row.endTime"
+                placeholder="选择时间"
+                format="HH:mm:ss"
+                value-format="HH:mm:ss"
+              >
+              </el-time-picker>
             </template>
           </el-table-column>
           <el-table-column
@@ -169,6 +169,11 @@
         />
       </el-col>
     </el-row>
+    <BacthAddItemDialog
+      v-model:dialogVisible="bacthAddItemDialogVisible"
+      :organizationId="organizationId"
+      @submitOk="getList"
+    />
   </div>
 </template>
 
@@ -178,14 +183,12 @@ import {
   getImplementDepartmentList,
   getDiagnosisTreatmentList,
   getDiseaseTreatmentInit,
-  getImplementDepartmentOne,
-  // getDiseaseTreatmentInitLoc,
+  getAllTreatmentList,
   addImplementDepartment,
   editImplementDepartment,
   deleteImplementDepartment,
 } from './components/implementDepartment';
-import { debounce } from 'lodash-es';
-import { fa } from 'element-plus/es/locales.mjs';
+import BacthAddItemDialog from './components/batchAddDialog.vue';
 const { proxy } = getCurrentInstance();
 const organization = ref([]);
 const loading = ref(true);
@@ -194,10 +197,11 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const catagoryList = ref([]);
-const projectList = ref([]);
 const catagoryDicts = ref([]);
 const isAddDisable = ref(true);
 const organizationId = ref('');
+// 批量添加
+const bacthAddItemDialogVisible = ref(false);
 //默认传8(诊疗)
 const distributionCategoryCode = ref('8');
 const data = reactive({
@@ -212,29 +216,15 @@ const data = reactive({
   },
   isAdding: false,
 });
-const debouncedRemoteMethod = debounce((query, row) => {
-  remoteMethod(query, row);
-}, 300);
-
 const { queryParams, tableRules } = toRefs(data);
-
 /** 查询表格数据列表 */
 function getList() {
-  let params = {
-    // 科室id
-    organizationId: organizationId.value,
-    // 类别
-    distributionCategoryCode: distributionCategoryCode.value,
-  };
-  getDiagnosisTreatmentList(params).then((res) => {
-    console.log(res.data.records)
+  queryParams.value.organizationId = organizationId.value;
+  queryParams.value.distributionCategoryCode = distributionCategoryCode.value;
+  loading.value = true;
+  getDiagnosisTreatmentList(queryParams.value).then((res) => {
     loading.value = false;
-    catagoryList.value = res.data.records
-    catagoryList.value.map((k,index)=>{
-      // if(k.activityCategoryCode){
-        DiagnosisTreatmentList(k,index, 2)
-      // }
-    })
+    catagoryList.value = res.data.records;
     total.value = res.data.total;
   });
 }
@@ -243,69 +233,21 @@ const filterNode = (value, data) => {
   if (!value) return true;
   return data.name.indexOf(value) !== -1;
 };
-
-//下拉诊疗目录点击事件
-function DiagnosisTreatmentList(row,index,type) {
-  let params = {
-    statusEnum: 2, // 状态（包括 1：预置，2：启用，3：停用）
-    ...row,
-    categoryCode: row.activityCategoryCode,
-    pageSize:100,
-  }
-  if(type == 1){
-    catagoryList.value[index].activityDefinitionId =''
-  }else if(type == 2){
-    params.searchKey = row.activityDefinitionId_dictText
-  }
-  console.log(params,'params');
-  getImplementDepartmentOne(params)
-    .then((res) => {
-      if (res.code === 200) {
-        projectList.value = [];
-        row.name = null;
-        projectList.value = res.data.records.map((item) => ({ value: item.id, info: item.name }));
-
-        catagoryList.value[index].projectList = projectList.value
-      } else {
-        proxy.$modal.msgError(res.msg);
-      }
-    })
-    .catch((error) => {
-      console.error('请求失败', error);
-    });
-}
-
-function remoteMethod(query, row) {
+// 所有诊疗项目列表
+const allImplementDepartmentList = ref([]);
+function getAllImplementDepartment() {
   loading.value = true;
-  const params = {
-    statusEnum: 2,
-    activityCategoryCode: row.activityCategoryCode, // 确保已选诊疗目录
-    searchKey: query, // 模糊搜索关键字
-     ...row,
-    categoryCode: row.activityCategoryCode,
-    pageSize:100,
-  };
-    console.log(params,row,query,'params');
-
-  getImplementDepartmentOne(params).then((res) => {
+  getAllTreatmentList().then((res) => {
+    allImplementDepartmentList.value = res.data.map((item) => ({
+      value: item.activityDefinitionId,
+      label: item.activityDefinitionName,
+    }));
     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);
-    }
   });
-  loading.value = false;
-
 }
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
@@ -317,13 +259,18 @@ function handleAddItem() {
     return;
   }
   const newRow = {
-    startTime:'00:00:00',
-    endTime:'23:59:59'
+    startTime: '00:00:00',
+    endTime: '23:59:59',
   };
   catagoryList.value.push(newRow);
   total.value = organization.value.length;
   data.isAdding = true; // 设置标志位为 true，表示有未保存的
 }
+// 批量添加
+function handleBacthAddItem() {
+  // 批量添加显示对话框
+  bacthAddItemDialogVisible.value = true;
+}
 // 检验 编辑或 保存数据
 function handleBlur(row, index) {
   let hasError = false;
@@ -336,8 +283,7 @@ function handleBlur(row, index) {
       if (message) {
         proxy.$message.error(message);
       } else {
-        console.error(`No rule defined for field: ${field}`);
-        proxy.$message.error(`No rule defined for field: ${field}`);
+        proxy.$message.error(`检验未通过`);
       }
     }
   });
@@ -357,6 +303,7 @@ function openSaveImplementDepartment(row) {
   handleBlur(row);
   if (row.error) {
     hasError = true;
+    return;
   }
   const startTime = params.startTime;
   const endTime = params.endTime;
@@ -383,22 +330,22 @@ function openSaveImplementDepartment(row) {
 }
 // 删除当前所选行
 function deleteSelectedRows(row) {
-  if (row.id) {
-    deleteImplementDepartment({ orgLocId: row.id }).then((res) => {});
-  } else {
-    catagoryList.value.pop();
-  }
-  proxy.$modal.msgSuccess('删除成功');
-  data.isAdding = false;
-  getList();
+  proxy.$modal.confirm('是否删除选中数据').then(() => {
+    if (row.id) {
+      deleteImplementDepartment({ orgLocId: row.id }).then((res) => {});
+    } else {
+      catagoryList.value.pop();
+    }
+    proxy.$modal.msgSuccess('删除成功');
+    data.isAdding = false;
+    getList();
+  });
 }
 /** 节点单击事件 */
-function handleNodeClick(data, node) {
-  catagoryList.value.map(k=>{
-    if(!k.id){
-      openSaveImplementDepartment(k)
-    }
-  })
+function handleNodeClick(res, node) {
+  // 新增按钮是否 disable
+  data.isAdding = false;
+
   // 新增按钮是否 disable
   if (node.parent === null || node.level === 1) {
     isAddDisable.value = true;
@@ -418,7 +365,10 @@ function handleNodeClick(data, node) {
 
 /** 目录分类查询 */
 function getDiseaseTreatmentList() {
+  loading.value = true;
   getDiseaseTreatmentInit().then(({ data }) => {
+    loading.value = false;
+
     //分类目录初始化获取
     catagoryDicts.value = data.diagnosisCategoryOptions.sort((a, b) => {
       return parseInt(a.value) - parseInt(b.value);
@@ -431,6 +381,7 @@ function getDiseaseTreatmentList() {
 }
 // 诊疗目录分类查询下拉树结d构
 function getImplDepartList() {
+  loading.value = true;
   getImplementDepartmentList().then((res) => {
     loading.value = false;
     if (res.code === 200) {
@@ -450,8 +401,10 @@ function getImplDepartList() {
     }
   });
 }
-// 获取左侧执行科室配置目录
-getDiseaseTreatmentList();
+onMounted(() => {
+  getAllImplementDepartment();
+  getDiseaseTreatmentList();
+});
 </script>
 <style scoped>
 .el-form--inline .el-form-item {
@@ -463,15 +416,4 @@ getDiseaseTreatmentList();
 .error-border {
   border: 1px solid red;
 }
-/* ::v-deep.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{ */
-  /* background-color:  #c5e1ff!important; */
-  /* #d8ebff!important; */
-  /* #c5e1ff!important; */
-  /* #9fceff!important; */
-/* } */
-/* ::v-deep.el-tree--highlight-current{ */
-  /* background-color:#f8f8f9 !important; */
-   /* #ebf5ff!important; */
-/* } */
-
 </style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue
index f5d026a3..9f59f6be 100644
--- a/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue
@@ -48,7 +48,7 @@ const currentSelectRow = ref({});
 const queryParams = ref({
   pageSize: 100,
   pageNum: 1,
-  adviceTypes: '2,3',
+  adviceTypes: '1,2,3',
 });
 const adviceBaseList = ref([]);
 // 节流函数
diff --git a/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/index.vue b/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/index.vue
index 27ea2497..f1ffa035 100644
--- a/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/index.vue
@@ -5,79 +5,130 @@
         <div class="mb10">
           <el-row :gutter="10" class="mb10">
             <el-col :span="6">
-              <el-input v-model="personalQuery.searchKey" placeholder="请输入名称" clearable @keyup.enter="getPersonalListData" />
+              <el-input
+                v-model="personalQuery.searchKey"
+                placeholder="请输入名称"
+                clearable
+                @keyup.enter="getPersonalListData"
+              />
             </el-col>
             <el-col :span="1.5">
               <el-button type="primary" icon="Search" @click="getPersonalListData">查询</el-button>
             </el-col>
           </el-row>
-          <el-button type="primary" plain icon="Plus" @click="handleAdd('personal')">新增</el-button>
+          <el-button type="primary" plain icon="Plus" @click="handleAdd('personal')"
+            >新增</el-button
+          >
         </div>
         <el-table :data="personalList" border v-loading="loading.personal">
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="practitionerName" label="参与者" />
           <el-table-column label="操作" width="150">
             <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleEdit('personal', scope.row)">编辑</el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete('personal', scope.row)">删除</el-button>
+              <el-button link type="primary" icon="Edit" @click="handleEdit('personal', scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                link
+                type="danger"
+                icon="Delete"
+                @click="handleDelete('personal', scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      
+
       <el-tab-pane label="科室" name="department">
         <div class="mb10">
           <el-row :gutter="10" class="mb10">
             <el-col :span="6">
-              <el-input v-model="departmentQuery.searchKey" placeholder="请输入名称" clearable @keyup.enter="getDepartmentListData" />
+              <el-input
+                v-model="departmentQuery.searchKey"
+                placeholder="请输入名称"
+                clearable
+                @keyup.enter="getDepartmentListData"
+              />
             </el-col>
             <el-col :span="1.5">
-              <el-button type="primary" icon="Search" @click="getDepartmentListData">查询</el-button>
+              <el-button type="primary" icon="Search" @click="getDepartmentListData"
+                >查询</el-button
+              >
             </el-col>
           </el-row>
-          <el-button type="primary" plain icon="Plus" @click="handleAdd('department')">新增</el-button>
+          <el-button type="primary" plain icon="Plus" @click="handleAdd('department')"
+            >新增</el-button
+          >
         </div>
         <el-table :data="departmentList" border v-loading="loading.department">
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="organizationName" label="科室" />
           <el-table-column label="操作" width="150">
             <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleEdit('department', scope.row)">编辑</el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete('department', scope.row)">删除</el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleEdit('department', scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                link
+                type="danger"
+                icon="Delete"
+                @click="handleDelete('department', scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      
+
       <el-tab-pane label="全院" name="hospital">
         <div class="mb10">
           <el-row :gutter="10" class="mb10">
             <el-col :span="6">
-              <el-input v-model="hospitalQuery.searchKey" placeholder="请输入名称" clearable @keyup.enter="getHospitalListData" />
+              <el-input
+                v-model="hospitalQuery.searchKey"
+                placeholder="请输入名称"
+                clearable
+                @keyup.enter="getHospitalListData"
+              />
             </el-col>
             <el-col :span="1.5">
               <el-button type="primary" icon="Search" @click="getHospitalListData">查询</el-button>
             </el-col>
           </el-row>
-          <el-button type="primary" plain icon="Plus" @click="handleAdd('hospital')">新增</el-button>
+          <el-button type="primary" plain icon="Plus" @click="handleAdd('hospital')"
+            >新增</el-button
+          >
         </div>
         <el-table :data="hospitalList" border v-loading="loading.hospital">
           <el-table-column prop="name" label="名称" />
           <el-table-column label="操作" width="150">
             <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleEdit('hospital', scope.row)">编辑</el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete('hospital', scope.row)">删除</el-button>
+              <el-button link type="primary" icon="Edit" @click="handleEdit('hospital', scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                link
+                type="danger"
+                icon="Delete"
+                @click="handleDelete('hospital', scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>
-    
+
     <!-- 新增/编辑弹窗 -->
-    <el-dialog 
-      :title="dialogTitle" 
-      v-model="dialogVisible" 
-      width="800px" 
+    <el-dialog
+      :title="dialogTitle"
+      v-model="dialogVisible"
+      width="1300px"
       @close="handleDialogClose"
     >
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
@@ -89,11 +140,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="参与者" prop="practitionerId" v-if="currentTab == 'personal'">
-              <el-select
-                v-model="formData.practitionerId"
-                placeholder="请选择参与者"
-                clearable
-              >
+              <el-select v-model="formData.practitionerId" placeholder="请选择参与者" clearable>
                 <el-option
                   v-for="item in participantListOptions"
                   :key="item.practitionerId"
@@ -128,98 +175,189 @@
         @cell-click="clickRow"
         :expand-row-keys="expandOrder"
       >
-      <el-table-column label="医嘱" align="center" prop="productName">
-        <template #default="scope">
-          <template v-if="getRowDisabled(scope.row)">
-            <el-popover
-              :popper-style="{ padding: '0' }"
-              placement="bottom-start"
-              :visible="scope.row.showPopover"
-              :width="1200"
-            >
-              <adviceBaseList
-                ref="adviceTableRef"
-                :popoverVisible="scope.row.showPopover"
-                :adviceQueryParams="adviceQueryParams"
-                @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="(value) => handleInput(value, scope.row, scope.$index)"
-                  @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);
+        <el-table-column label="医嘱" align="center" prop="productName">
+          <template #default="scope">
+            <template v-if="getRowDisabled(scope.row)">
+              <el-popover
+                :popper-style="{ padding: '0' }"
+                placement="bottom-start"
+                :visible="scope.row.showPopover"
+                :width="1200"
+              >
+                <adviceBaseList
+                  ref="adviceTableRef"
+                  :popoverVisible="scope.row.showPopover"
+                  :adviceQueryParams="adviceQueryParams"
+                  @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="(value) => handleInput(value, scope.row, scope.$index)"
+                    @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" width="250" prop="sortNumber">
+          <template #default="scope">
+            <template v-if="scope.row.adviceType == 1">
+              <template v-if="!scope.row.groupPackageId">
+                <el-input
+                  style="width: 70px; margin-right: 10px"
+                  v-model="scope.row.doseQuantity"
+                  @input="
+                    (value) => {
+                      scope.row.dose = value * scope.row.unitConversionRatio;
                     }
                   "
-                  @blur="handleBlur(scope.row)"
+                />
+                <span>{{ scope.row.minUnitCode_dictText }}</span>
+                <span>{{ ' = ' }}</span>
+                <el-input
+                  style="width: 70px; margin-right: 10px"
+                  v-model="scope.row.dose"
+                  @input="
+                    (value) => {
+                      scope.row.doseQuantity = value / scope.row.unitConversionRatio;
+                    }
+                  "
+                />
+                <span>{{ scope.row.doseUnitCode_dictText }}</span>
+              </template>
+              <span v-else>{{ scope.row.dose }}</span>
+            </template>
+            <span v-else>{{ '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="给药途径" align="center" width="150" prop="sortNumber">
+          <template #default="scope">
+            <template v-if="scope.row.adviceType == 1">
+              <template v-if="!scope.row.groupPackageId">
+                <el-select
+                  v-model="scope.row.methodCode"
+                  placeholder="给药途径"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="dict in method_code"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </template>
+              <span v-else>{{ scope.row.methodCode }}</span>
+            </template>
+            <span v-else>{{ '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用药频次" align="center" width="150" prop="sortNumber">
+          <template #default="scope">
+            <template v-if="scope.row.adviceType == 1">
+              <template v-if="!scope.row.groupPackageId">
+                <el-select
+                  v-model="scope.row.rateCode"
+                  placeholder="频次"
+                  style="width: 120px"
+                  filterable
+                >
+                  <el-option
+                    v-for="dict in rate_code"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </template>
+              <span v-else>{{ scope.row.rateCode_dictText }}</span>
+            </template>
+            <span v-else>{{ '-' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用药天数" align="center" width="100" prop="sortNumber">
+          <template #default="scope">
+            <template v-if="scope.row.adviceType == 1">
+              <template v-if="!scope.row.groupPackageId">
+                <el-input
+                  v-model="scope.row.dispensePerDuration"
+                  @change="handleQuantityChange(scope.row)"
                 />
               </template>
-            </el-popover>
+              <span v-else>{{ scope.row.dispensePerDuration }}</span>
+            </template>
+            <span v-else>{{ '-' }}</span>
           </template>
-          <span v-else>{{ scope.row.adviceName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="数量" align="center" width="100" prop="sortNumber">
-        <template #default="scope"> 
-          <template v-if="!scope.row.groupPackageId">
-            <el-input 
-              v-model="scope.row.sortNumber" 
-              type="number"
-              min="1"
-              @change="handleQuantityChange(scope.row)"
+        </el-table-column>
+        <el-table-column label="总量/执行次数" align="center" width="150" prop="sortNumber">
+          <template #default="scope">
+            <template v-if="!scope.row.groupPackageId">
+              <el-input
+                v-model="scope.row.sortNumber"
+                type="number"
+                min="1"
+                @change="handleQuantityChange(scope.row)"
+              />
+            </template>
+            <span v-else>{{ scope.row.sortNumber }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单位" align="center" width="120" prop="unitCode">
+          <template #default="scope">
+            <template v-if="!scope.row.groupPackageId">
+              <el-select
+                v-model="scope.row.selectUnitCode"
+                placeholder="请选择单位"
+                @change="handleUnitChange(scope.row)"
+              >
+                <el-option
+                  v-if="scope.row.minUnitCode"
+                  :key="scope.row.minUnitCode"
+                  :label="scope.row.minUnitCode_dictText || scope.row.minUnitCode"
+                  :value="scope.row.minUnitCode"
+                />
+                <el-option
+                  v-if="scope.row.unitCode"
+                  :key="scope.row.unitCode"
+                  :label="scope.row.unitCode_dictText || scope.row.unitCode"
+                  :value="scope.row.unitCode"
+                />
+              </el-select>
+            </template>
+            <span>{{ scope.row.unitCodeName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="80">
+          <template #default="scope">
+            <el-button
+              type="danger"
+              icon="Delete"
+              circle
+              size="small"
+              @click="handleDeleteRow(scope.$index, scope.row)"
             />
           </template>
-          <span v-else>{{ scope.row.sortNumber }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" width="120" prop="unitCode">
-        <template #default="scope"> 
-          <template v-if="!scope.row.groupPackageId">
-            <el-select 
-              v-model="scope.row.selectUnitCode" 
-              placeholder="请选择单位"
-              @change="handleUnitChange(scope.row)"
-            >
-              <el-option
-                v-if="scope.row.minUnitCode"
-                :key="scope.row.minUnitCode"
-                :label="scope.row.minUnitCode_dictText || scope.row.minUnitCode"
-                :value="scope.row.minUnitCode"
-              />
-              <el-option
-                v-if="scope.row.unitCode"
-                :key="scope.row.unitCode"
-                :label="scope.row.unitCode_dictText || scope.row.unitCode"
-                :value="scope.row.unitCode"
-              />
-            </el-select>
-          </template>
-          <span>{{ scope.row.unitCodeName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="80">
-        <template #default="scope">
-          <el-button
-            type="danger"
-            icon="Delete"
-            circle
-            size="small"
-            @click="handleDeleteRow(scope.$index, scope.row)"
-          />
-        </template>
-      </el-table-column>
+        </el-table-column>
       </el-table>
       <template #footer>
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -230,7 +368,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted } from 'vue';
 import {
   getPersonalList,
   getDeptList,
@@ -241,138 +379,148 @@ import {
   saveAll,
   queryGroupDetail,
   getOrgTree,
-  deleteGroup
+  deleteGroup,
 } from './components/api.js';
 import adviceBaseList from './components/adviceBaseList';
 import { ElMessage } from 'element-plus';
 import useUserStore from '@/store/modules/user';
 
+// 获取当前实例用于使用proxy
+const { proxy } = getCurrentInstance();
 // 定义tab相关数据
-const activeTab = ref('personal')
+const activeTab = ref('personal');
 
 // 定义各tab列表数据
-const personalList = ref([])
-const departmentList = ref([])
-const hospitalList = ref([])
+const personalList = ref([]);
+const departmentList = ref([]);
+const hospitalList = ref([]);
 const prescriptionList = ref([]);
 const expandOrder = ref([]); //目前的展开行
-
+const { method_code, rate_code, distribution_category_code } = proxy.useDict(
+  'method_code',
+  'rate_code',
+  'distribution_category_code'
+);
 // 查询参数
-const personalQuery = reactive({ searchKey: '' })
-const departmentQuery = reactive({ searchKey: '' })
-const hospitalQuery = reactive({ searchKey: '' })
+const personalQuery = reactive({ searchKey: '' });
+const departmentQuery = reactive({ searchKey: '' });
+const hospitalQuery = reactive({ searchKey: '' });
 
 // 加载状态
 const loading = reactive({
   personal: false,
   department: false,
-  hospital: false
-})
+  hospital: false,
+});
 
 // 提交按钮加载状态
-const submitLoading = ref(false)
+const submitLoading = ref(false);
 
 // 弹窗相关数据
-const dialogVisible = ref(false)
-const dialogTitle = ref('')
-const currentTab = ref('') // 记录当前操作的tab
-const isEdit = ref(false) // 是否为编辑模式
-const currentRow = ref(null) // 当前编辑的行数据
-const participantListOptions = ref([])
+const dialogVisible = ref(false);
+const dialogTitle = ref('');
+const currentTab = ref(''); // 记录当前操作的tab
+const isEdit = ref(false); // 是否为编辑模式
+const currentRow = ref(null); // 当前编辑的行数据
+const participantListOptions = ref([]);
 const organization = ref([]);
-const adviceQueryParams = reactive({})
+const adviceQueryParams = reactive({});
 
 // 表单数据
 const formData = reactive({
   id: undefined,
-  name: ''
-})
+  name: '',
+});
 const nextId = ref(1);
 const rowIndex = ref(0);
 
 // 表单验证规则
 const formRules = {
-  name: [
-    { required: true, message: '请输入名称', trigger: 'blur' }
-  ]
-}
+  name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+};
 
 // 表单引用
-const formRef = ref()
+const formRef = ref();
 
 // 页面加载时获取所有列表数据
 onMounted(() => {
   // 可以添加初始查询参数
   const initialParams = {
-    searchKey: ''  // 初始查询关键字
+    searchKey: '', // 初始查询关键字
   };
-  
-  fetchAllData(initialParams)
-  getInit()
-})
+
+  fetchAllData(initialParams);
+  getInit();
+});
 
 function getInit() {
   queryParticipantList().then((res) => {
-    participantListOptions.value = res.data 
+    participantListOptions.value = res.data;
   });
-  getOrgTree().then(res => {
+  getOrgTree().then((res) => {
     organization.value = res.data.records;
-  })
+  });
 }
 
 // 获取所有数据
 function fetchAllData(params = {}) {
-  getPersonalListData(params)
-  getDepartmentListData(params)
-  getHospitalListData(params)
+  getPersonalListData(params);
+  getDepartmentListData(params);
+  getHospitalListData(params);
 }
 
 // 获取个人医嘱列表
 function getPersonalListData(params = {}) {
   // 合并查询参数
   Object.assign(personalQuery, params);
-  
-  loading.personal = true
-  getPersonalList(personalQuery).then(response => {
-    personalList.value = response.data
-    loading.personal = false
-  }).catch(error => {
-    console.error('获取个人医嘱列表失败:', error)
-    loading.personal = false
-    proxy.$modal.msgError('获取个人医嘱列表失败')
-  })
+
+  loading.personal = true;
+  getPersonalList(personalQuery)
+    .then((response) => {
+      personalList.value = response.data;
+      loading.personal = false;
+    })
+    .catch((error) => {
+      console.error('获取个人医嘱列表失败:', error);
+      loading.personal = false;
+      proxy.$modal.msgError('获取个人医嘱列表失败');
+    });
 }
 
 // 获取科室医嘱列表
 function getDepartmentListData(params = {}) {
   // 合并查询参数
   Object.assign(departmentQuery, params);
-  
-  loading.department = true
-  getDeptList(departmentQuery).then(response => {
-    departmentList.value = response.data
-    loading.department = false
-  }).catch(error => {
-    console.error('获取科室医嘱列表失败:', error)
-    loading.department = false
-    proxy.$modal.msgError('获取科室医嘱列表失败')
-  })
+
+  loading.department = true;
+  getDeptList(departmentQuery)
+    .then((response) => {
+      departmentList.value = response.data;
+      loading.department = false;
+    })
+    .catch((error) => {
+      console.error('获取科室医嘱列表失败:', error);
+      loading.department = false;
+      proxy.$modal.msgError('获取科室医嘱列表失败');
+    });
 }
 
 // 获取全院医嘱列表
 function getHospitalListData(params = {}) {
   // 合并查询参数
   Object.assign(hospitalQuery, params);
-  
-  loading.hospital = true
-  getAllList(hospitalQuery).then(response => {
-    hospitalList.value = response.data
-    loading.hospital = false
-  }).catch(error => {
-    console.error('获取全院医嘱列表失败:', error)
-    loading.hospital = false
-    proxy.$modal.msgError('获取全院医嘱列表失败')
-  })
+
+  loading.hospital = true;
+  getAllList(hospitalQuery)
+    .then((response) => {
+      hospitalList.value = response.data;
+      loading.hospital = false;
+    })
+    .catch((error) => {
+      console.error('获取全院医嘱列表失败:', error);
+      loading.hospital = false;
+      proxy.$modal.msgError('获取全院医嘱列表失败');
+    });
 }
 
 // tab切换处理
@@ -380,23 +528,23 @@ function handleTabChange(tab) {
   // 根据切换到的tab调用相应的接口获取数据
   switch (tab) {
     case 'personal':
-      getPersonalListData()
-      break
+      getPersonalListData();
+      break;
     case 'department':
-      getDepartmentListData()
-      break
+      getDepartmentListData();
+      break;
     case 'hospital':
-      getHospitalListData()
-      break
+      getHospitalListData();
+      break;
   }
 }
 
 // 新增按钮处理
 function handleAdd(tab) {
-  currentTab.value = tab
-  isEdit.value = false
-  dialogTitle.value = '新增医嘱'
-  dialogVisible.value = true
+  currentTab.value = tab;
+  isEdit.value = false;
+  dialogTitle.value = '新增医嘱';
+  dialogVisible.value = true;
   // 重置表单
   prescriptionList.value.unshift({
     uniqueKey: nextId.value++,
@@ -405,40 +553,40 @@ function handleAdd(tab) {
     isEdit: true,
     statusEnum: 1,
   });
-  formData.groupPackageId = undefined
-  formData.name = ''
-  
+  formData.groupPackageId = undefined;
+  formData.name = '';
+
   // 获取当前登录用户信息
-  const userStore = useUserStore()
-  const userId = userStore.id
-  const orgId = userStore.orgId
-  const practitionerId = userStore.practitionerId
-  
+  const userStore = useUserStore();
+  const userId = userStore.id;
+  const orgId = userStore.orgId;
+  const practitionerId = userStore.practitionerId;
+
   // 根据不同tab设置默认值
   if (tab === 'personal') {
     // 个人医嘱默认设置当前用户为参与者
-    formData.practitionerId = practitionerId
+    formData.practitionerId = practitionerId;
   } else if (tab === 'department') {
     // 科室医嘱默认设置当前科室
-    formData.organizationId = orgId
+    formData.organizationId = orgId;
   }
   // 全院医嘱不需要设置默认值
 }
 
 // 编辑按钮处理
 function handleEdit(tab, row) {
-  currentTab.value = tab
-  isEdit.value = true
-  currentRow.value = row
-  dialogTitle.value = '编辑医嘱'
-  dialogVisible.value = true
-  formData.groupPackageId = row.groupPackageId
-  formData.name = row.name
-  formData.practitionerId = row.practitionerId
-  formData.organizationId = row.organizationId
+  currentTab.value = tab;
+  isEdit.value = true;
+  currentRow.value = row;
+  dialogTitle.value = '编辑医嘱';
+  dialogVisible.value = true;
+  formData.groupPackageId = row.groupPackageId;
+  formData.name = row.name;
+  formData.practitionerId = row.practitionerId;
+  formData.organizationId = row.organizationId;
   // 填充表单数据
-  queryGroupDetail({ groupPackageId: row.groupPackageId }).then(res => {
-    prescriptionList.value = res.data.map(item => {
+  queryGroupDetail({ groupPackageId: row.groupPackageId }).then((res) => {
+    prescriptionList.value = res.data.map((item) => {
       return {
         groupPackageId: item.groupPackageId,
         adviceDefinitionId: item.orderDefinitionId,
@@ -446,9 +594,9 @@ function handleEdit(tab, row) {
         sortNumber: item.quantity,
         selectUnitCode: item.unitCode,
         adviceName: item.orderDefinitionName,
-        unitCodeName: item.unitCodeName
-      }
-    })
+        unitCodeName: item.unitCodeName,
+      };
+    });
     prescriptionList.value.unshift({
       uniqueKey: nextId.value++,
       showPopover: false,
@@ -456,98 +604,106 @@ function handleEdit(tab, row) {
       isEdit: true,
       statusEnum: 1,
     });
-  })
+  });
 }
 
 // 删除按钮处理
 function handleDelete(tab, row) {
   // 显示确认框
-  proxy.$modal.confirm('确定要删除该医嘱吗？').then(() => {
-    deleteGroup({groupPackageId: row.groupPackageId}).then(res => {
-      proxy.$modal.msgSuccess(res.msg)
-      fetchAllData()
+  proxy.$modal
+    .confirm('确定要删除该医嘱吗？')
+    .then(() => {
+      deleteGroup({ groupPackageId: row.groupPackageId }).then((res) => {
+        proxy.$modal.msgSuccess(res.msg);
+        fetchAllData();
+      });
     })
-  }).catch(() => {})
+    .catch(() => {});
 }
 
 // 提交表单
 function submitForm() {
   formRef.value.validate((valid) => {
     if (valid) {
-      submitLoading.value = true
+      submitLoading.value = true;
 
       // 模拟提交操作（这里应该调用相应的API）
       setTimeout(() => {
-        console.log('提交表单数据：', formData)
-        let params = {...formData}
+        console.log('提交表单数据：', formData);
+        let params = { ...formData };
         // 过滤掉空列表项（没有adviceDefinitionId的项）
         params.detailList = prescriptionList.value
-          .filter(item => item.adviceDefinitionId) // 过滤掉空列表项
-          .map(item => {
+          .filter((item) => item.adviceDefinitionId) // 过滤掉空列表项
+          .map((item) => {
             return {
               orderDefinitionId: item.adviceDefinitionId,
               orderDefinitionTable: item.adviceTableName,
               quantity: item.sortNumber,
               unitCode: item.selectUnitCode,
-            }
-          })
-          // 编辑模式
-          switch (currentTab.value) {
-            case 'personal':
-              savePersonal(params).then(res => {
-                if (res.code === 200) {
-                  ElMessage.success(res.message)
-                  // 重新获取数据以保持一致性
-                  fetchAllData()
-                }
-                submitLoading.value = false
-                dialogVisible.value = false
-                // 清空处方列表
-                prescriptionList.value = []
-              })
-              break
-            case 'department':
-              saveDepartment(params).then(res => {
-                if (res.code === 200) {
-                  ElMessage.success(res.message)
-                  // 重新获取数据以保持一致性
-                  fetchAllData()
-                }
-                submitLoading.value = false
-                dialogVisible.value = false
-                // 清空处方列表
-                prescriptionList.value = []
-              })
-              break
-            case 'hospital':
-              saveAll(params).then(res => {
-                if (res.code === 200) {
-                  ElMessage.success(res.message)
-                  // 重新获取数据以保持一致性
-                  fetchAllData()
-                }
-                submitLoading.value = false
-                dialogVisible.value = false
-                // 清空处方列表
-                prescriptionList.value = []
-              })
-              break
-          }
-      }, 500)
+              methodCode: item.methodCode,
+              rateCode: item.rateCode,
+              dispensePerDuration: item.dispensePerDuration,
+              dose: item.dose,
+              doseQuantity: item.doseQuantity,
+            };
+          });
+        // 编辑模式
+        switch (currentTab.value) {
+          case 'personal':
+            savePersonal(params).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success(res.message);
+                // 重新获取数据以保持一致性
+                fetchAllData();
+              }
+              submitLoading.value = false;
+              dialogVisible.value = false;
+              // 清空处方列表
+              prescriptionList.value = [];
+            });
+            break;
+          case 'department':
+            saveDepartment(params).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success(res.message);
+                // 重新获取数据以保持一致性
+                fetchAllData();
+              }
+              submitLoading.value = false;
+              dialogVisible.value = false;
+              // 清空处方列表
+              prescriptionList.value = [];
+            });
+            break;
+          case 'hospital':
+            saveAll(params).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success(res.message);
+                // 重新获取数据以保持一致性
+                fetchAllData();
+              }
+              submitLoading.value = false;
+              dialogVisible.value = false;
+              // 清空处方列表
+              prescriptionList.value = [];
+            });
+            break;
+        }
+      }, 500);
     }
-  })
+  });
 }
 
 /**
  * 选择药品回调
  */
- function selectAdviceBase(key, row) {
+function selectAdviceBase(key, row) {
   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].doseQuantity = undefined;
   prescriptionList.value[rowIndex.value].doseUnitCode = row.doseUnitCode;
   prescriptionList.value[rowIndex.value].minUnitCode = row.minUnitCode;
   prescriptionList.value[rowIndex.value].unitCode =
@@ -589,9 +745,7 @@ function handleBlur(row) {
 /**
  * 点击行赋值
  */
- function clickRow(row) {
-  
-}
+function clickRow(row) {}
 
 function getRowDisabled(row) {
   return row.isEdit;
@@ -605,7 +759,7 @@ function handleQuantityChange(row) {
   } else {
     row.sortNumber = 1;
   }
-  
+
   // 触发更新列表事件
   prescriptionList.value = [...prescriptionList.value];
 }
@@ -614,7 +768,7 @@ function handleQuantityChange(row) {
 function handleUnitChange(row) {
   // 当单位改变时触发的逻辑可以在这里添加
   console.log('单位已更改:', row.unitCode);
-  
+
   // 触发更新列表事件
   prescriptionList.value = [...prescriptionList.value];
 }
@@ -626,14 +780,17 @@ function handleDeleteRow(index, row) {
     proxy.$modal.msgWarning('至少保留一行');
     return;
   }
-  
+
   // 确认删除
-  proxy.$modal.confirm('确定要删除该行吗？').then(() => {
-    prescriptionList.value.splice(index, 1);
-    proxy.$modal.msgSuccess('删除成功');
-  }).catch(() => {
-    // 取消删除
-  });
+  proxy.$modal
+    .confirm('确定要删除该行吗？')
+    .then(() => {
+      prescriptionList.value.splice(index, 1);
+      proxy.$modal.msgSuccess('删除成功');
+    })
+    .catch(() => {
+      // 取消删除
+    });
 }
 
 // 判断是否为叶子节点
@@ -643,15 +800,15 @@ function isLeafNode(node) {
 
 // 弹窗关闭处理
 function handleDialogClose() {
-  formRef.value.resetFields()
+  formRef.value.resetFields();
   // 清空处方列表
-  prescriptionList.value = []
+  prescriptionList.value = [];
 }
 
 // 处理科室选择变化
 function handleOrgChange(value) {
   if (!value) return;
-  
+
   // 查找选中的节点
   const findNode = (nodes) => {
     for (let node of nodes) {
@@ -665,18 +822,15 @@ function handleOrgChange(value) {
     }
     return null;
   };
-  
+
   const selectedNode = findNode(organization.value);
-  
+
   // 如果选中的不是叶子节点，则清空选择
   if (selectedNode && !isLeafNode(selectedNode)) {
     proxy.$modal.msgWarning('只能选择末级科室');
     formData.organizationId = null;
   }
 }
-
-// 获取当前实例用于使用proxy
-const { proxy } = getCurrentInstance()
 </script>
 
 <style scoped>
diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
index 2b4bb1c0..ccbcdcf3 100644
--- a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
@@ -35,59 +35,27 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          >添加</el-button
-        >
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">添加</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Remove"
-          :disabled="multiple"
-          @click="handleClose"
+        <el-button type="danger" plain icon="Remove" :disabled="multiple" @click="handleClose"
           >停用</el-button
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="CirclePlus"
-          :disabled="multiple"
-          @click="handleStart"
+        <el-button type="success" plain icon="CirclePlus" :disabled="multiple" @click="handleStart"
           >启用</el-button
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Search"
-          @click="getList"
-          >查询</el-button
-        >
+        <el-button type="primary" plain icon="Search" @click="getList">查询</el-button>
       </el-col>
       <el-col :span="1.5">
-        <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="supplierList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="supplierList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="编号" align="center" key="busNo" prop="busNo" />
       <el-table-column
@@ -111,26 +79,9 @@
         prop="typeEnum_enumText"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="地址"
-        align="center"
-        key="address"
-        prop="address"
-        width="120"
-      />
-      <el-table-column
-        label="联系人电话"
-        align="center"
-        key="phone"
-        prop="phone"
-      />
-      <el-table-column
-        label="联系人邮箱"
-        align="center"
-        key="email"
-        prop="email"
-        width="160"
-      />
+      <el-table-column label="地址" align="center" key="address" prop="address" width="120" />
+      <el-table-column label="联系人电话" align="center" key="phone" prop="phone" />
+      <el-table-column label="联系人邮箱" align="center" key="email" prop="email" width="160" />
       <el-table-column
         label="活动标识"
         align="center"
@@ -152,20 +103,10 @@
         class-name="small-padding fixed-width"
       >
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            icon="Edit"
-            @click="handleUpdate(scope.row)"
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             >编辑</el-button
           >
-          <el-button
-            link
-            type="primary"
-            icon="View"
-            @click="handleView(scope.row)"
-            >查看</el-button
-          >
+          <el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -179,28 +120,16 @@
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-      <el-form
-        :model="form"
-        :rules="rules"
-        ref="supplierRef"
-        label-width="110px"
-      >
+      <el-form :model="form" :rules="rules" ref="supplierRef" label-width="110px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="名称" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder="请输入名称"
-              />
+              <el-input v-model="form.name" placeholder="请输入名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.id != undefined">
             <el-form-item label="编码" prop="busNo">
-              <el-input
-                v-model="form.busNo"
-                placeholder="请输入编码"
-                disabled
-              />
+              <el-input v-model="form.busNo" placeholder="请输入编码" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -261,17 +190,17 @@
           </el-col>
           <el-col :span="12">
             <!-- <el-form-item label="机构编号" prop="orgId"> -->
-              <!-- <el-input v-model="form.orgId" maxlength="11" /> -->
-              <el-form-item label="提供部门" prop="orgId">
-                <el-tree-select
-                  v-model="form.orgId"
-                  :data="deptOptions"
-                  :props="{ value: 'id', label: 'name', children: 'children' }"
-                  value-key="id"
-                  placeholder="请选择提供部门"
-                  check-strictly
-                  clearable
-                />
+            <!-- <el-input v-model="form.orgId" maxlength="11" /> -->
+            <el-form-item label="提供部门" prop="orgId">
+              <el-tree-select
+                v-model="form.orgId"
+                :data="deptOptions"
+                :props="{ value: 'id', label: 'name', children: 'children' }"
+                value-key="id"
+                placeholder="请选择提供部门"
+                check-strictly
+                clearable
+              />
               <!-- </el-form-item> -->
             </el-form-item>
           </el-col>
@@ -297,14 +226,11 @@ import {
   startSupplier,
   getSupplierInit,
   deptTreeSelect,
-} from "./components/supplier";
+} from './components/supplier';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
-  "sys_normal_disable",
-  "sys_user_sex"
-);
+const { sys_normal_disable, sys_user_sex } = proxy.useDict('sys_normal_disable', 'sys_user_sex');
 
 const supplierList = ref([]);
 const open = ref(false);
@@ -314,7 +240,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
+const title = ref('');
 const supplierTypeOptions = ref(undefined);
 const deptOptions = ref(undefined); // 部门树选项
 // 是否停用
@@ -334,8 +260,10 @@ const data = reactive({
     // sourceEnum: undefined, // 来源（包括 1：厂商/产地目录分类，2：自定义）
   },
   rules: {
-    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-    typeEnum: [{ required: true, message: "类型不能为空", trigger: "blur" }],
+    name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+    typeEnum: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
+    orgId: [{ required: true, message: '提供部门不能为空', trigger: 'blur' }],
+
     // address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
     // phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
     // email: [{ required: true, message: "联系人邮箱不能为空", trigger: "blur" },
@@ -347,30 +275,30 @@ const data = reactive({
 const { queryParams, form, rules } = toRefs(data);
 
 /** 验证邮箱地址是否有效*/
-function validateEmail (rule, value, callback) {
+function validateEmail(rule, value, callback) {
   const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
   if (!emailRegex.test(value)) {
     callback(new Error('请输入有效的邮箱地址'));
   } else {
     callback();
   }
-};
+}
 
 /** 厂商种类查询下拉树结构 */
 function getsupplierTypeList() {
   getSupplierInit().then((response) => {
-    console.log(response, "response");
+    console.log(response, 'response');
     supplierTypeOptions.value = response.data.supplierTypeOptions;
   });
 }
 
 /** 查询部门下拉树结构 */
 function getDeptTree() {
-  console.log("查询部门下拉树结构");
+  console.log('查询部门下拉树结构');
   deptTreeSelect().then((response) => {
-    console.log(response, "response查询部门下拉树结构");
+    console.log(response, 'response查询部门下拉树结构');
     deptOptions.value = response.data.records;
-    console.log(deptOptions.value, "部门下拉树结构");
+    console.log(deptOptions.value, '部门下拉树结构');
   });
 }
 
@@ -378,14 +306,14 @@ function getDeptTree() {
 function getList() {
   loading.value = true;
   // queryParams.value.statusEnum = +queryParams.value.statusEnum
-  console.log(queryParams.value, "queryParams.value");
+  console.log(queryParams.value, 'queryParams.value');
   getSupplierList(queryParams.value).then((res) => {
     loading.value = false;
-    console.log(res, "res", res.data.records);
+    console.log(res, 'res', res.data.records);
     supplierList.value = res.data.records;
-    console.log(supplierList.value, "supplierList.value");
+    console.log(supplierList.value, 'supplierList.value');
     total.value = res.data.total;
-    console.log(total.value, "total.value");
+    console.log(total.value, 'total.value');
   });
 }
 /** 节点单击事件 */
@@ -403,13 +331,13 @@ function handleQuery() {
 function handleStart(row) {
   const stardIds = row.id || ids.value;
   proxy.$modal
-    .confirm("是否确定启用数据！")
+    .confirm('是否确定启用数据！')
     .then(function () {
       return startSupplier(stardIds);
     })
     .then(() => {
       getList();
-      proxy.$modal.msgSuccess("启用成功");
+      proxy.$modal.msgSuccess('启用成功');
     })
     .catch(() => {});
 }
@@ -417,13 +345,13 @@ function handleStart(row) {
 function handleClose(row) {
   const stopIds = row.id || ids.value;
   proxy.$modal
-    .confirm("是否确认停用数据！")
+    .confirm('是否确认停用数据！')
     .then(function () {
       return stopSupplier(stopIds);
     })
     .then(() => {
       getList();
-      proxy.$modal.msgSuccess("停用成功");
+      proxy.$modal.msgSuccess('停用成功');
     })
     .catch(() => {});
 }
@@ -435,13 +363,13 @@ function handleClear() {
   // queryParams.value.sourceEnum = undefined;
   // queryParams.value.busNo = undefined;
   // 清空查询条件
-  proxy.resetForm("queryRef");
+  proxy.resetForm('queryRef');
   getList();
 }
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, "selection");
+  console.log(selection, 'selection');
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
@@ -457,7 +385,7 @@ function reset() {
     status: undefined,
     statusEnum: undefined,
   };
-  proxy.resetForm("supplierRef");
+  proxy.resetForm('supplierRef');
 }
 /** 取消按钮 */
 function cancel() {
@@ -468,34 +396,34 @@ function cancel() {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "新增";
+  title.value = '新增';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  console.log(row, "row");
+  console.log(row, 'row');
   form.value = JSON.parse(JSON.stringify(row));
   form.value.activeFlag == 1 ? (form.value.activeFlag = true) : (form.value.activeFlag = false); //是否为活性
   // console.log(form.value.ty, "form.value");
   open.value = true;
-  title.value = "厂商/产地编辑";
+  title.value = '厂商/产地编辑';
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["supplierRef"].validate((valid) => {
+  proxy.$refs['supplierRef'].validate((valid) => {
     if (valid) {
       form.value.activeFlag == true ? (form.value.activeFlag = 1) : (form.value.activeFlag = 0); //是否为活性
-      console.log(form.value, "*****************");
+      console.log(form.value, '*****************');
       if (form.value.id != undefined) {
-        console.log(form.value, "editSupplier");
+        console.log(form.value, 'editSupplier');
         editSupplier(form.value).then((response) => {
-          proxy.$modal.msgSuccess("修改成功");
+          proxy.$modal.msgSuccess('修改成功');
           open.value = false;
           getList();
         });
       } else {
         addSupplier(form.value).then((response) => {
-          proxy.$modal.msgSuccess("新增成功");
+          proxy.$modal.msgSuccess('新增成功');
           open.value = false;
           getList();
         });
@@ -507,10 +435,10 @@ function submitForm() {
 /** 详细按钮操作 */
 function handleView(row) {
   reset();
-  title.value = "查看";
+  title.value = '查看';
   open.value = true;
   getSupplierOne(row.id).then((response) => {
-    console.log(response, "responsebbbb", row.id);
+    console.log(response, 'responsebbbb', row.id);
     form.value = response.data;
   });
 }
@@ -523,4 +451,4 @@ getDeptTree();
   display: flex;
   align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
index 51c62c63..7e105c07 100644
--- a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
+++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
@@ -753,6 +753,7 @@ const transformFormData = (form) => {
     price,
     description,
     ybType,
+    ybNo,
     title,
     comment,
     practitionerId,
@@ -769,6 +770,7 @@ const transformFormData = (form) => {
       // locationId,
       name,
       contact,
+      ybNo,
       appointmentRequiredFlag,
       extraDetails,
       comment,
@@ -782,6 +784,7 @@ const transformFormData = (form) => {
       description,
       typeCode: cwTypeCode,
       ybType,
+      ybNo,
       price,
     },
   };
@@ -807,6 +810,7 @@ const transformFormEditData = (form) => {
     price,
     description,
     ybType,
+    ybNo,
     title,
     comment,
     practitionerId,
@@ -823,6 +827,7 @@ const transformFormEditData = (form) => {
       // locationId,
       name,
       contact,
+      ybNo,
       appointmentRequiredFlag,
       extraDetails,
       comment,
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/device.js b/openhis-ui-vue3/src/views/catalog/device/components/device.js
index 53966b81..77d69537 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/device.js
+++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js
@@ -1,40 +1,47 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 查询器材目录列表
-export function getDeviceList(query) {
-  console.log(query,'aaaaa')
-  return request({
+export function getDeviceList (query) {
+  return request ({
     url: '/data-dictionary/device/information-page',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 查询器材目录详细
-export function getDeviceOne(id) {
-  return request({
+export function getDeviceOne (id) {
+  return request ({
     url: '/data-dictionary/device/information-one',
     method: 'get',
-    params: { id } // 确保参数正确传递
-  })
+    params: {id}, // 确保参数正确传递
+  });
+}
+// 校验器材是否可以编辑
+export function validateEditDevice (deviceId) {
+  return request ({
+    url: '/data-dictionary/device/validate-edit',
+    method: 'get',
+    params: {deviceId}, // 确保参数正确传递
+  });
 }
 
 // 新增器材目录
-export function addDevice(data) {
-  return request({
+export function addDevice (data) {
+  return request ({
     url: '/data-dictionary/device/information',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 修改器材目录
-export function editDevice(data) {
-  return request({
+export function editDevice (data) {
+  return request ({
     url: '/data-dictionary/device/information',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // // 删除器材目录
@@ -46,56 +53,56 @@ export function editDevice(data) {
 // }
 
 // 器材目录分类查询
-export function getDiseaseTreatmentInit() {
-  return request({
+export function getDiseaseTreatmentInit () {
+  return request ({
     url: '/data-dictionary/device/init',
-    method: 'get'
-  })
+    method: 'get',
+  });
 }
 
 // 停用病种目录
-export function stopDevice(ids) {
-  console.log(ids)
-  return request({
+export function stopDevice (ids) {
+  console.log (ids);
+  return request ({
     url: '/data-dictionary/device/information-stop',
     method: 'put',
-    data: ids
-  })
+    data: ids,
+  });
 }
 
 // 启用病种目录
-export function startDevice(ids) {
-  console.log(ids)
-  return request({
+export function startDevice (ids) {
+  console.log (ids);
+  return request ({
     url: '/data-dictionary/device/information-start',
     method: 'put',
-    data: ids
-  })
+    data: ids,
+  });
 }
 
 // 查询部门树形数据
-export function deptTreeSelect(queryParams) {
-  return request({
+export function deptTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
 // 查询地点树形数据
-export function locationTreeSelect(queryParams) {
-  return request({
+export function locationTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/location/location-page-tree',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
 // 获取医疗服务项目目录
-export function getYbDeviceList(queryParams) {
-  return request({
+export function getYbDeviceList (queryParams) {
+  return request ({
     url: '/catalog/page',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
index d0e00ccc..daf6b1dc 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -22,12 +22,12 @@
         <el-row :gutter="24">
           <el-col :span="8" v-if="form.id != undefined">
             <el-form-item label="编号" prop="busNo">
-              <el-input v-model="form.busNo" placeholder="请输入编码" disabled />
+              <el-input v-model="form.busNo" clearable placeholder="请输入编码" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="器材名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入器材名称" />
+              <el-input v-model="form.name" clearable placeholder="请输入器材名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -35,10 +35,10 @@
               <el-tree-select
                 v-model="form.categoryCode"
                 :data="deviceCategories"
+                filterable
                 :props="{ value: 'value', label: 'info', children: 'children' }"
-                :disabled="false"
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                 value-key="value"
-                placeholder=""
                 check-strictly
                 clearable
               />
@@ -48,7 +48,7 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="器材种类" prop="typeCode">
-              <el-select v-model="form.typeCode" placeholder="请选择" clearable>
+              <el-select v-model="form.typeCode" clearable filterable>
                 <el-option
                   v-for="dict in device_type_code"
                   :key="dict.value"
@@ -68,6 +68,7 @@
                 placeholder="请选择提供部门"
                 check-strictly
                 clearable
+                filterable
               />
             </el-form-item>
           </el-col>
@@ -81,6 +82,7 @@
                 placeholder="请选择地点"
                 check-strictly
                 clearable
+                filterable
               />
             </el-form-item>
           </el-col>
@@ -90,9 +92,10 @@
             <el-form-item label="包装单位" prop="unitCode">
               <el-select
                 v-model="form.unitCode"
-                placeholder="请选择"
                 clearable
+                filterable
                 @change="handleUnitCodeChange"
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
               >
                 <el-option
                   v-for="dict in unit_code"
@@ -105,7 +108,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="销售单位" prop="salesUnitCode">
-              <el-select v-model="form.salesUnitCode" placeholder="请选择" clearable>
+              <el-select v-model="form.salesUnitCode" clearable filterable>
                 <el-option
                   v-for="dict in unit_code"
                   :key="dict.value"
@@ -117,7 +120,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="最小单位" prop="minUnitCode">
-              <el-select v-model="form.minUnitCode" placeholder="请选择" clearable>
+              <el-select
+                v-model="form.minUnitCode"
+                clearable
+                filterable
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
+              >
                 <el-option
                   v-for="dict in unit_code"
                   :key="dict.value"
@@ -131,95 +139,70 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="包装规格" prop="size">
-              <el-input v-model="form.size" placeholder="" />
+              <el-input
+                v-model="form.size"
+                clearable
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="拆零比" prop="partPercent">
-              <el-input-number v-model="form.partPercent" controls-position="right" placeholder="" :min="1"/>
+              <el-input-number
+                v-model="form.partPercent"
+                controls-position="right"
+                :min="1"
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品型号" prop="modelNumber">
-              <el-input v-model="form.modelNumber" placeholder="" />
+              <el-input v-model="form.modelNumber" clearable />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="批准文号" prop="approvalNumber">
-              <el-input v-model="form.approvalNumber" placeholder="" />
+              <el-input v-model="form.approvalNumber" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="医保编码" prop="ybNo">
-              <el-input v-model="form.ybNo" placeholder="" />
+              <el-input v-model="form.ybNo" clearable />
             </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-input v-model="form.ybOrgNo" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="主要成分" prop="substanceText">
-              <el-input v-model="form.substanceText" placeholder="" />
+              <el-input v-model="form.substanceText" clearable />
             </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-input-number v-model="form.itemMinQuantity" 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-input-number v-model="form.itemMaxQuantity" 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="" />
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-        <el-row :gutter="24">
-          <!-- <el-col :span="8">
-            <el-form-item label="状态" prop="statusEnum">
-              <el-select
-                v-model="form.statusEnum"
-                placeholder="请选择"
-                clearable
-              >
-                <el-option
-                  v-for="dict in statusFlagOptions"
-                  :key="dict.value"
-                  :label="dict.info"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="生产厂家" prop="manufacturerText">
-              <el-input v-model="form.manufacturerText" placeholder="" />
+              <el-input v-model="form.manufacturerText" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="供应商" prop="supplyId">
-              <el-select v-model="form.supplyId" placeholder="" clearable style="width: 150px">
+              <el-select v-model="form.supplyId" filterable clearable style="width: 150px">
                 <el-option
                   v-for="supplier in supplierListOptions"
                   :key="supplier.value"
@@ -255,7 +238,12 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="财务类型" prop="itemTypeCode">
-              <el-select v-model="form.itemTypeCode" clearable>
+              <el-select
+                v-model="form.itemTypeCode"
+                clearable
+                filterable
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
+              >
                 <el-option
                   v-for="category in fin_type_code"
                   :key="category.value"
@@ -271,7 +259,9 @@
                 v-model="form.ybType"
                 placeholder="医保类别"
                 clearable
+                filterable
                 style="width: 240px"
+                :disabled="form.isEditInfoDisable === 1"
               >
                 <el-option
                   v-for="dict in med_chrgitm_type"
@@ -284,7 +274,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="适用范围" prop="jurisdiction">
-              <el-input v-model="form.jurisdiction" placeholder="" />
+              <el-input v-model="form.jurisdiction" clearable />
             </el-form-item>
           </el-col>
         </el-row>
@@ -293,20 +283,23 @@
             <el-form-item label="购入价" prop="purchasePrice">
               <el-input
                 v-model="form.purchasePrice"
-                placeholder=""
-                :disabled="false"
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                 @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"
+                clearable
+                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
+              />
             </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" clearable :disabled="false" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -317,7 +310,9 @@
                 v-model="form.chrgitmLv"
                 placeholder="医保等级"
                 clearable
+                filterable
                 style="width: 240px"
+                :disabled="form.isEditInfoDisable === 1"
               >
                 <el-option
                   v-for="dict in chrgitm_lv"
@@ -336,7 +331,7 @@
                 v-model="form.description"
                 :autosize="{ minRows: 4, maxRows: 10 }"
                 type="textarea"
-                placeholder=""
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -376,52 +371,27 @@ const supplierListOptions = ref([]); // 供应商列表
 const data = reactive({
   form: {},
   rules: {
-    // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
     name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-    // pyStr: [{ required: true, message: "拼音不能为空", trigger: "blur" }],
-    // wbStr: [{ required: true, message: "五笔拼音不能为空", trigger: "blur" }],
     categoryCode: [{ required: true, message: '器材分类不能为空', trigger: 'blur' }],
-    //typeCode: [{ required: true, message: '器材种类不能为空', trigger: 'blur' }],
     unitCode: [{ required: true, message: '包装单位不能为空', trigger: 'blur' }],
     size: [{ required: true, message: '包装规格不能为空', trigger: 'blur' }],
     partPercent: [{ required: true, message: '拆零比不能为空', trigger: 'blur' }],
     minUnitCode: [{ 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" }],
-    // // ybNo: [{ required: true, message: "医保编码不能为空", trigger: "blur" }],
-    // ybMatchFlag: [
-    //   { required: true, message: "医保对码标记不能为空", trigger: "blur" },
-    // ],
-    // statusEnum: [{ required: true, message: "状态不能为空", trigger: "blur" }],
     manufacturerId: [{ 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' }],
-    // version: [{ required: true, message: "器材版本不能为空", trigger: "blur" }],
-    // substanceText: [{ required: true, message: "主要成分不能为空", trigger: "blur" }],
-    // allergenFlag: [
-    //   { 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' }],
-    //maximumRetailPrice: [{ required: true, message: '最高零售价不能为空', trigger: 'blur' }],
     ybType: [{ required: true, message: '医保类型不能为空', trigger: 'blur' }],
     chrgitmLv: [{ required: true, message: '医保等级不能为空', trigger: 'blur' }],
     itemTypeCode: [{ required: true, message: '财务类型不能为空', trigger: 'blur' }],
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { form, rules } = toRefs(data);
 
 const props = defineProps({
   item: {
@@ -465,8 +435,8 @@ function show() {
   supplierListOptions.value = props.supplierListOptions;
   form.value.partPercent = 1;
   form.value.itemTypeCode = '2005';
-  form.value.ybType = '8';
-  console.log(props, '22222', title.value, props.deviceCategories);
+  form.value.ybType = '08';
+  form.value.size = '-';
   getDeptTree();
   getLocationTree();
   visible.value = true;
@@ -476,21 +446,16 @@ function setValue(row) {
   form.value = {
     name: formatValue(row.consumableName), //医疗服务项目名称
     ybNo: formatValue(row.medicalCatalogCode), // 医保编码
-    // modelNumber: formatValue(row.productModel), // 产品型号
     modelNumber: formatValue(row.specification), // 规格
     manufacturerText: formatValue(row.manufacturerName), // 厂家名称
     partPercent: 1,
     itemMinQuantity: formatValue(row.itemMinQuantity), // 警戒线最低值
     itemMaxQuantity: formatValue(row.itemMaxQuantity), // 警戒线最高值
-    // chrgitmLv: formatValue(
-    //   row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3'
-    // ), // 医保等级
   };
 }
 /** 查询部门下拉树结构 */
 function getDeptTree() {
   deptTreeSelect().then((response) => {
-    console.log(response, 'response查询部门下拉树结构');
     deptOptions.value = response.data.records;
   });
 }
@@ -538,13 +503,11 @@ function reset() {
     ybNo: undefined, // 医保编码
     ybOrgNo: undefined, //医药机构目录编码
     ybMatchFlag: undefined, // 医保对码标记
-    // statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
     manufacturerId: undefined, // 厂家编码
     supplyId: undefined, // 供应商编码
     description: undefined, // 说明
     jurisdiction: undefined, // 适用范围
     ruleId: undefined, // 执行科室
-    // version: undefined, // 器材版本
     substanceText: undefined, // 主要成分
     allergenFlag: undefined, // 过敏标记
     orgId: undefined, // 科室ID
@@ -567,7 +530,6 @@ function submitForm() {
       form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0);
       form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0);
       form.value.allergenFlag ? (form.value.allergenFlag = 1) : (form.value.allergenFlag = 0);
-      console.log(form.value, 'form.value');
       if (form.value.id != undefined) {
         editDevice(form.value).then((response) => {
           // 触发自定义事件，并传递数据给父组件
diff --git a/openhis-ui-vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue
index 8fb5340a..070fdad6 100644
--- a/openhis-ui-vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -5,49 +5,81 @@
       <el-col :span="4" :xs="24">
         <div class="head-title">器材目录</div>
         <div class="head-container">
-          <el-tree :data="deviceCategories" :props="{ label: 'info', children: 'children' }"
-            :expand-on-click-node="false" :filter-node-method="filterNode" ref="treeRef" node-key="id" highlight-current
-            default-expand-all @node-click="handleNodeClick" />
+          <el-tree
+            :data="deviceCategories"
+            :props="{ label: 'info', children: 'children' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="treeRef"
+            node-key="id"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <!--器材目录-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryRef"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-row :gutter="24">
-            <!-- <el-col :span="6"> -->
             <el-form-item label="项目名" prop="searchKey" label-width="55">
-              <el-input v-model="queryParams.searchKey" placeholder="品名/商品名/英文品名/编码/拼音" clearable style="width: 220px"
-                @keyup.enter="handleQuery" />
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="品名/商品名/英文品名/编码/拼音"
+                clearable
+                style="width: 220px"
+                @keyup.enter="handleQuery"
+              />
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="5"> -->
             <el-form-item label="状态" prop="statusEnum" label-width="50">
               <el-select v-model="queryParams.statusEnum" clearable>
-                <el-option v-for="status in statusFlagOptions" :key="status.value" :label="status.info"
-                  :value="status.value" />
+                <el-option
+                  v-for="status in statusFlagOptions"
+                  :key="status.value"
+                  :label="status.info"
+                  :value="status.value"
+                />
               </el-select>
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="5"> -->
             <el-form-item label="医保是否对码" prop="ybMatchFlag" label-width="100">
               <el-select v-model="queryParams.ybMatchFlag" placeholder="" clearable>
-                <el-option v-for="item in statusYBWeatherOptions" :key="item.value" :label="item.info"
-                  :value="item.value" />
+                <el-option
+                  v-for="item in statusYBWeatherOptions"
+                  :key="item.value"
+                  :label="item.info"
+                  :value="item.value"
+                />
               </el-select>
             </el-form-item>
-            <!-- </el-col> -->
           </el-row>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="openAddDevice">添加新项目</el-button>
+            <el-button type="primary" plain icon="Plus" @click="openAddDevice"
+              >添加新项目</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Remove" :disabled="multiple" @click="handleClose">停用</el-button>
+            <el-button type="danger" plain icon="Remove" :disabled="multiple" @click="handleClose"
+              >停用</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="CirclePlus" :disabled="multiple" @click="handleStart">启用</el-button>
+            <el-button
+              type="success"
+              plain
+              icon="CirclePlus"
+              :disabled="multiple"
+              @click="handleStart"
+              >启用</el-button
+            >
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
@@ -66,50 +98,170 @@
           </el-col> -->
         </el-row>
 
+        <el-table
+          v-loading="loading"
+          :data="deviceList"
+          @selection-change="handleSelectionChange"
+          width="90%"
+        >
         <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange" width="90%" border resizable-column>
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="编码" align="center" key="busNo" prop="busNo" :show-overflow-tooltip="true" />
-          <el-table-column label="器材名称" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
-          <el-table-column label="拼音" align="center" key="pyStr" prop="pyStr" :show-overflow-tooltip="true" />
-          <el-table-column label="器材分类" align="center" key="categoryCode_dictText" prop="categoryCode_dictText"
-            :show-overflow-tooltip="true" width="100" />
-          <el-table-column label="器材种类" align="center" key="typeCode_dictText" prop="typeCode_dictText"
-            :show-overflow-tooltip="true" width="50" />
-          <el-table-column label="包装单位" align="center" key="unitCode_dictText" prop="unitCode_dictText"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="包装规格" align="center" key="size" prop="size" :show-overflow-tooltip="true" />
-          <el-table-column label="拆零比" align="center" key="partPercent" prop="partPercent"
-            :show-overflow-tooltip="true">
+          <el-table-column
+            label="编码"
+            align="center"
+            key="busNo"
+            prop="busNo"
+            :show-overflow-tooltip="true"
+            width="200"
+          />
+          <el-table-column
+            label="器材名称"
+            align="center"
+            key="name"
+            prop="name"
+            :show-overflow-tooltip="true"
+            width="200"
+          />
+          <!-- <el-table-column
+            label="拼音"
+            align="center"
+            key="pyStr"
+            prop="pyStr"
+            :show-overflow-tooltip="true"
+          /> -->
+          <el-table-column
+            label="器材分类"
+            align="center"
+            key="categoryCode_dictText"
+            prop="categoryCode_dictText"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <!-- <el-table-column
+            label="器材种类"
+            align="center"
+            key="typeCode_dictText"
+            prop="typeCode_dictText"
+            :show-overflow-tooltip="true"
+            width="50"
+          /> -->
+          <el-table-column
+            label="包装单位"
+            align="center"
+            key="unitCode_dictText"
+            prop="unitCode_dictText"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <el-table-column
+            label="包装规格"
+            align="center"
+            key="size"
+            prop="size"
+            width="200"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="拆零比"
+            align="center"
+            key="partPercent"
+            prop="partPercent"
+            :show-overflow-tooltip="true"
+          >
             <template #default="scope">
-              {{ scope.row.partPercent !== null && scope.row.partPercent !== undefined ? scope.row.partPercent : 1 }}
+              {{
+                scope.row.partPercent !== null && scope.row.partPercent !== undefined
+                  ? scope.row.partPercent
+                  : 1
+              }}
             </template>
           </el-table-column>
 
-          <el-table-column label="最小使用单位" align="center" key="minUnitCode_dictText" prop="minUnitCode_dictText"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="所属科室" align="center" key="orgId_dictText" prop="orgId_dictText"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="所在位置" align="center" key="locationId_dictText" prop="locationId_dictText"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="产品型号" align="center" key="modelNumber" prop="modelNumber"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="高值器材标志" align="center" key="hvcmFlag_enumText" prop="hvcmFlag_enumText"
-            :show-overflow-tooltip="true" />
+          <el-table-column
+            label="最小使用单位"
+            align="center"
+            key="minUnitCode_dictText"
+            prop="minUnitCode_dictText"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <!-- <el-table-column
+            label="所属科室"
+            align="center"
+            key="orgId_dictText"
+            prop="orgId_dictText"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="所在位置"
+            align="center"
+            key="locationId_dictText"
+            prop="locationId_dictText"
+            :show-overflow-tooltip="true"
+          /> -->
+          <!-- <el-table-column
+            label="产品型号"
+            align="center"
+            key="modelNumber"
+            prop="modelNumber"
+            :show-overflow-tooltip="true"
+          /> -->
 
-          <el-table-column label="销售单位" align="center" key="salesUnitCode_dictText" prop="salesUnitCode_dictText"
-            :show-overflow-tooltip="true" width="100" />
-          <el-table-column label="批准文号" align="center" key="approvalNumber" prop="approvalNumber"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="医保标记" align="center" key="ybFlag_enumText" prop="ybFlag_enumText"
-            :show-overflow-tooltip="true" width="110" />
-          <el-table-column label="医保编码" align="center" key="ybNo" prop="ybNo" :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="状态" align="center" key="statusEnum_enumText" prop="statusEnum_enumText"
-            :show-overflow-tooltip="true" width="90" />
+          <el-table-column
+            label="销售单位"
+            align="center"
+            key="salesUnitCode_dictText"
+            prop="salesUnitCode_dictText"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <!-- <el-table-column
+            label="批准文号"
+            align="center"
+            key="approvalNumber"
+            prop="approvalNumber"
+            :show-overflow-tooltip="true"
+          /> -->
+          <!-- <el-table-column
+            label="医保标记"
+            align="center"
+            key="ybFlag_enumText"
+            prop="ybFlag_enumText"
+            :show-overflow-tooltip="true"
+            width="110"
+          /> -->
+          <el-table-column
+            label="医保编码"
+            align="center"
+            key="ybNo"
+            prop="ybNo"
+            :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="状态"
+            align="center"
+            key="statusEnum_enumText"
+            prop="statusEnum_enumText"
+            :show-overflow-tooltip="true"
+            width="90"
+          />
           <!-- <el-table-column
             label="生产厂家"
             align="center"
@@ -118,59 +270,165 @@
             :show-overflow-tooltip="true"
             width="90"
           /> -->
-          <el-table-column label="生产厂家" align="center" key="manufacturerText" prop="manufacturerText"
-            :show-overflow-tooltip="true" width="90" />
-          <el-table-column label="供应商" align="center" key="supplyId_dictText" prop="supplyId_dictText"
-            :show-overflow-tooltip="true" width="110" />
-          <el-table-column label="说明" align="center" key="description" prop="description"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="适用范围" align="center" key="jurisdiction" prop="jurisdiction"
-            :show-overflow-tooltip="true" width="120" />
-          <el-table-column label="器材版本" align="center" key="version" prop="version" :show-overflow-tooltip="true"
-            width="120" />
-          <el-table-column label="主要成分" align="center" key="substanceText" prop="substanceText"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="过敏标记" align="center" key="allergenFlag_enumText" prop="allergenFlag_enumText"
-            :show-overflow-tooltip="true" width="90" />
-          <el-table-column label="售价" align="center" key="retailPrice" prop="retailPrice" :show-overflow-tooltip="true"
-            width="90" />
-          <el-table-column label="财务类别" align="center" key="itemTypeCode_dictText" prop="itemTypeCode_dictText"
-            :show-overflow-tooltip="true" width="90" />
-          <el-table-column label="医保类别" align="center" key="ybType_dictText" prop="ybType_dictText"
-            :show-overflow-tooltip="true" width="90" />
-          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
+          <el-table-column
+            label="生产厂家"
+            align="center"
+            key="manufacturerText"
+            prop="manufacturerText"
+            :show-overflow-tooltip="true"
+            width="200"
+          />
+          <!-- <el-table-column
+            label="供应商"
+            align="center"
+            key="supplyId_dictText"
+            prop="supplyId_dictText"
+            :show-overflow-tooltip="true"
+            width="110"
+          />
+          <el-table-column
+            label="说明"
+            align="center"
+            key="description"
+            prop="description"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="适用范围"
+            align="center"
+            key="jurisdiction"
+            prop="jurisdiction"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <el-table-column
+            label="器材版本"
+            align="center"
+            key="version"
+            prop="version"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <el-table-column
+            label="主要成分"
+            align="center"
+            key="substanceText"
+            prop="substanceText"
+            :show-overflow-tooltip="true"
+          /> -->
+          <!-- <el-table-column
+            label="过敏标记"
+            align="center"
+            key="allergenFlag_enumText"
+            prop="allergenFlag_enumText"
+            :show-overflow-tooltip="true"
+            width="90"
+          /> -->
+          <el-table-column
+            label="售价"
+            align="center"
+            key="retailPrice"
+            prop="retailPrice"
+            :show-overflow-tooltip="true"
+            width="90"
+          />
+          <el-table-column
+            label="财务类别"
+            align="center"
+            key="itemTypeCode_dictText"
+            prop="itemTypeCode_dictText"
+            :show-overflow-tooltip="true"
+            width="90"
+          />
+          <el-table-column
+            label="高值器材标志"
+            align="center"
+            key="hvcmFlag_enumText"
+            prop="hvcmFlag_enumText"
+            :show-overflow-tooltip="true"
+            width="120"
+          />
+          <!-- <el-table-column
+            label="医保类别"
+            align="center"
+            key="ybType_dictText"
+            prop="ybType_dictText"
+            :show-overflow-tooltip="true"
+            width="90"
+          /> -->
+          <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="openEditDevice(scope.row)">编辑</el-button>
+              <el-button link type="primary" icon="Edit" @click="openEditDevice(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" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
-    <device-dialog ref="deviceRef" :title="title" :item="currentData" :currentCategoryEnum="currentCategoryEnum"
-      :deviceCategories="deviceCategorieList" :statusFlagOptions="statusFlagOptions"
-      :supplierListOptions="supplierListOptions" @submit="getList()" @ybDialog="() => {
-        proxy.$refs['deviceYbRef'].show()
-      }" />
-    <DeviceYbDialog ref="deviceYbRef" @selectDevice="
-      (row) => {
-        proxy.$refs['deviceRef'].setValue(row);
-      }
-    " />
+    <device-dialog
+      ref="deviceRef"
+      :title="title"
+      :item="currentData"
+      :currentCategoryEnum="currentCategoryEnum"
+      :deviceCategories="deviceCategorieList"
+      :statusFlagOptions="statusFlagOptions"
+      :supplierListOptions="supplierListOptions"
+      @submit="getList()"
+      @ybDialog="
+        () => {
+          proxy.$refs['deviceYbRef'].show();
+        }
+      "
+    />
+    <DeviceYbDialog
+      ref="deviceYbRef"
+      @selectDevice="
+        (row) => {
+          proxy.$refs['deviceRef'].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-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>
+            <el-link
+              type="primary"
+              :underline="false"
+              style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate"
+              >下载模板</el-link
+            >
           </div>
         </template>
       </el-upload>
@@ -185,17 +443,18 @@
 </template>
 
 <script setup name="Device">
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth';
 import {
   getDeviceList,
   stopDevice,
   startDevice,
   getDiseaseTreatmentInit,
   getDeviceOne,
-} from "./components/device";
-import deviceDialog from "./components/deviceDialog";
-import DeviceYbDialog from "./components/deviceYbDialog";
-import { nextTick } from "vue";
+  validateEditDevice,
+} from './components/device';
+import deviceDialog from './components/deviceDialog';
+import DeviceYbDialog from './components/deviceYbDialog';
+import { nextTick } from 'vue';
 
 const { proxy } = getCurrentInstance();
 
@@ -206,7 +465,7 @@ const ids = ref([]); // 存储选择的行数据
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const title = ref("");
+const title = ref('');
 const deviceCategories = ref(undefined);
 const deviceCategorieList = ref(undefined);
 const statusFlagOptions = ref(undefined);
@@ -216,22 +475,22 @@ const supplierListOptions = ref(undefined);
 const currentData = ref({});
 // 使用 ref 定义当前查看器材数据
 const viewData = ref({});
-const currentCategoryEnum = ref("");
+const currentCategoryEnum = ref('');
 
 /*** 器材目录导入参数 */
 const upload = reactive({
   // 是否显示弹出层
   open: false,
   // 弹出层标题
-  title: "",
+  title: '',
   // 是否禁用上传
   isUploading: false,
   // 是否更新已经存在的数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: { Authorization: 'Bearer ' + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/data-dictionary/device/import-data"
+  url: import.meta.env.VITE_APP_BASE_API + '/data-dictionary/device/import-data',
 });
 
 const data = reactive({
@@ -260,15 +519,15 @@ const filterNode = (value, data) => {
 /** 器材目录分类查询下拉树结构 */
 function getDiseaseTreatmentList() {
   getDiseaseTreatmentInit().then((response) => {
-    console.log(response, "response器材目录分类查询下拉树结构");
-    deviceCategories.value = JSON.parse(JSON.stringify(response.data.deviceCategories)).sort((a, b) => {
-      return parseInt(a.value) - parseInt(b.value);
-    });
-    deviceCategories.value.push({ info: "全部", value: "" });
+    deviceCategories.value = JSON.parse(JSON.stringify(response.data.deviceCategories)).sort(
+      (a, b) => {
+        return parseInt(a.value) - parseInt(b.value);
+      }
+    );
+    deviceCategories.value.push({ info: '全部', value: '' });
     deviceCategorieList.value = response.data.deviceCategories.sort((a, b) => {
       return parseInt(a.value) - parseInt(b.value);
     });
-    console.log(deviceCategorieList.value, "deviceCategorieList");
     statusFlagOptions.value = response.data.statusFlagOptions;
     statusYBWeatherOptions.value = response.data.statusYBWeatherOptions;
     supplierListOptions.value = response.data.supplierListOptions;
@@ -281,7 +540,6 @@ function getList() {
     loading.value = false;
     deviceList.value = res.data.records;
     total.value = res.data.total;
-    console.log(deviceList.value, "getList", total.value);
   });
 }
 /** 节点单击事件 */
@@ -301,34 +559,34 @@ function handleStart() {
   const stardIds = ids.value;
   //   selectedData
   proxy.$modal
-    .confirm("是否确定启用数据！")
+    .confirm('是否确定启用数据！')
     .then(function () {
       return startDevice(stardIds);
     })
     .then(() => {
       getList();
-      proxy.$modal.msgSuccess("启用成功");
+      proxy.$modal.msgSuccess('启用成功');
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 停用按钮操作 */
 function handleClose() {
   const stopIds = ids.value;
   proxy.$modal
-    .confirm("是否确认停用数据！")
+    .confirm('是否确认停用数据！')
     .then(function () {
       return stopDevice(stopIds);
     })
     .then(() => {
       getList();
-      proxy.$modal.msgSuccess("停用成功");
+      proxy.$modal.msgSuccess('停用成功');
     })
-    .catch(() => { });
+    .catch(() => {});
 }
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download(
-    "system/user/export",
+    'system/user/export',
     {
       ...queryParams.value,
     },
@@ -343,7 +601,11 @@ function handleImport() {
 }
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/data-dictionary/device/import-template', {}, `device_template_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    '/data-dictionary/device/import-template',
+    {},
+    `device_template_${new Date().getTime()}.xlsx`
+  );
 }
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
@@ -356,8 +618,8 @@ const handleFileSuccess = (response, file, fileList) => {
   proxy.$refs['uploadRef'].handleRemove(file);
   proxy.$alert(
     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-    response.msg +
-    '</div>',
+      response.msg +
+      '</div>',
     '导入结果',
     { dangerouslyUseHTMLString: true }
   );
@@ -370,7 +632,6 @@ function submitFileForm() {
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, "selection");
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
@@ -379,22 +640,29 @@ function handleSelectionChange(selection) {
 
 /** 打开新增弹窗 */
 function openAddDevice() {
-  // if (!currentCategoryEnum.value) {
-  //   return proxy.$modal.msgError("请选择器材目录分类");
-  // }
-  console.log("打开新增弹窗");
-  title.value = "新增";
+  title.value = '新增';
   nextTick(() => {
     proxy.$refs.deviceRef.show();
   });
 }
+const isEditInfoDisable = ref(0);
 /** 打开编辑弹窗 */
 function openEditDevice(row) {
-  currentData.value = {};
-  console.log("打开编辑弹窗");
+  validateEditDevice(row.id).then((res) => {
+    // res.data == 1  医生开过该耗材，不可编辑
+    // res.data == 2  该耗材已经入库过，不可编辑
+    isEditInfoDisable.value = res.data;
+    getDeviceInfo(row);
+  });
+}
+// 根据耗材id 查询耗材信息
+function getDeviceInfo(row) {
   getDeviceOne(row.id).then((response) => {
-    console.log(response, "currentDataform");
-    currentData.value = response.data;
+    currentData.value = {
+      ...response.data,
+      // 禁用编辑
+      isEditInfoDisable: isEditInfoDisable.value,
+    };
     if (currentData.value) {
       currentData.value.hvcmFlag == 1
         ? (currentData.value.hvcmFlag = true)
@@ -409,9 +677,9 @@ function openEditDevice(row) {
         ? (currentData.value.allergenFlag = true)
         : (currentData.value.allergenFlag = false);
     }
-    title.value = "编辑";
+    title.value = '编辑';
     nextTick(() => {
-      proxy.$refs["deviceRef"].edit();
+      proxy.$refs['deviceRef'].edit();
     });
     getList();
   });
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
index f4b344e9..5cbeefe3 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -74,7 +74,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="目录分类" prop="categoryCode">
-              <el-select v-model="form.categoryCode" clearable filterable :disabled="false">
+              <el-select
+                v-model="form.categoryCode"
+                clearable
+                filterable
+                :disabled="form.isEditInfoDisable === 1"
+              >
                 <el-option
                   v-for="category in activity_category_code"
                   :key="category.value"
@@ -96,18 +101,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="状态" prop="statusEnum">
-              <el-select v-model="form.statusEnum" clearable>
-                <el-option
-                  v-for="status in statusFlagOptions"
-                  :key="status.value"
-                  :label="status.info"
-                  :value="status.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <el-row :gutter="24">
           <el-col :span="8">
@@ -136,6 +129,7 @@
                 clearable
                 filterable
                 style="width: 240px"
+                :disabled="form.isEditInfoDisable === 1"
               >
                 <el-option
                   v-for="dict in med_chrgitm_type"
@@ -164,7 +158,7 @@
               />
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="8">
             <el-form-item label="所需标本" prop="specimenCode">
               <el-select v-model="form.specimenCode" clearable filterable>
@@ -181,7 +175,13 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="医保等级" prop="chrgitmLv">
-              <el-select v-model="form.chrgitmLv" placeholder="" clearable filterable>
+              <el-select
+                v-model="form.chrgitmLv"
+                placeholder=""
+                clearable
+                filterable
+                :disabled="form.isEditInfoDisable === 1"
+              >
                 <el-option
                   v-for="item in chrgitm_lv"
                   :key="item.value"
@@ -191,18 +191,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="执行科室" prop="ruleId">
-              <el-select v-model="form.ruleId" placeholder="" clearable>
-                <el-option
-                  v-for="item in exeOrganizations"
-                  :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="permittedUnitCode">
               <el-select v-model="form.permittedUnitCode" clearable filterable>
@@ -217,7 +206,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="财务类型" prop="itemTypeCode">
-              <el-select v-model="form.itemTypeCode" clearable filterable>
+              <el-select
+                v-model="form.itemTypeCode"
+                clearable
+                filterable
+                :disabled="form.isEditInfoDisable === 1"
+              >
                 <el-option
                   v-for="category in fin_type_code"
                   :key="category.value"
@@ -229,22 +223,13 @@
           </el-col>
         </el-row>
         <el-row :gutter="24">
-          <!-- <el-col :span="8">
-            <el-form-item label="购入价" prop="purchasePrice">
-              <el-input
-                v-model="form.purchasePrice"
-                placeholder=""
-                :disabled="form.id != undefined"
-              />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item label="零售价" prop="retailPrice">
               <el-input
                 v-model="form.retailPrice"
                 placeholder=""
-                :disabled="false"
                 @input="updatePrices"
+                :disabled="form.isEditInfoDisable === 1"
               />
             </el-form-item>
           </el-col>
@@ -268,14 +253,34 @@
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="诊疗子项">
-                  <el-select v-model="item.adviceDefinitionId" placeholder="诊疗子项" filterable>
-                    <el-option
-                      v-for="item in diagnosisTreatmentList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
+                  <div v-if="form.isEditInfoDisable === 0" style="position: relative">
+                    <PopoverList @search="handleSearch" :width="1000" :modelValue="item.name">
+                      <template #popover-content="{}">
+                        <medicineList
+                          @selectRow="(row) => selectRow(row, index)"
+                          :searchKey="medicineSearchKey"
+                          :shouldLoadData="isFirstOpen"
+                          :preloadedData="diagnosisTreatmentList"
+                        />
+                      </template>
+                    </PopoverList>
+                    <!-- 清空按钮 -->
+                    <el-button
+                      v-if="item.name && item.name !== ''"
+                      type="text"
+                      icon="Delete"
+                      size="small"
+                      @click.stop="clearItem(index)"
+                      style="
+                        position: absolute;
+                        right: 3px;
+                        top: 50%;
+                        transform: translateY(-50%);
+                        color: #909399;
+                      "
                     />
-                  </el-select>
+                  </div>
+                  <span v-else>{{ item.name || '' }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -285,11 +290,22 @@
                     controls-position="right"
                     :min="1"
                     :max="999"
+                    @change="calculateTotalPrice"
+                    :disabled="form.isEditInfoDisable === 1"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="8" style="display: flex; align-items: center; padding-bottom: 15px">
-                <el-button @click="addItem" circle type="priamry" size="small" plain icon="Plus" />
+                <!-- <div style="margin-right: 20px; font-weight: bold; color: #333">
+                  小计: ¥{{
+                    item.retailPrice && item.childrenRequestNum
+                      ? (parseFloat(item.retailPrice) * parseInt(item.childrenRequestNum)).toFixed(
+                          2
+                        )
+                      : '0.00'
+                  }}
+                </div> -->
+                <el-button @click="addItem" circle type="primary" size="small" plain icon="Plus" />
                 <el-button
                   @click="removeItem(index)"
                   circle
@@ -313,6 +329,11 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="8" style="display: flex; align-items: center; justify-content: flex-start">
+            <div style="font-size: 18px; font-weight: bold; color: #276ef1">
+              总价: ¥{{ totalPrice }}
+            </div>
+          </el-col>
         </el-row>
       </el-form>
       <template #footer v-if="title != '查看'">
@@ -334,7 +355,10 @@ import {
   bodyTreeSelect,
   locationTreeSelect,
 } from './diagnosistreatment';
-
+import PopoverList from '@/components/OpenHis/popoverList/index.vue';
+import medicineList from './medicineList.vue';
+import MedicineList from '../components/medicineList.vue';
+import { getCurrentInstance, nextTick, watch } from 'vue';
 const { proxy } = getCurrentInstance();
 const { unit_code, med_chrgitm_type, fin_type_code, activity_category_code, chrgitm_lv } =
   proxy.useDict(
@@ -348,7 +372,6 @@ const { unit_code, med_chrgitm_type, fin_type_code, activity_category_code, chrg
 const title = ref('');
 const visible = ref(false);
 const emits = defineEmits(['submit']); // 声明自定义事件
-const categoryCode = ref('');
 const deptOptions = ref(undefined); // 部门树选项
 const bodyOptions = ref(undefined); // 身体部位树选项
 const locationOptions = ref(undefined); // 地点树选项
@@ -363,26 +386,16 @@ const data = reactive({
   rules: {
     busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
     name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
-    // statusEnum: [{ required: true, message: "状态不能为空", trigger: "blur" }],
     categoryCode: [{ required: true, message: '诊疗目录不能为空', trigger: 'blur' }],
-    // typeEnum: [{ required: true, message: '器材种类不能为空', trigger: 'blur' }],
     permittedUnitCode: [{ required: true, message: '使用单位不能为空', trigger: 'blur' }],
-    // ybFlag: [{ required: true, message: "医保标记不能为空", trigger: "blur" }],
-    // ybMatchFlag: [
-    //   { required: true, message: "医保对码标记不能为空", trigger: "blur" },
-    // ],
-    // purchasePrice: [
-    //   { required: true, message: "购入价不能为空", trigger: "blur" },
-    // ],
     retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
-    // maximumRetailPrice: [{ required: true, message: '最高零售价不能为空', trigger: 'blur' }],
     ybType: [{ required: true, message: '医保类型不能为空', trigger: 'blur' }],
     chrgitmLv: [{ required: true, message: '医保等级不能为空', trigger: 'blur' }],
     itemTypeCode: [{ required: true, message: '财务类型不能为空', trigger: 'blur' }],
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { form, rules } = toRefs(data);
 
 const props = defineProps({
   item: {
@@ -416,17 +429,45 @@ const props = defineProps({
 });
 
 // 表单数组，初始一条记录
-const treatmentItems = ref([{ adviceDefinitionId: '', childrenRequestNum: 1 }]);
+const treatmentItems = ref([
+  { adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 },
+]);
+const medicineSearchKey = ref('');
+const isFirstOpen = ref(true); // 标记是否首次打开弹窗
+const totalPrice = ref('0.00'); // 总价
+
+// 计算总价
+function calculateTotalPrice() {
+  try {
+    let sum = 0;
+    treatmentItems.value.forEach((item) => {
+      if (item.adviceDefinitionId && item.retailPrice && item.childrenRequestNum) {
+        const price = parseFloat(item.retailPrice) || 0;
+        const count = parseInt(item.childrenRequestNum) || 0;
+        sum += price * count;
+      }
+    });
+    totalPrice.value = sum.toFixed(2);
+  } catch (error) {
+    totalPrice.value = '0.00';
+    proxy.$modal.msgWarning('价格计算过程中遇到错误，请检查输入数据');
+  }
+}
 
 // 添加表单项
 function addItem() {
-  treatmentItems.value.push({ adviceDefinitionId: '', childrenRequestNum: 1 });
+  treatmentItems.value.push({ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 });
+  // 使用nextTick确保DOM更新后再计算
+  nextTick(() => {
+    calculateTotalPrice();
+  });
 }
 
 // 删除表单项
 function removeItem(index) {
   if (treatmentItems.value.length > 1) {
     treatmentItems.value.splice(index, 1);
+    calculateTotalPrice();
   }
 }
 
@@ -438,9 +479,10 @@ function handleImportYb() {
 function show() {
   reset();
   getLocationTree();
-  getItemList();
   getBodyTree();
   getDeptTree();
+  getItemList();
+
   title.value = '';
   title.value = props.title;
   diagnosisCategoryOptions.value = props.diagnosisCategoryOptions;
@@ -457,9 +499,6 @@ function setValue(row) {
     ybNo: formatValue(row.medicalCatalogCode), // 医保编码
     busNo: formatValue(row.medicalCatalogCode), // 项目编码使用医保编码
     categoryCode: props.currentCategoryEnum,
-    // chrgitmLv: formatValue(
-    //   row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3'
-    // ), // 医保等级
   };
 }
 
@@ -467,16 +506,24 @@ function setValue(row) {
 function edit() {
   reset();
   getLocationTree();
-  getItemList();
   getBodyTree();
   getDeptTree();
+  getItemList();
   title.value = '';
   title.value = props.title;
   form.value = props.item;
   form.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined;
-  treatmentItems.value = props.item.childrenJson
-    ? JSON.parse(props.item.childrenJson)
-    : [{ adviceDefinitionId: '', childrenRequestNum: 1 }];
+
+  // 处理子项数据，确保包含retailPrice字段
+  if (props.item.childrenJson) {
+    const parsedItems = JSON.parse(props.item.childrenJson);
+    treatmentItems.value = parsedItems.map((item) => ({
+      ...item,
+      retailPrice: item.retailPrice || 0,
+    }));
+  } else {
+    treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
+  }
   form.value.permittedUnitCode = form.value.permittedUnitCode
     ? form.value.permittedUnitCode.toString()
     : undefined;
@@ -485,6 +532,11 @@ function edit() {
   exeOrganizations.value = props.exeOrganizations;
   typeEnumOptions.value = props.typeEnumOptions;
   visible.value = true;
+
+  // 编辑时计算初始总价
+  nextTick(() => {
+    calculateTotalPrice();
+  });
 }
 /** 重置操作表单 */
 function reset() {
@@ -514,7 +566,8 @@ function reset() {
     descriptionText: undefined, // 说明
     chrgitmLv: undefined, //医保等级
   };
-  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1 }];
+  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
+  totalPrice.value = '0.00';
   proxy.resetForm('diagnosisTreatmentRef');
 }
 
@@ -552,51 +605,74 @@ function submitForm() {
 /** 查询部门下拉树结构 */
 function getDeptTree() {
   deptTreeSelect().then((response) => {
-    console.log(response, 'response查询部门下拉树结构');
     deptOptions.value = response.data.records;
   });
 }
 /** 查询身体部位拉树结构 */
 function getBodyTree() {
   bodyTreeSelect().then((response) => {
-    console.log(response, 'response查询身体部位下拉树结构');
     bodyOptions.value = response.data.records;
   });
 }
 /** 查询地点下拉树结构 */
 function getLocationTree() {
   locationTreeSelect({ formList: '8,4,10' }).then((response) => {
-    console.log(response, 'response查询部门下拉树结构');
     locationOptions.value = response.data.records;
   });
 }
-
+// 获取诊疗子项列表，只筛出无子项的数据
+function getItemList() {
+  getDiagnosisTreatmentList({ statusEnum: 2, pageSize: 1000, pageNo: 1 }).then((response) => {
+    diagnosisTreatmentList.value = response.data.records.filter((item) => {
+      return item.childrenJson == null;
+    });
+  });
+}
 /** 取消按钮 */
 function cancel() {
   visible.value = false;
   reset();
 }
 
-// 获取诊疗子项列表，只筛出无子项的数据
-function getItemList() {
-  getDiagnosisTreatmentList({ statusEnum: 2, pageSize: 1000, pageNo: 1 }).then((res) => {
-    diagnosisTreatmentList.value = res.data.records.filter((item) => {
-      return item.childrenJson == null;
-    });
-  });
-}
-
 function formatValue(str) {
   if (str === null || str === undefined || str === '' || str === 'null') {
     return undefined;
   }
   return str;
 }
+
+function handleSearch(value) {
+  medicineSearchKey.value = value;
+}
+
+function selectRow(row, index) {
+  treatmentItems.value[index].name = row.name;
+  treatmentItems.value[index].adviceDefinitionId = row.id;
+  treatmentItems.value[index].retailPrice = row.retailPrice || 0;
+  calculateTotalPrice();
+}
+
+// 清空诊疗子项
+function clearItem(index) {
+  treatmentItems.value[index].name = '';
+  treatmentItems.value[index].adviceDefinitionId = '';
+  treatmentItems.value[index].retailPrice = 0;
+  calculateTotalPrice();
+}
 // 在这里可以根据购入价来更新零售价
 function updatePrices(value) {
   form.value.maximumRetailPrice = form.value.retailPrice;
 }
 
+// 监听treatmentItems变化，实时更新总价
+watch(
+  () => treatmentItems.value,
+  () => {
+    calculateTotalPrice();
+  },
+  { deep: true }
+);
+
 defineExpose({
   show,
   edit,
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
index e7882e58..1cb1b700 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
@@ -1,99 +1,106 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 查询诊疗目录列表
-export function getDiagnosisTreatmentList(query) {
-  return request({
+export function getDiagnosisTreatmentList (query) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-page',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
 // 查询诊疗目录详细
-export function getDiagnosisTreatmentOne(id) {
-  return request({
+export function getDiagnosisTreatmentOne (id) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-one/',
     method: 'get',
-    params: { id } // 确保参数正确传递
-  })
+    params: {id}, // 确保参数正确传递
+  });
+}
+// 查询诊疗目录详细
+export function validateActivityEdit (activityId) {
+  return request ({
+    url: '/data-dictionary/diagnosis-treatment/validate-edit',
+    method: 'get',
+    params: {activityId}, // 确保参数正确传递
+  });
 }
-
 // 新增诊疗目录
-export function addDiagnosisTreatment(data) {
-  return request({
+export function addDiagnosisTreatment (data) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information',
     method: 'post',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 修改诊疗目录
-export function editDiagnosisTreatment(data) {
-  return request({
+export function editDiagnosisTreatment (data) {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 
 // 诊疗目录分类查询
-export function getDiseaseTreatmentInit() {
-  return request({
+export function getDiseaseTreatmentInit () {
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/init',
-    method: 'get'
-  })
+    method: 'get',
+  });
 }
 
 // 停用诊疗目录
-export function stopDiseaseTreatment(ids) {
-  console.log(ids)
-  return request({
+export function stopDiseaseTreatment (ids) {
+  console.log (ids);
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-stop',
     method: 'put',
-    data: ids
-  })
+    data: ids,
+  });
 }
 
 // 启用诊疗目录
-export function startDiseaseTreatment(ids) {
-  console.log(ids)
-  return request({
+export function startDiseaseTreatment (ids) {
+  console.log (ids);
+  return request ({
     url: '/data-dictionary/diagnosis-treatment/information-start',
     method: 'put',
-    data: ids
-  })
+    data: ids,
+  });
 }
 
 // 查询部门树形数据
-export function deptTreeSelect(queryParams) {
-  return request({
+export function deptTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    param: queryParams
-  })
+    param: queryParams,
+  });
 }
 // 查询身体部位树形数据
-export function bodyTreeSelect(queryParams) {
-  return request({
+export function bodyTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/body-structure/body',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 // 查询地点树形数据
-export function locationTreeSelect(queryParams) {
-  return request({
+export function locationTreeSelect (queryParams) {
+  return request ({
     url: '/base-data-manage/location/location-page-tree',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
 // 获取医用耗材目录
-export function getYbDiagnosisTreatmentList(queryParams) {
-  return request({
+export function getYbDiagnosisTreatmentList (queryParams) {
+  return request ({
     url: '/catalog/page',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/medicineList.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/medicineList.vue
new file mode 100644
index 00000000..17edadda
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/medicineList.vue
@@ -0,0 +1,114 @@
+<template>
+  <div>
+    <el-table ref="medicineRef" height="300" :data="filteredList" @cell-click="clickRow">
+      <el-table-column label="项目名称" align="center" prop="name" width="300" />
+      <el-table-column label="零售价" align="center" prop="retailPrice" />
+      <el-table-column label="最高零售价" align="center" prop="maximumRetailPrice" />
+    </el-table>
+  </div>
+</template>
+
+<script setup>
+import { getDiagnosisTreatmentList } from './diagnosistreatment';
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  itemType: {
+    type: String,
+    default: '',
+  },
+  searchKey: {
+    type: String,
+    default: '',
+  },
+  shouldLoadData: {
+    type: Boolean,
+    default: false,
+  },
+  // 新增：从父组件接收预加载的数据
+  preloadedData: {
+    type: Array,
+    default: () => [],
+  },
+});
+const emit = defineEmits(['selectRow']);
+
+const diagnosisTreatmentList = ref([]); // 原始数据列表
+const filteredList = ref([]); // 过滤后的数据列表
+const hasLoaded = ref(false); // 标记是否已加载数据
+
+// 获取诊疗项目列表
+function getList() {
+  if (hasLoaded.value) return; // 如果已经加载过数据，则不再重复请求
+
+  // 优先使用父组件传递的数据
+  if (props.preloadedData && props.preloadedData.length > 0) {
+    diagnosisTreatmentList.value = props.preloadedData;
+    filterList(); // 初始化过滤
+    hasLoaded.value = true;
+    return;
+  }
+
+  // 如果父组件没有传递数据或数据为空，则自己请求
+  getDiagnosisTreatmentList({ statusEnum: 2, pageSize: 1000, pageNo: 1 })
+    .then((res) => {
+      diagnosisTreatmentList.value =
+        res.data?.records?.filter((item) => item.childrenJson == null) || [];
+      filterList(); // 初始化过滤
+      hasLoaded.value = true; // 标记为已加载
+    })
+    .catch((err) => {
+      console.error('获取诊疗项目数据失败:', err);
+    });
+}
+
+// 监听shouldLoadData属性变化，仅在首次为true时加载数据
+watch(
+  () => props.shouldLoadData,
+  (newValue) => {
+    if (newValue && !hasLoaded.value) {
+      getList();
+    }
+  },
+  { immediate: true }
+);
+
+// 监听preloadedData变化，当父组件数据更新时同步更新列表
+watch(
+  () => props.preloadedData,
+  (newData) => {
+    if (newData && newData.length > 0) {
+      diagnosisTreatmentList.value = newData;
+      filterList(); // 更新过滤
+      hasLoaded.value = true;
+    }
+  },
+  { immediate: true }
+);
+
+// 监听搜索关键词变化，实时过滤数据
+watch(
+  () => props.searchKey,
+  () => {
+    filterList();
+  }
+);
+
+// 根据搜索关键词过滤列表
+function filterList() {
+  if (!props.searchKey || props.searchKey.trim() === '') {
+    filteredList.value = diagnosisTreatmentList.value;
+  } else {
+    const searchTerm = props.searchKey.toLowerCase().trim();
+    filteredList.value = diagnosisTreatmentList.value.filter(
+      (item) => item.name && item.name.toLowerCase().includes(searchTerm)
+    );
+  }
+}
+
+function clickRow(row) {
+  emit('selectRow', row);
+}
+</script>
+
+<style scoped></style>
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
index 773773c0..3abf77c2 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
@@ -28,7 +28,6 @@
           label-width="68px"
         >
           <el-row :gutter="24">
-            <!-- <el-col :span="5"> -->
             <el-form-item label="项目名" prop="searchKey" label-width="55">
               <el-input
                 v-model="queryParams.searchKey"
@@ -38,8 +37,7 @@
                 @keyup.enter="handleQuery"
               />
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="5"> -->
+
             <el-form-item label="状态" prop="statusEnum" label-width="80">
               <el-select v-model="queryParams.statusEnum" clearable>
                 <el-option
@@ -50,8 +48,6 @@
                 />
               </el-select>
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="5"> -->
             <el-form-item label="医保是否对码" prop="ybMatchFlag" label-width="120">
               <el-select v-model="queryParams.ybMatchFlag" placeholder="" clearable>
                 <el-option
@@ -62,24 +58,7 @@
                 />
               </el-select>
             </el-form-item>
-            <!-- </el-col> -->
-            <!-- <el-col :span="4">
-              <el-form-item label="执行科室" prop="ruleId" label-width="100">
-                <el-select
-                  v-model="queryParams.ruleId"
-                  placeholder=""
-                  clearable
-                >
-                  <el-option
-                    v-for="item in exeOrganizations"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col :span="4"> -->
+
             <el-form-item label="类型" prop="typeEnum" label-width="100">
               <el-select v-model="queryParams.typeEnum" placeholder="" clearable>
                 <el-option
@@ -116,9 +95,9 @@
             >
           </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="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>
@@ -148,7 +127,7 @@
             key="busNo"
             prop="busNo"
             :show-overflow-tooltip="true"
-            width="150"
+            width="200"
           />
           <el-table-column
             label="项目名称"
@@ -156,22 +135,9 @@
             key="name"
             prop="name"
             :show-overflow-tooltip="true"
-            width="150"
-          />
-          <el-table-column
-            label="拼音"
-            align="center"
-            key="pyStr"
-            prop="pyStr"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="五笔码"
-            align="center"
-            key="wbStr"
-            prop="wbStr"
-            :show-overflow-tooltip="true"
+            width="200"
           />
+
           <el-table-column
             label="目录类别"
             align="center"
@@ -180,94 +146,6 @@
             :show-overflow-tooltip="true"
             width="100"
           />
-          <el-table-column
-            label="业务类型"
-            align="center"
-            key="typeEnum_enumText"
-            prop="typeEnum_enumText"
-            :show-overflow-tooltip="true"
-            width="90"
-          />
-          <el-table-column
-            label="使用单位"
-            align="center"
-            key="permittedUnitCode_dictText"
-            prop="permittedUnitCode_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保标记"
-            align="center"
-            key="ybFlag_enumText"
-            prop="ybFlag_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保编码"
-            align="center"
-            key="ybNo"
-            prop="ybNo"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保对码标记"
-            align="center"
-            key="ybMatchFlag_enumText"
-            prop="ybMatchFlag_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="状态"
-            align="center"
-            key="statusEnum_enumText"
-            prop="statusEnum_enumText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="归属科室"
-            align="center"
-            key="orgId_dictText"
-            prop="orgId_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="所在位置"
-            align="center"
-            key="locationId_dictText"
-            prop="locationId_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="身体部位"
-            align="center"
-            key="bodySiteCode_dictText"
-            prop="bodySiteCode_dictText"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="所需标本"
-            align="center"
-            key="specimenCode_dictText"
-            prop="specimenCode_dictText"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column
-            label="财务类别"
-            align="center"
-            key="itemTypeCode_dictText"
-            prop="itemTypeCode_dictText"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column
-            label="医保类别"
-            align="center"
-            key="ybType_dictText"
-            prop="ybType_dictText"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
           <el-table-column
             label="售价"
             align="center"
@@ -277,20 +155,34 @@
             width="100"
           />
           <el-table-column
-            label="说明"
+            label="财务类别"
             align="center"
-            key="descriptionText"
-            prop="descriptionText"
+            key="itemTypeCode_dictText"
+            prop="itemTypeCode_dictText"
+            :show-overflow-tooltip="true"
+            width="100"
+          />
+          <el-table-column
+            label="使用单位"
+            align="center"
+            key="permittedUnitCode_dictText"
+            prop="permittedUnitCode_dictText"
             :show-overflow-tooltip="true"
           />
-          <!-- <el-table-column
-            label="执行科室"
+          <el-table-column
+            label="医保编码"
             align="center"
-            key="ruleId"
-            prop="ruleId"
+            key="ybNo"
+            prop="ybNo"
             :show-overflow-tooltip="true"
-            width="90"
-          /> -->
+          />
+          <el-table-column
+            label="状态"
+            align="center"
+            key="statusEnum_enumText"
+            prop="statusEnum_enumText"
+            :show-overflow-tooltip="true"
+          />
           <el-table-column
             label="操作"
             align="center"
@@ -345,16 +237,30 @@
 
     <!-- 诊疗目录导入对话框 -->
     <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-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>
+            <el-link
+              type="primary"
+              :underline="false"
+              style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate"
+              >下载模板</el-link
+            >
           </div>
         </template>
       </el-upload>
@@ -369,13 +275,14 @@
 </template>
   
 <script setup name="DiagnosisTreatment">
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth';
 import {
   getDiagnosisTreatmentList,
   stopDiseaseTreatment,
   startDiseaseTreatment,
   getDiseaseTreatmentInit,
   getDiagnosisTreatmentOne,
+  validateActivityEdit,
 } from './components/diagnosistreatment';
 import diagnosisTreatmentDialog from './components/diagnosisTreatmentDialog';
 import DiagTreYbDialog from './components/diagTreYbDialog';
@@ -407,18 +314,17 @@ const upload = reactive({
   // 是否显示弹出层
   open: false,
   // 弹出层标题
-  title: "",
+  title: '',
   // 是否禁用上传
   isUploading: false,
   // 是否更新已经存在的数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: { Authorization: 'Bearer ' + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/data-dictionary/diagnosis-treatment/import-data"
+  url: import.meta.env.VITE_APP_BASE_API + '/data-dictionary/diagnosis-treatment/import-data',
 });
 
-
 const data = reactive({
   form: {},
   queryParams: {
@@ -445,7 +351,6 @@ const filterNode = (value, data) => {
 /** 诊断目录分类查询下拉树结构 */
 function getDiseaseTreatmentList() {
   getDiseaseTreatmentInit().then((response) => {
-    console.log(response, 'response诊疗目录分类查询下拉树结构');
     diagnosisCategoryOptions.value = response.data.diagnosisCategoryOptions.sort((a, b) => {
       return parseInt(a.value) - parseInt(b.value);
     });
@@ -458,18 +363,15 @@ function getDiseaseTreatmentList() {
 }
 /** 查询诊断目录列表 */
 function getList() {
-  console.log(queryParams.value, 'queryParams***********************');
   loading.value = true;
   getDiagnosisTreatmentList(queryParams.value).then((res) => {
     loading.value = false;
     diagnosisTreatmentList.value = res.data.records;
-    console.log(diagnosisTreatmentList, 'res.data');
     total.value = res.data.total;
   });
 }
 /** 节点单击事件 */
 function handleNodeClick(data) {
-  console.log(data, '节点单击事件');
   queryParams.value.categoryCode = data.value;
   currentCategoryEnum.value = data.value;
   handleQuery();
@@ -477,7 +379,6 @@ function handleNodeClick(data) {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNo = 1;
-  console.log(queryParams, 'queryParams搜索');
   getList();
 }
 
@@ -528,7 +429,11 @@ function handleImport() {
 }
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/data-dictionary/diagnosis-treatment/import-template', {}, `diagnosis_treatment_template_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    '/data-dictionary/diagnosis-treatment/import-template',
+    {},
+    `diagnosis_treatment_template_${new Date().getTime()}.xlsx`
+  );
 }
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
@@ -541,8 +446,8 @@ const handleFileSuccess = (response, file, fileList) => {
   proxy.$refs['uploadRef'].handleRemove(file);
   proxy.$alert(
     "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-    response.msg +
-    '</div>',
+      response.msg +
+      '</div>',
     '导入结果',
     { dangerouslyUseHTMLString: true }
   );
@@ -555,7 +460,6 @@ function submitFileForm() {
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, 'selection');
   // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
@@ -564,22 +468,28 @@ function handleSelectionChange(selection) {
 
 /** 打开新增弹窗 */
 function openAddDiagnosisTreatment() {
-  // if (currentCategoryEnum.value) {
-  console.log('打开新增弹窗');
   title.value = '新增';
   nextTick(() => {
     proxy.$refs.diagnosisTreatmentRef.show();
   });
-  // } else {
-  //   proxy.$modal.msgError("请先选择目录分类！");
-  // }
 }
+const isEditInfoDisable = ref(0);
 /** 打开编辑弹窗 */
 function openEditDiagnosisTreatment(row) {
+  validateActivityEdit(row.id).then((res) => {
+    // res.data == 1  医生开过该诊疗项目，不可编辑
+    isEditInfoDisable.value = res.data;
+    getDiagnosisTreatmentInfo(row);
+  });
+}
+// 根据诊疗id 查询诊疗信息
+function getDiagnosisTreatmentInfo(row) {
   getDiagnosisTreatmentOne(row.id).then((response) => {
-    console.log(response, 'response88888');
-
-    currentData.value = response.data;
+    currentData.value = {
+      ...response.data,
+      // 禁用编辑
+      isEditInfoDisable: isEditInfoDisable.value,
+    };
     currentData.value.ybFlag == 1
       ? (currentData.value.ybFlag = true)
       : (currentData.value.ybFlag = false);
diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue
index 5c29685e..abfacae5 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -46,6 +46,21 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="诊断类型" prop="typeCode">
+            <el-select
+              v-model="queryParams.typeCode"
+              placeholder="请选择"
+              style="width: 240px"
+              clearable
+            >
+              <el-option
+                v-for="dict in condition_type_code"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </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>
@@ -86,6 +101,84 @@
           </el-col> -->
         </el-row>
 
+        <el-table v-loading="loading" :data="diseaseList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="编码" align="center" key="conditionCode" prop="conditionCode" />
+          <el-table-column
+            label="名称"
+            align="center"
+            key="name"
+            prop="name"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="疾病分类"
+            align="center"
+            key="sourceEnum_enumText"
+            prop="sourceEnum_enumText"
+            :show-overflow-tooltip="true"
+          />
+          <!-- <el-table-column
+            label="拼音助记码"
+            align="center"
+            key="pyStr"
+            prop="pyStr"
+            :show-overflow-tooltip="true"
+          /> -->
+          <el-table-column
+            label="类型"
+            align="center"
+            key="typeCode_dictText"
+            prop="typeCode_dictText"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="医保编码 "
+            align="center"
+            key="ybNo"
+            prop="ybNo"
+            :show-overflow-tooltip="true"
+          />
+          <!-- <el-table-column
+            label="医保标记"
+            align="center"
+            key="ybMatchFlag"
+            prop="ybMatchFlag_enumText"
+          />
+          <el-table-column
+            label="医保对码标志"
+            align="center"
+            key="ybMatchFlag"
+            prop="ybMatchFlag_enumText"
+          /> -->
+          <el-table-column
+            label="状态"
+            align="center"
+            key="statusEnum_enumText"
+            prop="statusEnum_enumText"
+            width="160"
+          />
+          <el-table-column
+            label="描述"
+            align="center"
+            key="description"
+            prop="description"
+            width="160"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            width="150"
+            class-name="small-padding fixed-width"
+          >
+            <template #default="scope">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                >编辑</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
         <!-- 添加外层滚动容器，确保表格可以水平滚动 -->
         <div class="table-scroll-container">
           <!-- 移除style="width: 100%"，让Element UI表格根据内容自动调整 -->
@@ -211,7 +304,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="类型" prop="typeCode">
+            <el-form-item label="诊断类型" prop="typeCode">
               <el-select v-model="form.typeCode" placeholder="请选择" clearable>
                 <el-option
                   v-for="dict in condition_type_code"
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
index c29a5b28..23641650 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicine.js
@@ -18,6 +18,13 @@ export function getMedicationList(query) {
   })
 }
 
+export function getYbCatalogResult(address,v) {
+  return request({
+    url: '/yb-request/query-catalog?address=1301&v=1',
+    method: 'get',
+  })
+}
+
 // 查询药品目录详细
 export function getMedicationOne(id) {
   return request({
@@ -26,6 +33,14 @@ export function getMedicationOne(id) {
     params: { id } // 确保参数正确传递
   })
 }
+// 校验药品是否可以编辑
+export function validateEditMedictaion(medicationId) {
+  return request({
+    url: '/data-dictionary/medication/validate-edit',
+    method: 'get',
+    params: { medicationId } // 确保参数正确传递
+  })
+}
 
 // 新增药品目录
 export function addMedication(data) {
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
index 3c6dbf4a..8ebeaa23 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -46,7 +46,9 @@
                     clearable
                     @change="handleLvChange"
                     style="width: 240px"
+                    :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                   >
+                    >
                     <el-option
                       v-for="dict in chrgitm_lv"
                       :key="dict.value"
@@ -70,7 +72,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="药品分类" prop="categoryCode">
-                  <el-select v-model="form.categoryCode" clearable>
+                  <el-select
+                    v-model="form.categoryCode"
+                    clearable
+                    filterable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  >
                     <el-option
                       v-for="category in med_category_code"
                       :key="category.value"
@@ -107,17 +114,31 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="规格" prop="totalVolume">
-                  <el-input v-model="form.totalVolume" placeholder="" />
+                  <el-input
+                    v-model="form.totalVolume"
+                    placeholder=""
+                    clearable
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="计量换算" prop="totalVolume">
-                  <el-input v-model="form.unitConversionRatio" placeholder="" />
+                  <el-input
+                    v-model="form.unitConversionRatio"
+                    placeholder=""
+                    clearable
+                    :disabled="form.isEditInfoDisable === 1"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="剂量单位" prop="doseUnitCode">
-                  <el-select v-model="form.doseUnitCode" clearable filterable>
+                  <el-select
+                    v-model="form.doseUnitCode"
+                    clearable
+                    filterable
+                    :disabled="form.isEditInfoDisable === 1"
+                  >
                     <el-option
                       v-for="category in unit_code"
                       :key="category.value"
@@ -131,7 +152,12 @@
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="剂型" prop="doseFormCode">
-                  <el-select v-model="form.doseFormCode" clearable filterable>
+                  <el-select
+                    v-model="form.doseFormCode"
+                    clearable
+                    filterable
+                    :disabled="form.isEditInfoDisable === 1"
+                  >
                     <el-option
                       v-for="category in dose_form_code"
                       :key="category.value"
@@ -182,6 +208,18 @@
                   <el-input v-model="form.maxUnit" placeholder="" />
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="用法说明" prop="dosageInstruction">
+                  <el-select v-model="form.dosageInstruction" clearable filterable>
+                    <el-option
+                      v-for="category in dosage_instruction"
+                      :key="category.value"
+                      :label="category.label"
+                      :value="category.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <div class="title">库存信息</div>
             <el-row :gutter="24">
@@ -222,7 +260,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="包装单位" prop="unitCode">
-                  <el-select v-model="form.unitCode" clearable filterable>
+                  <el-select
+                    v-model="form.unitCode"
+                    clearable
+                    filterable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  >
                     <el-option
                       v-for="category in unit_code"
                       :key="category.value"
@@ -234,7 +277,12 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="最小单位" prop="minUnitCode">
-                  <el-select v-model="form.minUnitCode" clearable filterable>
+                  <el-select
+                    v-model="form.minUnitCode"
+                    clearable
+                    filterable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  >
                     <el-option
                       v-for="category in unit_code"
                       :key="category.value"
@@ -245,8 +293,12 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="警戒线最低值(常规单位)" prop="itemMinQuantity" label-width="180px">
-                  <el-input-number    
+                <el-form-item
+                  label="警戒线最低值(常规单位)"
+                  prop="itemMinQuantity"
+                  label-width="180px"
+                >
+                  <el-input-number
                     v-model="form.itemMinQuantity"
                     placeholder=""
                     controls-position="right"
@@ -287,12 +339,23 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="拆零比" prop="partPercent">
-                  <el-input-number v-model="form.partPercent" controls-position="right" placeholder="" :min="1"/>
+                  <el-input-number
+                    v-model="form.partPercent"
+                    controls-position="right"
+                    placeholder=""
+                    :min="1"
+                    clearable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  />
                 </el-form-item>
               </el-col>
 
               <el-col :span="6">
-                <el-form-item label="警戒线最高值(常规单位)" prop="itemMaxQuantity" label-width="180px">
+                <el-form-item
+                  label="警戒线最高值(常规单位)"
+                  prop="itemMaxQuantity"
+                  label-width="180px"
+                >
                   <el-input-number
                     v-model="form.itemMaxQuantity"
                     placeholder=""
@@ -306,12 +369,22 @@
             <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=""
+                    clearable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  />
                 </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=""
+                    clearable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -324,7 +397,12 @@
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="财务类型" prop="typeCode">
-                  <el-select v-model="form.typeCode" clearable filterable>
+                  <el-select
+                    v-model="form.typeCode"
+                    clearable
+                    filterable
+                    :disabled="form.isEditInfoDisable === 2 || form.isEditInfoDisable === 1"
+                  >
                     <el-option
                       v-for="category in fin_type_code"
                       :key="category.value"
@@ -375,6 +453,7 @@
                     clearable
                     filterable
                     style="width: 240px"
+                    :disabled="form.isEditInfoDisable === 1"
                   >
                     <el-option
                       v-for="dict in med_chrgitm_type"
@@ -399,19 +478,28 @@
               </el-col> -->
               <el-col :span="6">
                 <el-form-item label="基药标识" prop="basicFlag">
-                  <el-checkbox v-model="form.basicFlag"></el-checkbox>
+                  <el-checkbox
+                    v-model="form.basicFlag"
+                    :disabled="form.isEditInfoDisable === 1"
+                  ></el-checkbox>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="皮试判别" prop="skinTestFlag">
-                  <el-checkbox v-model="form.skinTestFlag"></el-checkbox>
+                  <el-checkbox
+                    v-model="form.skinTestFlag"
+                    :disabled="form.isEditInfoDisable === 1"
+                  ></el-checkbox>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="6">
                 <el-form-item label="注射药品" prop="injectFlag">
-                  <el-checkbox v-model="form.injectFlag"></el-checkbox>
+                  <el-checkbox
+                    v-model="form.injectFlag"
+                    :disabled="form.isEditInfoDisable === 1"
+                  ></el-checkbox>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -448,8 +536,8 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="处方标志" prop="rxFlag">
-                  <el-radio-group v-model="form.rxFlag">
-                    <el-radio v-for="item in rx_flag" :key="item.value" :label="item.value">
+                  <el-radio-group v-model="form.rxFlag" :disabled="form.isEditInfoDisable === 1">
+                    <el-radio v-for="item in rx_flag" :key="item.value" :value="item.value">
                       {{ item.label }}
                     </el-radio>
                   </el-radio-group>
@@ -583,6 +671,7 @@ const {
   ddd_code,
   dose_from_code,
   rx_flag,
+  dosage_instruction,
   chrgitm_lv,
 } = proxy.useDict(
   'med_category_code',
@@ -598,6 +687,7 @@ const {
   'ddd_code',
   'dose_from_code',
   'rx_flag',
+  'dosage_instruction',
   'chrgitm_lv'
 );
 
@@ -639,23 +729,11 @@ const data = reactive({
   form: {},
   antibioticForm: {},
   rules: {
-    // statusEnum: [
-    //   { required: true, message: "药品状态不能为空", trigger: "blur" },
-    // ],
-    // orgId: [{ required: true, message: "所属科室不能为空", trigger: "blur" }],
     locationId: [{ required: true, message: '所在位置不能为空', trigger: 'blur' }],
     doseFormCode: [{ required: true, message: '剂型不能为空', trigger: 'blur' }],
     totalVolume: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
-    // activeFlag: [{ required: true, message: "活性不能为空", trigger: "blur" }],
-    // methodCode: [{ required: true, message: '用法不能为空', trigger: 'blur' }],
-    // rateCode: [{ required: true, message: '用药频次不能为空', trigger: 'blur' }],
-    // dose: [{ required: true, message: '单次剂量不能为空', trigger: 'blur' }],
     doseUnitCode: [{ required: true, message: '剂量单位不能为空', trigger: 'blur' }],
     manufacturerText: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-    // maxUnit: [
-    //   { required: true, message: '单次最大剂量不能为空', trigger: 'blur' },
-    //   { validator: validateMaxUnit, trigger: 'blur' },
-    // ],
     busNo: [{ required: true, message: '药品编号不能为空', trigger: 'blur' }],
     name: [{ required: true, message: '药品名称不能为空', trigger: 'blur' }],
     categoryCode: [{ required: true, message: '药品分类不能为空', trigger: 'blur' }],
@@ -665,29 +743,10 @@ 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: false, message: '医保编码不能为空', trigger: 'blur' }],
     pharmacologyCategoryCode: [{ required: true, message: '药品性质不能为空', trigger: 'blur' }],
-    // skinTestFlag: [
-    //   { required: true, message: "皮试不能为空", trigger: "blur" },
-    // ],
-    // injectFlag: [{ required: true, message: "注射不能为空", trigger: "blur" }],
     supplyId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
-    // restrictedFlag: [
-    //   { required: true, message: "限制使用不能为空", trigger: "blur" },
-    // ],
-    // childrenFlag: [
-    //   { required: true, message: "儿童用药不能为空", trigger: "blur" },
-    // ],
-    // restrictedScope: [
-    //   { required: true, message: "限制使用范围不能为空", trigger: "blur" },
-    // ],
     nationalDrugCode: [{ required: false, message: '贯标国家编码不能为空', trigger: 'blur' }],
     partAttributeEnum: [{ required: true, message: '拆分属性不能为空', trigger: 'blur' }],
     thoPartAttributeEnum: [
@@ -697,16 +756,8 @@ const data = reactive({
         trigger: 'blur',
       },
     ],
-    // basicFlag: [
-    //   { required: true, message: "基药标识不能为空", trigger: "blur" },
-    // ],
-    // antibioticFlag: [
-    //   { required: true, message: "抗生素不能为空", trigger: "blur" },
-    // ],
-    // selfFlag: [{ required: true, message: "自制不能为空", trigger: "blur" }],
     purchasePrice: [{ required: true, message: '购入价不能为空', trigger: 'blur' }],
     retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
-    // maximumRetailPrice: [{ required: true, message: '最高零售价不能为空', trigger: 'blur' }],
     ybType: [{ required: true, message: '医保类型不能为空', trigger: 'blur' }],
     rxFlag: [{ required: true, message: '处方标志不能为空', trigger: 'blur' }],
     chrgitmLv: [{ required: true, message: '医保等级不能为空', trigger: 'blur' }],
@@ -762,15 +813,12 @@ function validateMaxUnit(rule, value, callback) {
 /** 查询部门下拉树结构 */
 function getDeptTree() {
   deptTreeSelect().then((response) => {
-    console.log(response, 'response查询部门下拉树结构');
     deptOptions.value = response.data.records;
-    console.log(deptOptions.value, '部门下拉树结构');
   });
 }
 /** 查询地点下拉树结构 */
 function getLocationTree() {
   locationTreeSelect({ formList: '11,16' }).then((response) => {
-    console.log(response, 'response查询部门下拉树结构');
     locationOptions.value = response.data.records;
   });
 }
@@ -787,10 +835,7 @@ function show(row) {
   statusRestrictedOptions.value = props.statusRestrictedOptions;
   partAttributeEnumOptions.value = props.partAttributeEnumOptions;
   tempOrderSplitPropertyOptions.value = props.tempOrderSplitPropertyOptions;
-  console.log(form.value.categoryCode, 'form.value.categoryCode');
-  // setValue(row);
   form.value.categoryCode = props.currentCategoryEnum;
-  console.log(form.value, 1234567890);
   visible.value = true;
 }
 
@@ -799,38 +844,22 @@ function setValue(row) {
     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(
       props.currentCategoryEnum == '4' ? row.conventionalUsage : row.drugSpecification
     ), // 规格
     doseode: formatValue(row.drugForm), // 剂型
     doseUnitCode: formatValue(row.minMeasurementUnit), // 剂量单位
-    // usageLimit: row.dosage,  // 用量限定
     methodCode: formatValue(row.usage), // 用法
     rateCode: formatValue(row.frequency), // 用药频次
-    // maxUnit: row.,  // 单次最大剂量
-    // skinTestFlag: row.,  // 皮试判别
-    // locationId: row.,  // 采购入库位置
     unitCode: formatValue(row.packagingUnit), // 包装单位
     minUnitCode: formatValue(row.minUseUnit), // 最小单位
-    // partAttributeEnum: row.,  // 门诊拆分属性
-    // thoPartAttributeEnum: row.,  // 住院临时医嘱拆分属性
     partPercent: formatValue(row.conversionRatio), // 拆零比
     itemMinQuantity: formatValue(row.itemMinQuantity), // 警戒线最低值
     itemMaxQuantity: formatValue(row.itemMaxQuantity), // 警戒线最高值
-
-    // purchasePrice: row.,  // 购入价
-    // retailPrice: row.,  // 零售价
-    // maximumRetailPrice: row.,  // 最高零售价
-    // typeCode: row.,  // 财务类型
     nationalDrugCode: formatValue(row.nationalDrugCode), // 贯标国家编码
     version: formatValue(row.version), // 药品版本
     approvalNumber: formatValue(row.approvalNo), // 批准文号
-    // ybType: formatValue(row.insuranceClass), // 医保类别
     manufacturerText: formatValue(row.manufacturerName), // 生产厂家
-    // supplyId: row.,  // 供应商
     basicFlag: formatValue(row.essentialDrugFlag), // 基药标识
     // injectFlag: row.,  // 注射药物
     // childrenFlag: row.pediatricUse,  // 儿童用药标志
@@ -887,7 +916,6 @@ function edit() {
   antibioticForm.value.maxRateCode = form.value.maxRateCode;
   antibioticForm.value.dddUnitCode = form.value.dddUnitCode;
   antibioticForm.value.dddCode = form.value.dddCode;
-  //antibioticForm.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined;
   form.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined;
   visible.value = true;
 }
@@ -941,7 +969,6 @@ function reset() {
     minUnitCode: undefined,
     doseUnitCode: undefined,
     doseFormCode: undefined,
-    // statusEnum: undefined,
     skinTestFlag: undefined,
     injectFlag: undefined,
     childrenFlag: undefined,
@@ -968,8 +995,6 @@ function reset() {
     nationalDrugCode: undefined,
     antibioticFlag: undefined,
     selfFlag: undefined,
-    // minRateCode: undefined,
-    // maxRateCode: undefined,
     partAttributeEnum: undefined,
     thoPartAttributeEnum: undefined,
     usageLimit: undefined,
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
index bc06da4b..c37d1184 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
@@ -3,7 +3,7 @@
     <el-dialog
       title="医保药品目录"
       v-model="visible"
-      width="1500px"
+      width="1800px"
       append-to-body
       destroy-on-close
       @close="cancel"
@@ -29,22 +29,32 @@
             <span v-else>{{ scope.row.registeredName }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="药品类别" prop="drugCategoryName">
+        <el-table-column align="center" label="药品类别" prop="drugCategoryName" width="120">
           <template #default="scope">
             {{ formatStr(scope.row.drugCategoryName) }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="国药准字" prop="drugCategoryName">
+          <template #default="scope">
+            {{ formatStr(scope.row.approvalNo) }}
+          </template>
+        </el-table-column>
         <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">
+        <el-table-column align="center" label="处方药" prop="otcFlagName" width="120">
           <template #default="scope">
             {{ formatStr(scope.row.otcFlagName) }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="厂家" prop="manufacturerName">
+          <template #default="scope">
+            {{ formatStr(scope.row.manufacturerName) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="批准文号" prop="approvalNo" />
         <el-table-column align="center" label="操作" width="80">
           <template #default="scope">
diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
index 8c7d91d9..486af9f8 100644
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -62,6 +62,24 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="医保接口编号" prop="searchKey" label-width="120">
+              <el-input
+                v-model="queryParams.address"
+                placeholder="1301-1321"
+                clearable
+                style="width: 240px"
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="版本号" prop="searchKey" label-width="120">
+              <el-input
+                v-model="queryParams.v"
+                placeholder="版本号"
+                clearable
+                style="width: 240px"
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
             <!-- </el-col> -->
           </el-row>
           <!-- <el-form-item>
@@ -91,20 +109,17 @@
               >启用</el-button
             >
           </el-col>
-          
+
           <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="Upload"
-              @click="handleImport"
-              >导入</el-button
-            >
+            <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>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Search" @click="getYbCatalog">查询目录</el-button>
+          </el-col>
           <!-- <el-col :span="1.5">
             <el-button
               type="warning"
@@ -129,7 +144,8 @@
             key="busNo"
             prop="busNo"
             :show-overflow-tooltip="true"
-            width="90"
+            min-width="90"
+            width="200px"
           />
           <el-table-column
             label="药品名称"
@@ -137,7 +153,17 @@
             key="name"
             prop="name"
             :show-overflow-tooltip="true"
-            width="110"
+            min-width="110"
+            width="200px"
+          />
+          <el-table-column
+            label="规格"
+            align="center"
+            key="totalVolume"
+            prop="totalVolume"
+            :show-overflow-tooltip="true"
+            min-width="200px"
+            width="200px"
           />
           <el-table-column
             label="药品状态"
@@ -146,11 +172,13 @@
             prop="statusEnum_enumText"
             :show-overflow-tooltip="true"
           >
-          <template #default="scope">
-            <el-tag v-if="scope.row.statusEnum == 2" type="success" >{{ scope.row.statusEnum_enumText }}</el-tag>
-            <el-tag v-else type="error">{{ scope.row.statusEnum_enumText }}</el-tag>
-          </template>
-         </el-table-column>
+            <template #default="scope">
+              <el-tag v-if="scope.row.statusEnum == 2" type="success">{{
+                scope.row.statusEnum_enumText
+              }}</el-tag>
+              <el-tag v-else type="error">{{ scope.row.statusEnum_enumText }}</el-tag>
+            </template>
+          </el-table-column>
           <el-table-column
             label="药品分类"
             align="center"
@@ -166,21 +194,14 @@
             prop="orgId_dictText"
             :show-overflow-tooltip="true"
           /> -->
-          <el-table-column
+          <!-- <el-table-column
             label="采购入库位置"
             align="center"
             key="locationId_dictText"
             prop="locationId_dictText"
             :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="规格"
-            align="center"
-            key="totalVolume"
-            prop="totalVolume"
-            :show-overflow-tooltip="true"
-            width="200px"
-          />
+          /> -->
+
           <el-table-column
             label="医保编码"
             align="center"
@@ -310,15 +331,17 @@
 </template>
 
 <script setup name="Medication">
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth';
 import {
   getMedicationList,
   editMedication,
   addMedication,
   getMedicationCategory,
+  validateEditMedictaion,
   getMedicationOne,
   startMedication,
   stopMedication,
+  getYbCatalogResult,
 } from './components/medicine';
 import medicineDialog from './components/medicineDialog';
 import MedicineYbDialog from './components/medicineYbDialog';
@@ -356,15 +379,15 @@ const upload = reactive({
   // 是否显示弹出层
   open: false,
   // 弹出层标题
-  title: "",
+  title: '',
   // 是否禁用上传
   isUploading: false,
   // 是否更新已经存在的数据
   updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: { Authorization: 'Bearer ' + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/data-dictionary/medication/import-data"
+  url: import.meta.env.VITE_APP_BASE_API + '/data-dictionary/medication/import-data',
 });
 
 const data = reactive({
@@ -376,6 +399,8 @@ const data = reactive({
     statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
     ybMatchFlag: undefined, // 是否医保匹配（包括 1：是，0：否）
     categoryCode: undefined, // 目录
+    address: undefined, // 目录
+    v: undefined, // 目录
   },
   rules: {},
 });
@@ -391,7 +416,6 @@ const filterNode = (value, data) => {
 /** 病种目录分类查询下拉树结构 */
 function getMedicationCategoryList() {
   getMedicationCategory().then((response) => {
-    console.log(response, 'response药品目录分类查询下拉树结构');
     medicationOptions.value = response.data.medicationCategoryCodeOptions;
     medicationOptions.value.unshift({ info: '全部', value: '' });
     statusFlagOptions.value = response.data.statusFlagOptions;
@@ -406,14 +430,20 @@ function getMedicationCategoryList() {
 /** 查询病种目录列表 */
 function getList() {
   loading.value = true;
-  console.log(queryParams.value, 'queryParams***********************');
   getMedicationList(queryParams.value).then((res) => {
     loading.value = false;
-    console.log(res, 'res');
     medicationList.value = res.data.records;
     total.value = res.data.total;
   });
 }
+
+/** 查询病种目录列表 */
+function getYbCatalog() {
+  loading.value = true;
+  getYbCatalogResult(queryParams.value).then((res) => {
+    loading.value = false;
+  });
+}
 /** 节点单击事件 */
 function handleNodeClick(data) {
   queryParams.value.categoryCode = data.value;
@@ -423,7 +453,6 @@ function handleNodeClick(data) {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNo = 1;
-  console.log(queryParams.value, 'queryParams');
   getList();
 }
 
@@ -444,7 +473,6 @@ function handleStart() {
 /** 停用按钮操作 */
 function handleClose() {
   const stopIds = ids.value;
-  console.log(data, 'data');
   proxy.$modal
     .confirm('是否确认停用数据！')
     .then(function () {
@@ -474,7 +502,11 @@ function handleImport() {
 }
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/data-dictionary/medication/import-template', {}, `medication_template_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    '/data-dictionary/medication/import-template',
+    {},
+    `medication_template_${new Date().getTime()}.xlsx`
+  );
 }
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
@@ -508,25 +540,34 @@ function handleSelectionChange(selection) {
 
 /** 打开新增弹窗 */
 function openAddMedicine() {
-  // if (!currentCategoryEnum.value) {
-  //   return proxy.$modal.msgError("请选择药品目录分类");
-  // }
-  // proxy.$refs['medicineYbRef'].show();
   proxy.$refs['medicineRef'].show();
 }
+const isEditInfoDisable = ref(0);
+
 /** 打开编辑弹窗 */
 function openEditMedicine(row) {
+  validateEditMedictaion(row.id).then((res) => {
+    // res.data == 1  医生开过该药品，不可编辑
+    // res.data == 2  该药品已经入库过，不可编辑
+    isEditInfoDisable.value = res.data;
+    getMedicationInfo(row);
+  });
+}
+// 根据药品id 查询药品信息
+function getMedicationInfo(row) {
   getMedicationOne(row.id).then((response) => {
-    currentData.value = response.data;
+    currentData.value = {
+      ...response.data,
+      // 禁用编辑
+      isEditInfoDisable: isEditInfoDisable.value,
+    };
     nextTick(() => {
       proxy.$refs['medicineRef'].edit();
     });
   });
 }
-
 /** 提交按钮 */
 function submitForm(formData) {
-  console.log(formData, 'submitForm');
   if (formData.id != undefined) {
     editMedication(formData).then((response) => {
       proxy.$modal.msgSuccess('修改成功');
diff --git a/openhis-ui-vue3/src/views/catalog/national/index.vue b/openhis-ui-vue3/src/views/catalog/national/index.vue
new file mode 100644
index 00000000..2a2cf2d4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/national/index.vue
@@ -0,0 +1,477 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!-- 搜索条件区域 -->
+      <el-col :span="24">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" size="small">
+          <el-form-item label="项目名">
+            <el-input v-model="queryParams.searchKey" placeholder="国临编码/国临名称/医保编码/医保名称" clearable style="width: 280px" />
+          </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-col>
+      
+      <!-- 操作按钮区域 -->
+      <el-col :span="24" class="mb20">
+        <el-button type="primary" icon="Plus" @click="handleAdd">添加新项目</el-button>
+        <el-button type="danger" icon="Stop" @click="handleDelete">删除</el-button>
+        <el-button type="success" icon="Check">启用</el-button>
+        <el-button type="info" icon="Download">导入</el-button>
+      </el-col>
+      
+      <!-- 数据表格区域 -->
+      <el-col :span="24">
+        <el-table 
+          v-loading="loading" 
+          :data="dataList" 
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+        >
+        
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column prop="glNo" 
+            label="国临版疾病编码" 
+            key="glNo"
+            :show-overflow-tooltip="true"
+            align="center" 
+            width="180" />
+              
+          <el-table-column prop="glName"
+            label="国临版疾病名称" 
+            key="glName"
+            :show-overflow-tooltip="true"
+            align="center" 
+            min-width="200" />
+            
+          <el-table-column prop="icd10No" 
+            label="医保版疾病编码" 
+            key="icd10No"
+            :show-overflow-tooltip="true"
+            align="center" 
+            width="180" />
+
+          <el-table-column prop="icd10Name" 
+            label="医保版疾病名称" 
+            key="icd10Name"
+            :show-overflow-tooltip="true"
+            align="center" 
+            min-width="200" />
+          <el-table-column label="操作" width="120" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="handleEdit(scope.row)">编辑</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        
+        <!-- 分页控件 -->
+        <el-pagination
+          v-model:current-page="queryParams.pageNum"
+          v-model:page-size="queryParams.pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </el-col>
+    </el-row>
+   
+    <!-- 添加对话框 -->
+    <el-dialog
+      v-model="addDialogVisible"
+      title="添加国临编码"
+      width="600px"
+      :before-close="handleClose"
+    >
+
+      <el-form
+        ref="addFormRef"
+        :model="addFormData"
+        :rules="rules"
+        label-width="120px"
+        size="small"
+      >
+        <el-form-item label="国临版疾病编码" prop="glNo">
+          <el-input v-model="addFormData.glNo" placeholder="请输入国临版疾病编码" clearable />
+        </el-form-item>
+        <el-form-item label="国临版疾病名称" prop="glName">
+          <el-input v-model="addFormData.glName" placeholder="请输入国临版疾病名称" clearable />
+        </el-form-item>
+        <el-form-item label="医保版疾病编码" prop="icd10No">
+          <el-input v-model="addFormData.icd10No" placeholder="请输入医保版疾病编码" clearable />
+        </el-form-item>
+        <el-form-item label="医保版疾病名称" prop="icd10Name">
+          <el-input v-model="addFormData.icd10Name" placeholder="请输入医保版疾病名称" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="handleSubmit">确定</el-button>
+      </template>
+    </el-dialog>
+      <!-- 编辑对话框 -->
+  <el-dialog
+    v-model="editDialogVisible"
+    title="编辑国临编码"
+    width="600px"
+    :before-close="handleEditClose"
+  >
+    <el-form
+      ref="editFormRef"
+      :model="editFormData"
+      :rules="rules"
+      label-width="120px"
+      size="small"
+    >
+      <el-form-item label="国临版疾病编码" prop="glNo">
+        <el-input v-model="editFormData.glNo" placeholder="请输入国临版疾病编码" clearable />
+      </el-form-item>
+      <el-form-item label="国临版疾病名称" prop="glName">
+        <el-input v-model="editFormData.glName" placeholder="请输入国临版疾病名称" clearable />
+      </el-form-item>
+      <el-form-item label="医保版疾病编码" prop="icd10No">
+        <el-input v-model="editFormData.icd10No" placeholder="请输入医保版疾病编码" clearable />
+      </el-form-item>
+      <el-form-item label="医保版疾病名称" prop="icd10Name">
+        <el-input v-model="editFormData.icd10Name" placeholder="请输入医保版疾病名称" clearable />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="handleEditClose">取消</el-button>
+      <el-button type="primary" @click="handleEditSubmit">确定</el-button>
+    </template>
+  </el-dialog>
+
+    
+  </div>
+</template>
+
+<script setup name="NationalCode">
+import { ref, reactive, onMounted } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import request from '@/utils/request';
+const router = useRouter();
+const route = useRoute();
+
+// 页面数据
+const loading = ref(true);
+const dataList = ref([]);
+const total = ref(0);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+
+// 对话框相关
+const addDialogVisible = ref(false);
+const editDialogVisible = ref(false); // 编辑对话框可见性
+const addFormRef = ref(null);
+const editFormRef = ref(null); // 编辑表单引用
+const addFormData = reactive({
+  glNo: '',
+  glName: '',
+  icd10No: '',
+  icd10Name: ''
+});
+// 编辑表单数据
+const editFormData = reactive({
+  id: '',
+  glNo: '',
+  glName: '',
+  icd10No: '',
+  icd10Name: ''
+});
+
+// 表单验证规则
+const rules = {
+  glNo: [
+    { required: true, message: '请输入国临版疾病编码', trigger: 'blur' }
+  ],
+  glName: [
+    { required: true, message: '请输入国临版疾病名称', trigger: 'blur' }
+  ],
+  icd10No: [
+    { required: true, message: '请输入医保版疾病编码', trigger: 'blur' }
+  ],
+  icd10Name: [
+    { required: true, message: '请输入医保版疾病名称', trigger: 'blur' }
+  ]
+};
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  searchKey: undefined
+});
+
+// 查询
+function handleQuery() {
+  queryParams.pageNum = 1;
+  getList();
+}
+
+// 重置
+function resetQuery() {
+  Object.assign(queryParams, {
+    searchKey: undefined,
+    status: undefined,
+    ybFlag: undefined,
+    type: undefined
+  });
+  handleQuery();
+}
+
+// 分页变化
+function handleSizeChange(size) {
+  queryParams.pageSize = size;
+  getList();
+}
+
+function handleCurrentChange(current) {
+  queryParams.pageNum = current;
+  getList();
+}
+function handleDelete() {
+  // 安全检查ids.value是否存在且为数组
+  if (!ids.value || ids.value.length === 0) {
+    ElMessage.warning('请先选择要删除的数据');
+    return;
+  }
+  
+  // 显示确认对话框
+  ElMessageBox.confirm('确定要删除选中的数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    loading.value = true;
+    
+    // 修复：确保ids.value是数组并过滤掉无效值
+    const validIds = Array.isArray(ids.value) ? ids.value.filter(id => id) : [];
+    
+    if (validIds.length === 0) {
+      loading.value = false;
+      ElMessage.warning('没有有效的数据可删除');
+      return;
+    }
+    
+    // 简化删除逻辑，改为单个请求，因为后端可能不支持批量删除
+    // 先删除第一个，后续可以根据需要调整
+    const firstId = validIds[0];
+    
+    request({
+      url: '/base-data-manage/ICD10/delete-icd-Information',
+      method: 'delete',
+      params: { glNo: firstId } // 传递glNo参数
+    }).then(res => {
+      loading.value = false;
+      if (res.code === 200) {
+        ElMessage.success('删除成功');
+        // 刷新列表
+        getList();
+        // 清空选中状态
+        ids.value = [];
+      } else {
+        ElMessage.error(res.msg || '删除失败');
+      }
+    }).catch(error => {
+      loading.value = false;
+      console.error('删除数据失败:', error);
+      ElMessage.error('删除失败，请稍后重试');
+    });
+  }).catch(() => {
+    // 用户取消删除操作
+  });
+}
+
+// 同时修复handleSelectionChange函数，确保正确设置ids
+function handleSelectionChange(selection) {
+  // 确保selection是数组
+  if (Array.isArray(selection)) {
+    ids.value = selection.map(item => {
+      // 尝试使用glNo，如果没有则使用id，确保返回有效的值
+      return item.glNo || item.id || '';
+    }).filter(Boolean); // 过滤掉空值
+    single.value = ids.value.length <= 1;
+    multiple.value = !single.value;
+  } else {
+    // 如果selection不是数组，重置ids
+    ids.value = [];
+    single.value = true;
+    multiple.value = false;
+  }
+}
+
+// 打开添加对话框
+function handleAdd() {
+  // 重置表单
+  addFormRef.value?.resetFields();
+  Object.assign(addFormData, {
+    glNo: '',
+    glName: '',
+    icd10No: '',
+    icd10Name: ''
+  });
+  // 显示对话框
+  addDialogVisible.value = true;
+}
+
+// 关闭对话框
+function handleClose() {
+  addDialogVisible.value = false;
+}
+function handleEdit(row) {
+  // 填充编辑表单数据
+  Object.assign(editFormData, {
+    id: row.id || '',
+    glNo: row.glNo || '',
+    glName: row.glName || '',
+    icd10No: row.icd10No || '',
+    icd10Name: row.icd10Name || ''
+  });
+  // 显示编辑对话框
+  editDialogVisible.value = true;
+}
+
+function handleEditClose() {
+  editDialogVisible.value = false;
+}
+
+function handleEditSubmit() {
+  editFormRef.value?.validate((valid) => {
+    if (valid) {
+      // 移除查重校验，直接进行编辑操作
+      loading.value = true;
+      // 调用后端编辑接口
+      request({
+        url: '/base-data-manage/ICD10/update-icd-Information',
+        method: 'put',
+        data: editFormData
+      }).then(res => {
+        loading.value = false;
+        if (res.code === 200) {
+          console.log('编辑国临编码成功');
+          ElMessage.success('编辑成功');
+          editDialogVisible.value = false;
+          getList();
+        } else {
+          ElMessage.error(res.msg || '编辑失败');
+        }
+      }).catch(error => {
+        loading.value = false;
+        console.error('编辑国临编码失败:', error);
+        ElMessage.error('编辑失败，请稍后重试');
+      });
+    }
+  });
+}
+// 提交表单
+function handleSubmit() {
+  addFormRef.value?.validate((valid) => {
+    if (valid) {
+       
+      // 先进行查重校验
+      checkAddDuplicate().then(isDuplicate => {
+        if (isDuplicate) {
+          ElMessage.warning('该项目已存在，请检查国临编码或医保编码是否重复');
+          return;
+        }
+        
+        loading.value = true;
+        // 调用后端添加接口
+        request({
+          url: '/base-data-manage/ICD10/add-icd-Information',
+          method: 'post',
+          data: addFormData // 直接提交表单数据
+        }).then(res => {
+          loading.value = false;
+          if (res.code === 200) {
+            // 成功提示
+            ElMessage.success('添加成功');
+            // 关闭对话框
+            addDialogVisible.value = false;
+            // 刷新列表
+            getList();
+          } else {
+            // 失败提示
+            ElMessage.error(res.msg || '添加失败');
+          }
+        }).catch(error => {
+          loading.value = false;
+          console.error('添加国临编码失败:', error);
+          ElMessage.error('添加失败，请稍后重试');
+        });
+      }).catch(error => {
+        console.error('查重校验失败:', error);
+        ElMessage.error('校验失败，请稍后重试');
+      });
+    }
+  });
+}
+
+// 查重校验函数
+async function checkAddDuplicate() {
+  try {
+    // 查询现有数据列表
+    const res = await request({
+      url: '/base-data-manage/ICD10/information-page',
+      method: 'get',
+      params: {
+        pageNum: 1,
+        pageSize: 1000, // 查询足够多的数据进行校验
+        searchKey: undefined
+      }
+    });
+    
+    if (res.code === 200 && res.data.records) {
+      // 检查是否存在相同的国临编码或医保编码
+      const isExist = res.data.records.some(item => 
+        item.glNo === addFormData.glNo || item.icd10No === addFormData.icd10No
+      );
+      return isExist;
+    }
+    return false;
+  } catch (error) {
+    console.error('查重校验请求失败:', error);
+    return false;
+  }
+}
+
+// 获取列表数据
+function getList() {
+  loading.value = true;
+  request({
+    url: '/base-data-manage/ICD10/information-page',
+    method: 'get',
+    params: queryParams
+  }).then(res => {
+    loading.value = false;
+    if (res.code === 200) {
+      dataList.value = res.data.records || [];
+      total.value = res.data.total || 0;
+    }
+  }).catch(error => {
+    loading.value = false;
+    console.error('获取国临编码数据失败:', error);
+  });
+}
+
+// 页面初始化
+onMounted(() => {
+  getList();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+.mb20 {
+  margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/charge/clinicRecord/index.vue b/openhis-ui-vue3/src/views/charge/clinicRecord/index.vue
index a9c47d02..9d32038d 100644
--- a/openhis-ui-vue3/src/views/charge/clinicRecord/index.vue
+++ b/openhis-ui-vue3/src/views/charge/clinicRecord/index.vue
@@ -20,6 +20,19 @@
             @keyup.enter="getClinicRecord"
           />
         </el-form-item>
+        <el-form-item label="发票状态：" prop="invoiceStatus">
+          <el-select
+            v-model="queryParams.invoiceStatus"select
+            placeholder="发票状态"
+            clearable
+            style="width: 240px"
+            @keyup.enter="getClinicRecord"
+          >
+          <el-option v-for="item in invoiceStatusList" :key="item.value" :label="item.label"
+                    :value="item.value">
+          </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="结算时间：" prop="activeFlag">
           <el-date-picker
             v-model="occurrenceTime"
@@ -38,6 +51,12 @@
         </div>
       </el-form>
     </div>
+    <div style="float: right; margin: 0 20px 10px 0">
+      <span style="margin-right: 20px">
+        {{ '总数：' + count + '/' + '成功：' + successCount }}
+      </span>
+      <el-button type="primary" :loading="loading" plain @click="handleBatchProcess">批量开具</el-button>
+    </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"/>
@@ -140,10 +159,17 @@ const queryParams = ref({
   billDateSTime:"",
   billDateETime:"",
   searchKey:"",
+  invoiceStatus:1,
   kinsEnum: 1
 });
+const invoiceStatusList = ref([
+    { value: 1, label: '已开具' },
+    { value: 0, label: '未开具' },
+  ]);
 const paymentDetailShow = ref(false)
 const clinicRecord = ref([]);
+const successCount = ref(0);
+const count = ref(0);
 const reasonDialogVisible = ref(false);
 const reasonForm = ref({
   reason: ''
@@ -215,6 +241,49 @@ function handleReset() {
 // function handleEdit(row){
   
 // }
+
+const loading = ref(false)
+async function handleBatchProcess() {
+  // 遍历list并异步执行invoiceReissue方法
+  let list = clinicRecord.value.filter(item =>{
+    return item.statusEnum == 1 && (item.invoiceNo == undefined || item.invoiceNo == null)
+  })
+  loading.value = true
+  count.value = list.length;
+  for (const item of list) {
+    try {
+      const res = await invoiceReissue({
+        paymentId: item.id,
+        encounterId: item.encounterId ? item.encounterId : ""
+      });
+      
+      if (res.data) {
+        // 门诊电子发票开具失败 住院电子发票开具失败 电子发票类型不明确
+        if (
+          res.data.includes(" 挂号电子发票开具失败") ||
+          res.data.includes(" 住院电子发票开具失败") ||
+          res.data.includes(" 门诊电子发票开具失败") ||
+          res.data.includes(" 电子发票类型不明确")
+        ) {
+          // proxy.$message.error(res.data);
+        } else {
+          successCount.value++;
+          // window.open(res.data);
+        }
+      }
+      if (res.code == 200) {
+        // getLists();
+      } else {
+        // proxy.$message.error(res.data);
+      }
+    } catch (err) {
+      console.error(err);
+    }
+  }
+  loading.value = false
+  getLists()
+}
+
 function handleOpen(row,type){
   if(type==1){
     invoiceReissue({paymentId:row.id,encounterId:row.encounterId?row.encounterId:""}).then((res) => {
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js b/openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js
index fd8643f4..7c26a878 100644
--- a/openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/components/api.js
@@ -5,41 +5,62 @@ import request from '@/utils/request'
  */
 export function getList(queryParams) {
     return request({
-      url: '/charge-manage/charge/encounter-patient-page',
-      method: 'get',
-      params: queryParams
+        url: '/charge-manage/charge/encounter-patient-page',
+        method: 'get',
+        params: queryParams
     })
 }
-  
+
 /**
  * 患者处方列表
  */
 export function getChargeList(encounterId) {
     return request({
-      url: '/charge-manage/charge/patient-prescription?encounterId=' + encounterId,
-      method: 'get',
+        url: '/charge-manage/charge/patient-prescription?encounterId=' + encounterId,
+        method: 'get',
     })
 }
-  
-  
+
+
 /**
  * 医保转自费
  */
 export function changeToSelfPay(encounterId) {
     return request({
-      url: '/charge-manage/charge/self-pay?encounterId=' + encounterId,
-      method: 'put',
+        url: '/charge-manage/charge/self-pay?encounterId=' + encounterId,
+        method: 'put',
     })
 }
-  
-  
+
+
 /**
  * 自费转医保
  */
 export function changeToMedicalInsurance(encounterId) {
     return request({
-      url: '/charge-manage/charge/medical-insurance?encounterId=' + encounterId,
-      method: 'put',
+        url: '/charge-manage/charge/medical-insurance?encounterId=' + encounterId,
+        method: 'put',
+    })
+}
+
+/**
+ * 学生医保转学生自费
+ */
+export function changeStudentPayTosStudentSelf(encounterId) {
+    return request({
+        url: '/charge-manage/charge/student-self-pay?encounterId=' + encounterId,
+        method: 'put',
+    })
+}
+
+
+/**
+ * 学生自费转学生医保
+ */
+export function changeStudentSelfToStudentPay(encounterId) {
+    return request({
+        url: '/charge-manage/charge/student-yb-pay?encounterId=' + encounterId,
+        method: 'put',
     })
 }
 
@@ -48,9 +69,9 @@ export function changeToMedicalInsurance(encounterId) {
  */
 export function savePayment(data) {
     return request({
-      url: '/payment/payment/charge',
-      method: 'post',
-      data: data
+        url: '/payment/payment/charge',
+        method: 'post',
+        data: data
     })
 }
 
@@ -59,8 +80,8 @@ export function savePayment(data) {
  */
 export function init() {
     return request({
-      url: '/charge-manage/charge/init',
-      method: 'get',
+        url: '/charge-manage/charge/init',
+        method: 'get',
     })
 }
 
@@ -69,9 +90,9 @@ export function init() {
  */
 export function precharge(data) {
     return request({
-      url: '/payment/payment/precharge',
-      method: 'post',
-      data: data
+        url: '/payment/payment/precharge',
+        method: 'post',
+        data: data
     })
 }
 
@@ -80,21 +101,32 @@ export function precharge(data) {
  */
 export function unprecharge(data) {
     return request({
-      url: '/payment/payment/unprecharge',
-      method: 'post',
-      params: data
+        url: '/payment/payment/unprecharge',
+        method: 'post',
+        params: data
     })
 }
-  
+
 
 /**
  * 发耗材
  */
 export function dispenseMedicalConsumables(data) {
     return request({
-      url: '/pharmacy-manage/device-dispense/consumables-dispense',
-      method: 'put',
-      data: data
+        url: '/pharmacy-manage/device-dispense/consumables-dispense',
+        method: 'put',
+        data: data
     })
 }
-  
\ No newline at end of file
+
+
+/**
+ * 补打小票
+ */
+export function getChargeInfo(param) {
+    return request({
+        url: '/payment/bill/getDetail',
+        method: 'get',
+        params: param
+    })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue b/openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
index 1a88be60..cba8a544 100644
--- a/openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/components/chargeDialog.vue
@@ -5,6 +5,7 @@
     width="700px"
     append-to-body
     destroy-on-close
+    @open="handleOpen"
     @close="close"
   >
     <div v-loading="dialogLoading">
@@ -18,47 +19,55 @@
           {{ props.totalAmount.toFixed(2) + ' 元' }}
         </el-text>
       </div>
+      <div class="amount-row">
+        <el-text size="large">折扣金额：</el-text>
+        <el-text size="large" type="warning" class="amount">
+          {{ discountAmount.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)"
+        <template v-for="(item, index) in formData.selfPay" :key="index">
+          <div v-show="item.payEnum != 220500" 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"
             />
-          </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>
+        </template>
         <div class="add-payment">
           <el-button
             type="primary"
@@ -72,6 +81,18 @@
             金额已满足应收，不可继续添加
           </el-text>
         </div>
+        <div style="margin-top: 10px" v-if="userStore.hospitalName == '同一医院'">
+          <span>折扣：</span>
+          <el-radio-group v-model="discountRadio" @change="handleDiscountChange">
+            <el-radio-button
+              v-for="item in charge_discount"
+              :key="item.value"
+              link
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-radio-group>
+        </div>
       </div>
       <div>
         <el-table :data="props.details" max-height="200" border>
@@ -105,10 +126,10 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="throttledGetList" :disabled="dialogLoading"
-          >确 定</el-button
-        >
-        <el-button type="primary" @click="print()" :disabled="dialogLoading">打 印</el-button>
+        <el-button type="primary" @click="throttledGetList" :disabled="dialogLoading">
+          确 定
+        </el-button>
+        <!-- <el-button type="primary" @click="print()" :disabled="dialogLoading">打 印</el-button> -->
         <el-button @click="close" :disabled="dialogLoading">取 消</el-button>
       </div>
     </template>
@@ -116,7 +137,7 @@
 </template>
 
 <script setup>
-import { savePayment, unprecharge, dispenseMedicalConsumables } from './api';
+import { savePayment, unprecharge, dispenseMedicalConsumables, getChargeInfo } from './api';
 import { computed, watch, reactive, ref, getCurrentInstance, nextTick } from 'vue';
 import { Delete } from '@element-plus/icons-vue';
 import { debounce } from 'lodash-es';
@@ -170,7 +191,11 @@ const props = defineProps({
 
 const { proxy } = getCurrentInstance();
 
+const { charge_discount } = proxy.useDict('charge_discount');
+
 const userStore = useUserStore();
+const discountRadio = ref(undefined);
+const discountAmount = ref(0);
 
 const formData = reactive({
   totalAmount: 0,
@@ -186,97 +211,105 @@ 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');
+let displayAmountTemp = 0;
 
+// 打印小票
+function printReceipt(param) {
+  let total = 0;
+  props.chargedItems.forEach((item) => {
+    total += item.totalPrice || 0;
+  });
   // 构造一个新的对象，添加头 "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_FUND_PAY:
+          param.detail?.find((t) => t.payEnum === 100000)?.amount.toFixed(2) + ' 元' ?? 0, // 基金支付总额
+        SELF_PAY: param.detail?.find((t) => t.payEnum === 200000)?.amount.toFixed(2) + ' 元' ?? 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_FUND_AMOUNT:
+          param.detail?.find((t) => t.payEnum === 110000)?.amount.toFixed(2) + ' 元' ?? 0, // 基本医保统筹基金支出
+        YB_BC_FUND_AMOUNT:
+          param.detail?.find((t) => t.payEnum === 120000)?.amount.toFixed(2) + ' 元' ?? 0, // 补充医疗保险基金支出
+        YB_JZ_FUND_AMOUNT:
+          param.detail?.find((t) => t.payEnum === 130000)?.amount.toFixed(2) + ' 元' ?? 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_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, // 公务员医疗补助
+        // 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, // 医院负担金额
+        // 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, // 余额
+        FULAMT_OWNPAY_AMT:
+          param.detail?.find((t) => t.payEnum === 1)?.amount.toFixed(2) + ' 元' ?? 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.toFixed(2) + ' 元' ?? 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_YB_ZH_PAY:
+          param.detail?.find((t) => t.payEnum === 210000)?.amount.toFixed(2) + ' 元' ?? 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, // 个人现金支付金额(银联)
+        // 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, // 保健预支基金
+        // 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 + '门诊收费明细',
-
         name: props.patientInfo.patientName, // 姓名
         gender: props.patientInfo.genderEnum_enumText, // 性别
         age: props.patientInfo.age, // 年龄
@@ -284,85 +317,59 @@ async function printReceipt(param) {
         currentDate: currentDate.value, // 收费日期
         chargedItems: props.chargedItems, // 收费项目
         totalAmount: props.totalAmount.toFixed(2) + ' 元', // 应收金额
-        displayAmount: displayAmount.value + ' 元', // 实收金额
+        itemTotalAmount: total.toFixed(2) + ' 元', // 应收金额
+        displayAmount: displayAmountTemp + ' 元', // 实收金额
         returnedAmount: returnedAmount.value + ' 元', // 应找零
+        userName: userStore.nickName,
       },
     ],
-    // feeDetial: param.detail, //收费项目，后端还未返回
   };
-
-  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], {
+    printer: 'xp',
     title: '门诊收费结算单',
   });
-  // // 将对象转换为 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);
 
+function handleOpen() {
+  formData.totalAmount = props.totalAmount;
+  formData.selfPay[0].amount = props.totalAmount;
+}
+
 async function submit() {
+  displayAmountTemp = displayAmount.value;
   console.log(parseFloat(displayAmount.value), 'parseFloat(displayAmount.value)');
   console.log(formData.totalAmount, 'formData.totalAmount');
 
-  if (parseFloat(displayAmount.value) < formData.totalAmount.toFixed(2)) {
+  let amount = formData.selfPay
+    .reduce((sum, item) => {
+      return sum + (Number(item.amount) || 0);
+    }, 0)
+    .toFixed(2);
+  if (parseFloat(amount) < 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({
-    // paymentEnum: 0,
-    // kindEnum: 1,
-    // patientId: props.patientInfo.patientId,
-    // chrgBchnoList: props.chrgBchnoList,
     chargeItemIds: props.chargeItemIds,
     encounterId: props.patientInfo.encounterId,
     id: props.paymentId,
     paymentDetails: formData.selfPay,
     ybMdtrtCertType: props.userCardInfo.psnCertType,
     busiCardInfo: props.userCardInfo.busiCardInfo,
-    // returnedAmount: parseFloat(returnedAmount.value),
   })
     .then((res) => {
       if (res.code == 200) {
-        printReceipt(res.data);
-        (formData.selfPay = [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }]),
-          emit('close', 'success', res.msg);
+        getChargeInfo({ paymentId: props.paymentId }).then((res) => {
+          printReceipt(res.data);
+        });
+        formData.selfPay = [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }];
+        emit('close', 'success', res.msg);
         emit('refresh'); // 发送刷新事件给父组件
         // 长春大学自动发耗材
         if (userStore.fixmedinsCode == 'H22010200672' && props.consumablesIdList.length > 0) {
@@ -419,6 +426,7 @@ const selfPayMethods = [
   { label: '微信', value: 220100 },
   { label: '支付宝', value: 220200 },
   { label: '银联', value: 220300 },
+  { label: '优惠', value: 220500 },
 ];
 
 // 计算剩余可输入金额
@@ -440,6 +448,16 @@ const getMax = (index) => {
   return formData.totalAmount - otherSum;
 };
 
+// 折扣计算
+function handleDiscountChange(value) {
+  let amount = props.totalAmount * Number(value);
+  discountAmount.value = props.totalAmount - amount;
+  formData.selfPay = [
+    { payEnum: 220100, amount: amount, payLevelEnum: 2 },
+    { payEnum: 220500, amount: discountAmount.value, payLevelEnum: 2 },
+  ];
+}
+
 // 检查支付方式是否已使用
 const isMethodDisabled = (payEnum) => {
   return formData.selfPay.some((item) => item.payEnum === payEnum);
@@ -466,9 +484,15 @@ const clearAmount = (index) => {
 
 // 计算属性
 const displayAmount = computed(() => {
-  return formData.selfPay.reduce((sum, item) => sum + (Number(item.amount) || 0), 0).toFixed(2);
+  return formData.selfPay
+    .reduce((sum, item) => {
+      if (item.payEnum !== 220500) {
+        return sum + (Number(item.amount) || 0);
+      }
+      return sum;
+    }, 0)
+    .toFixed(2);
 });
-
 const returnedAmount = computed(() => {
   const display = parseFloat(displayAmount.value);
   if (isNaN(display) || display <= 0) {
@@ -486,8 +510,23 @@ function close() {
   //     proxy.$modal.msgError(res.message);
   //   }
   // });
+  formData.totalAmount = 0;
+  formData.selfPay = [{ payEnum: 220100, amount: 0.0, payLevelEnum: 2 }];
+  formData.medicalInsurance = {
+    account: '',
+    poolPay: 0,
+    personalPay: 0,
+  };
+
+  // 重置折扣相关状态
+  discountRadio.value = undefined;
+  discountAmount.value = 0;
   emit('close');
 }
+
+defineExpose({
+  printReceipt,
+});
 </script>
 
 <style scoped>
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/components/template.json b/openhis-ui-vue3/src/views/charge/cliniccharge/components/template.json
index 68e3370d..44e541c0 100644
--- a/openhis-ui-vue3/src/views/charge/cliniccharge/components/template.json
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/components/template.json
@@ -6,8 +6,11 @@
       "paperType": "自定义",
       "height": 160,
       "width": 80,
+      "paperHeader": 0,
+      "paperFooter": 450.7086614173229,
       "paperNumberDisabled": true,
       "paperNumberContinue": true,
+      "expandCss": "",
       "overPrintOptions": {
         "content": "",
         "opacity": 0.7,
@@ -28,8 +31,6 @@
         "layoutRowGap": 0,
         "layoutColumnGap": 0
       },
-      "paperHeader": 0,
-      "paperFooter": 841.8897637795277,
       "printElements": [
         {
           "options": {
@@ -258,10 +259,10 @@
         },
         {
           "options": {
-            "left": 138,
+            "left": 99,
             "top": 147,
-            "height": 9.75,
-            "width": 84,
+            "height": 15,
+            "width": 123,
             "title": "合计金额",
             "field": "itemTotalAmount",
             "coordinateSync": false,
@@ -278,7 +279,7 @@
             "left": 6,
             "top": 171,
             "height": 14,
-            "width": 88.5,
+            "width": 108,
             "title": "应收金额",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -292,10 +293,10 @@
         },
         {
           "options": {
-            "left": 132,
+            "left": 124.5,
             "top": 171,
             "height": 14,
-            "width": 88.5,
+            "width": 97.5,
             "title": "实收金额",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -310,9 +311,43 @@
         {
           "options": {
             "left": 6,
-            "top": 190.5,
+            "top": 193.5,
             "height": 14,
-            "width": 117,
+            "width": 108,
+            "title": "全自费金额",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "field": "FULAMT_OWNPAY_AMT"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 124.5,
+            "top": 193.5,
+            "height": 13.5,
+            "width": 97.5,
+            "title": "医保政策金额",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "field": "INSCP_SCP_AMT"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 6,
+            "top": 216,
+            "height": 14,
+            "width": 108,
             "title": "基金支付",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -326,10 +361,10 @@
         },
         {
           "options": {
-            "left": 132,
-            "top": 190.5,
+            "left": 124.5,
+            "top": 216,
             "height": 13.5,
-            "width": 88.5,
+            "width": 97.5,
             "title": "统筹支付",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -344,9 +379,9 @@
         {
           "options": {
             "left": 6,
-            "top": 211.5,
+            "top": 240,
             "height": 14,
-            "width": 117,
+            "width": 216,
             "title": "个人医保账户支付",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -361,43 +396,9 @@
         {
           "options": {
             "left": 6,
-            "top": 235.5,
+            "top": 268.5,
             "height": 14,
-            "width": 115.5,
-            "title": "全自费金额",
-            "coordinateSync": false,
-            "widthHeightSync": false,
-            "qrCodeLevel": 0,
-            "field": "FULAMT_OWNPAY_AMT"
-          },
-          "printElementType": {
-            "title": "文本",
-            "type": "text"
-          }
-        },
-        {
-          "options": {
-            "left": 133.5,
-            "top": 235.5,
-            "height": 14,
-            "width": 87,
-            "title": "应找零",
-            "coordinateSync": false,
-            "widthHeightSync": false,
-            "qrCodeLevel": 0,
-            "field": "returnedAmount"
-          },
-          "printElementType": {
-            "title": "文本",
-            "type": "text"
-          }
-        },
-        {
-          "options": {
-            "left": 6,
-            "top": 256.5,
-            "height": 14,
-            "width": 100,
+            "width": 106.5,
             "title": "收费员",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -412,9 +413,9 @@
         {
           "options": {
             "left": 6,
-            "top": 277.5,
+            "top": 294,
             "height": 14,
-            "width": 170,
+            "width": 214.5,
             "title": "收费时间",
             "coordinateSync": false,
             "widthHeightSync": false,
diff --git a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
index 594b96b5..1a15b34a 100644
--- a/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
+++ b/openhis-ui-vue3/src/views/charge/cliniccharge/index.vue
@@ -1,63 +1,31 @@
 <template>
-  <div
-    style="display: flex; justify-content: space-between"
-    class="app-container"
-    v-loading="readCardLoading"
-    :element-loading-text="loadingText"
-  >
+  <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"
-        >
+        <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 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"
-            @change="getPatientList"
-          />
+          <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" @change="getPatientList" />
           <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 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">
@@ -80,12 +48,12 @@
             {{ patientInfo.genderEnum_enumText }}
           </el-descriptions-item>
           <el-descriptions-item label="年龄:">{{ patientInfo.age }}</el-descriptions-item>
-          <el-descriptions-item label="科室:">{{
-            patientInfo.organizationName
-          }}</el-descriptions-item>
-          <el-descriptions-item label="就诊时间:">{{
-            formatDateStr(patientInfo.receptionTime, 'YYYY-MM-DD HH:mm:ss')
-          }}</el-descriptions-item>
+          <el-descriptions-item label="科室:">
+            {{ patientInfo.organizationName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="就诊时间:">
+            {{ formatDateStr(patientInfo.receptionTime, 'YYYY-MM-DD HH:mm:ss') }}
+          </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> -->
@@ -102,47 +70,31 @@
           <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 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 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 type="primary" @click="patToMedicalInsurance()" style="margin-left: 20px"
+            :disabled="buttonDisabled">
             自费转医保
           </el-button>
-          <span style="float: right"
-            >合计金额：{{ totalAmounts ? totalAmounts.toFixed(2) : 0 }}元</span
-          >
+          <el-button type="primary" @click="studentPayTosStudentSelf()" style="margin-left: 20px"
+            :disabled="buttonDisabled">
+            学生医保转学生自费
+          </el-button>
+          <el-button type="primary" @click="studentSelfToStudentPay()" 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 ref="chargeListRef" height="530" :data="chargeList" row-key="id"
+          @selection-change="handleSelectionChange" v-loading="chargeLoading" :span-method="objectSpanMethod" 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" />
@@ -152,10 +104,7 @@
           <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
-              >
+              <el-tag :type="scope.row.statusEnum === 1 ? 'default' : 'success'" disable-transitions>
                 {{ scope.row.statusEnum_enumText }}
               </el-tag>
             </template>
@@ -166,9 +115,17 @@
             </template>
           </el-table-column>
           <el-table-column label="收款人" align="center" prop="entererId_dictText" />
+          <el-table-column label="操作" align="center" fixed="right" header-align="center" class-name="no-hover-column">
+            <template #default="scope">
+              <el-button :disabled="!scope.row.paymentId" link type="primary" @click="printCharge(scope.row)">
+                打印
+              </el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </el-card>
     </div>
+
     <ChargeDialog
       :open="openDialog"
       @close="handleClose"
@@ -197,11 +154,15 @@ import {
   changeToMedicalInsurance,
   init,
   precharge,
+  getChargeInfo,
+  changeStudentPayTosStudentSelf,
+  changeStudentSelfToStudentPay,
 } from './components/api';
 import { invokeYbPlugin } from '@/api/public';
 import ChargeDialog from './components/chargeDialog.vue';
 import { formatDateStr } from '@/utils';
 import useUserStore from '@/store/modules/user';
+import Decimal from 'decimal.js';
 
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
@@ -241,6 +202,20 @@ watch(
   (newVlaue) => {
     if (newVlaue && newVlaue.length > 0) {
       handleTotalAmount();
+    } else {
+      totalAmounts.value = 0;
+    }
+  },
+  { immediate: true }
+);
+
+watch(
+  () => chargeList.value,
+  (newVlaue) => {
+    if (newVlaue && newVlaue.length > 0) {
+      handleTotalAmount();
+    } else {
+      totalAmounts.value = 0;
     }
   },
   { immediate: true }
@@ -249,9 +224,16 @@ function handleSelectionChange(selection) {
   selectedRows.value = selection;
 }
 function handleTotalAmount() {
-  totalAmounts.value = selectedRows.value.reduce((accumulator, currentRow) => {
-    return accumulator + (Number(currentRow.totalPrice) || 0);
-  }, 0);
+  if (selectedRows.value.length == 0) {
+    totalAmounts.value = chargeList.value.reduce((accumulator, currentRow) => {
+      return new Decimal(accumulator).add(currentRow.totalPrice.toFixed(2) || 0);
+    }, new Decimal(0));
+
+  } else {
+    totalAmounts.value = selectedRows.value.reduce((accumulator, currentRow) => {
+      return new Decimal(accumulator).add(currentRow.totalPrice.toFixed(2) || 0);
+    }, 0);
+  }
 }
 getPatientList();
 initOption();
@@ -346,7 +328,9 @@ function confirmCharge() {
       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;
+      details.value = res.data.details.filter((item) => {
+        return item.amount > 0;
+      });
       openDialog.value = true;
     } else {
       proxy.$modal.msgError(res.msg);
@@ -502,6 +486,8 @@ async function handleReadCard(value) {
           chargeItemIdList.value = selectRows.map((item) => {
             return item.id;
           });
+          // 打印项目赋值
+          chargedItems.value = selectRows;
           consumablesIdList.value = selectRows
             .filter((item) => {
               return item.serviceTable == 'wor_device_request';
@@ -543,5 +529,80 @@ function patToMedicalInsurance() {
     }
   });
 }
+
+/**
+ * 学生医保转学生自费
+ */
+function studentPayTosStudentSelf() {
+  changeStudentPayTosStudentSelf(encounterId.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+    }
+  });
+}
+
+/**
+ * 学生自费转学生医保
+ */
+function studentSelfToStudentPay() {
+  changeStudentSelfToStudentPay(encounterId.value).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+    }
+  });
+}
+
+// 添加行合并方法
+function objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+  // 只对操作列进行合并（根据列索引判断，操作列为最后一列）
+  if (columnIndex === 10) {
+    // 操作列索引为10（从0开始计数）
+    // 如果当前行的paymentId为空，则不合并
+    if (!row.paymentId) {
+      return [1, 1];
+    }
+
+    // 查找相同paymentId的连续行
+    let spanCount = 1;
+    if (rowIndex === 0 || chargeList.value[rowIndex - 1].paymentId !== row.paymentId) {
+      // 这是具有相同paymentId的第一行，计算需要合并的行数
+      for (let i = rowIndex + 1; i < chargeList.value.length; i++) {
+        if (chargeList.value[i].paymentId === row.paymentId) {
+          spanCount++;
+        } else {
+          break;
+        }
+      }
+      return [spanCount, 1];
+    } else {
+      // 这不是具有相同paymentId的第一行，返回0表示不显示
+      return [0, 0];
+    }
+  }
+  // 其他列不合并
+  return [1, 1];
+}
+
+function printCharge(row) {
+  // 打印功能实现
+  let rows = [];
+  chargeList.value.forEach((item, index) => {
+    if (item.paymentId === row.paymentId) {
+      rows.push(item);
+    }
+  });
+  chargedItems.value = rows;
+  getChargeInfo({ paymentId: row.paymentId }).then((res) => {
+    proxy.$refs['chargeDialogRef'].printReceipt(res.data);
+  });
+}
 </script>
-<style scoped></style>
+<style scoped>
+:deep(.no-hover-column) .cell:hover {
+  background-color: transparent !important;
+}
+
+:deep(.el-table__body) tr:hover td.no-hover-column {
+  background-color: inherit !important;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue b/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
index 5420c66d..d3eeb751 100644
--- a/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
+++ b/openhis-ui-vue3/src/views/charge/clinicrefund/index.vue
@@ -322,9 +322,13 @@ function handleRefund(row) {
   //   }, 0);
   getReturnDetail({ id: row.paymentId }).then((res) => {
     if (res.data.length > 0) {
-      totalAmount.value = res.data.find((item) => item.payEnum === 220000).amount;
+      totalAmount.value =
+        res.data.find((item) => item.payEnum === 220000).amount -
+        (res.data.find((item) => item.payEnum === 220500)?.amount || 0);
     }
-    details.value = res.data;
+    details.value = res.data.filter((item) => {
+      return item.amount > 0;
+    });
   });
   paymentId.value = row.paymentId;
   patientInfo.value.patientId = row.patientId;
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
index 6db9e65d..73d57792 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -350,6 +350,7 @@
 </template>
 
 <script setup name="PatientAddDialog">
+import { watch } from 'vue';
 import { watch, defineProps } from "vue";
 import pcas from 'china-division/dist/pcas-code.json';
 import { addPatient, patientlLists, getOutpatientRegistrationList } from './outpatientregistration';
@@ -711,22 +712,22 @@ watch(
       const birthYear = parseInt(newIdCard.substring(6, 10));
       const birthMonth = parseInt(newIdCard.substring(10, 12));
       const birthDay = parseInt(newIdCard.substring(12, 14));
+
        // 设置出生日期
       form.value.birthDate = `${birthYear}-${birthMonth.toString().padStart(2, '0')}-${birthDay.toString().padStart(2, '0')}`;
       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)
-      ) {
+      if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
         age--;
       }
+
+      form.value.age = age;
       
       form.value.age = age ;
     }
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 69c3113b..65de51a1 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -239,6 +239,12 @@
                     highlight-current
                     default-expand-all
                     @node-click="handleNodeClick"
+                    @change="
+                      () => {
+                        form.serviceTypeId = undefined;
+                        setchargeItem;
+                      }
+                    "
                     @clear="handleOrgClear"
                     clearable
                   />
@@ -414,6 +420,7 @@
               key="genderEnum_enumText"
               prop="genderEnum_enumText"
             />
+            <el-table-column label="联系电话" align="center" key="phone" prop="phone" />
             <el-table-column
               label="科室名称"
               align="center"
@@ -758,6 +765,8 @@ const patientInfoList = ref(undefined);
 // 费用性质
 const contractList = ref(undefined);
 // const locationOptions = ref(undefined); // 地点树选项
+const doctorList = ref(undefined); // 医生选项
+const healthcareList = ref([]); // 挂号项目选项
 const doctorList = ref(undefined); // 医生选项（过滤后的）
 const allDoctorList = ref(undefined); // 所有医生选项（用于过滤）
 const healthcareList = ref(undefined); // 挂号项目选项
@@ -1068,15 +1077,17 @@ function setInfo() {
 
 // 设定费用项管理表单
 function setchargeItem() {
-  const healthcareData = healthcareList.value.filter(
-    (healthcare) => healthcare.id === form.value.serviceTypeId
-  );
-  form.value.locationId_dictText = healthcareData.length > 0 ? healthcareData[0].name : '';
-  form.value.price = healthcareData.length > 0 ? healthcareData[0].price : '';
-  form.value.activityPrice = healthcareData.length > 0 ? healthcareData[0].activityPrice : '';
-  form.value.totalPrice =
-    healthcareData.length > 0 ? healthcareData[0].price + healthcareData[0].activityPrice : '';
-  form.value.definitionId = healthcareData.length > 0 ? healthcareData[0].definitionId : '';
+  if (healthcareList.value.length > 0) {
+    const healthcareData = healthcareList.value.filter(
+      (healthcare) => healthcare.id === form.value.serviceTypeId
+    );
+    form.value.locationId_dictText = healthcareData.length > 0 ? healthcareData[0].name : '';
+    form.value.price = healthcareData.length > 0 ? healthcareData[0].price : '';
+    form.value.activityPrice = healthcareData.length > 0 ? healthcareData[0].activityPrice : '';
+    form.value.totalPrice =
+      healthcareData.length > 0 ? healthcareData[0].price + healthcareData[0].activityPrice : '';
+    form.value.definitionId = healthcareData.length > 0 ? healthcareData[0].definitionId : '';
+  }
 }
 
 /** 处理挂号类型变化 */
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
index e85a8be1..9fa66f7f 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
@@ -300,16 +300,16 @@ function handleCardClick(item, index) {
     }
   }
 }
-::v-deep .el-tabs__header {
+:deep(.el-tabs__header) {
   padding: 0;
   position: relative;
   margin: 0 0 5px !important;
 }
 
-::v-deep .el-drawer__header {
+:deep(.el-drawer__header) {
   margin-bottom: 15px !important;
 }
-::v-deep .el-drawer__body {
+:deep(.el-drawer__body) {
   padding: 10px !important;
 }
 .el-badge {
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
index 3e01fed9..1ec5fd03 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
@@ -108,7 +108,7 @@
             "top": 58.5,
             "height": 13.5,
             "width": 145.5,
-            "title": "机构名称：医院",
+            "title": "机构名称：长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 9,
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
index 9a51a192..2a0df0c3 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
@@ -357,7 +357,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-        fixmedinsName: '医院',
+        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)
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
index 597a2b7e..b38e213d 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
@@ -92,7 +92,7 @@
         </el-col>
         <el-col :span="5">
           <span class="label">机构：</span>
-          <span class="value">{{ '医院' }}</span>
+          <span class="value">{{ userStore.hospitalName }}</span>
         </el-col>
         <el-col :span="7">
           <span class="label">时间：</span>
@@ -449,7 +449,7 @@ async function print() {
         ...reportValue.value, // 将 reportValue.value 中的所有属性展开到 result 中
         nickName: userStore.nickName,
         orgName: userStore.orgName,
-        fixmedinsName: '医院',
+        fixmedinsName:  userStore.hospitalName,
         createTime: formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss'),
         scheduler: userStore.nickName,
         timeRange: queryTime.value[0] + '~' + queryTime.value[1],
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
index dede1c9a..eadd5fa3 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
@@ -1,92 +1,94 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 /**
  * 获取患者列表
  */
-export function getList(queryParams) {
-  return request({
+export function getList (queryParams) {
+  return request ({
     url: '/outpatient-manage/treatment/encounter-list',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
 /**
  * 诊疗列表
  */
-export function getDisposalList(encounterId) {
-  return request({
-    url: '/outpatient-manage/treatment/treatment-list?encounterId=' + encounterId,
+export function getDisposalList (encounterId, serviceCategory) {
+  return request ({
+    url: '/outpatient-manage/treatment/treatment-list?encounterId=' +
+      encounterId +
+      (serviceCategory ? '&serviceCategory=' + serviceCategory : ''),
     method: 'get',
-  })
+  });
 }
 
 /**
  * 执行列表
  */
-export function getExecuteList(queryParams) {
-  return request({
+export function getExecuteList (queryParams) {
+  return request ({
     url: '/outpatient-manage/treatment/execute-list',
     method: 'get',
-    params: queryParams
-  })
+    params: queryParams,
+  });
 }
 
 /**
  * 初始化
  */
-export function init() {
-  return request({
+export function init () {
+  return request ({
     url: '/outpatient-manage/treatment/init',
     method: 'get',
-  })
+  });
 }
 
 /**
  * 执行
  */
-export function execute(data) {
-  return request({
+export function execute (data) {
+  return request ({
     url: '/outpatient-manage/treatment/perform',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 
 /**
  * 取消
  */
-export function cancel(data) {
-  return request({
+export function cancel (data) {
+  return request ({
     url: '/outpatient-manage/treatment/cancel-perform',
     method: 'put',
-    data: data
-  })
+    data: data,
+  });
 }
 
 /**
  * 获取执行记录
  */
-export function getPerformRecord(params) {
-  return request({
+export function getPerformRecord (params) {
+  return request ({
     url: '/outpatient-manage/treatment/perform-record',
     method: 'get',
-    params: params
-  })
+    params: params,
+  });
 }
 
-export function listWesternmedicine(query) {
-  return request({
+export function listWesternmedicine (query) {
+  return request ({
     url: '/pharmacy-manage/western-medicine-dispense/prescription-list',
     method: 'get',
-    params: query
-  })
+    params: query,
+  });
 }
 
-export function printBloodCode(query) {
-  return request({
+export function printBloodCode (query) {
+  return request ({
     url: '/outpatient-manage/treatment/blood-transfusion-patch',
     method: 'get',
-    params: query
-  })
-}
\ No newline at end of file
+    params: query,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
index 26073e53..55caac8a 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
@@ -33,7 +33,7 @@
             "top": 22.5,
             "height": 12,
             "width": 88.5,
-            "title": "医院",
+            "title": "长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 13.5,
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
index 7f794061..8affbd0b 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
@@ -1,25 +1,17 @@
 <template>
   <el-dialog
     title="执行记录"
-    v-model="props.open"
+    :model-value="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 :data="recordList" highlight-current-row max-height="650" style="width: 100%" border>
+      <el-table-column prop="occurrenceTime" label="执行时间" align="center" />
       <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-column prop="orgName" label="执行科室" align="center" />
+      <el-table-column prop="practitionerName" label="执行人" align="center" />
     </el-table>
     <template #footer>
       <div class="dialog-footer">
@@ -36,7 +28,7 @@ const props = defineProps({
     default: false,
   },
   recordList: {
-    type: [],
+    type: Array,
   },
 });
 const emit = defineEmits(['close']);
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
index 46065fed..a39b0359 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
@@ -37,7 +37,7 @@
             "top": 16.5,
             "height": 22.5,
             "width": 120,
-            "title": "医院",
+            "title": "长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontFamily": "Microsoft YaHei",
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
index 04cd62ab..e403076f 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
@@ -1,222 +1,311 @@
 <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="queryParams.searchKey"
-            style="width: 45%; margin-bottom: 10px"
-            placeholder="搜索患者"
-            clearable
-            class="search-input"
-            @keydown.enter="getPatientList"
-          >
-            <template #append>
-              <el-button icon="Search" @click="getPatientList" />
-            </template>
-          </el-input>
-          <el-date-picker
-            v-model="receptionTime"
-            @change="getPatientList"
-            type="daterange"
-            style="width: 55%; margin-bottom: 10px"
-            placeholder="挂号时间"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-          />
-        </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="printBloodBarcode()">打印采血条码</el-button>
-              <el-button type="primary" plain @click="printPrescription()">打印处方</el-button>
-              <el-button type="primary" plain @click="printDisposal()">打印处置单</el-button>
-            </div>
-          </div>
-          <el-table
-            :data="activityList"
-            ref="activityListRef"
-            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"
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="6">
+        <el-card>
+          <template #header>患者信息</template>
+          <el-row :gutter="10">
+            <el-col :span="10" :xs="24" :sm="10" :md="10">
+              <el-input
+                v-model="queryParams.searchKey"
+                placeholder="搜索患者"
+                clearable
+                class="search-input"
+                style="width: 100%"
+                @keydown.enter="getPatientList"
+              >
+                <template #append>
+                  <el-button icon="Search" @click="getPatientList" />
+                </template>
+              </el-input>
+            </el-col>
+            <el-col :span="14" :xs="24" :sm="14" :md="14">
+              <el-date-picker
+                v-model="receptionTime"
+                @change="getPatientList"
+                type="daterange"
+                placeholder="挂号时间"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                style="width: 100%"
+              />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" :xs="24">
+              <el-table
+                :data="patientList"
+                highlight-current-row
+                @row-click="handlePatientSelect"
+                style="width: 100%; height: calc(100vh - 300px)"
+                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" />
+                <el-table-column prop="age" label="年龄" align="center" />
+              </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"
+              />
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="18">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="24" :md="12" class="mb8">
+            <el-button
+              type="primary"
+              plain
+              icon="Printer"
+              @click="printBottleLabel()"
+              :disabled="isCurrentPatient"
             >
-              <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">
-              <template #default="scope">
-                {{ scope.row.quantity + ' ' + scope.row.unitCode_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"
+              打印瓶签
+            </el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Printer"
+              @click="printBloodBarcode()"
+              :disabled="isCurrentPatient"
             >
-              <template #default="scope">
-                <span>
+              打印采血条码
+            </el-button>
+            <el-button
+              type="primary"
+              plain
+              icon="Printer"
+              @click="printPrescription()"
+              :disabled="isCurrentPatient"
+            >
+              打印处方
+            </el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Printer"
+              @click="printDisposal()"
+              :disabled="isCurrentPatient"
+            >
+              打印处置单
+            </el-button>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="6">
+            <el-form
+              ref="queryRef"
+              :model="queryParams"
+              inline-style="width: 100%"
+              label-width="150px"
+              :rules="rules"
+            >
+              <el-form-item label="处置类型" prop="serviceCategory" label-width="100px">
+                <el-select
+                  v-model="queryParams.serviceCategory"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                  @change="handleServiceCategoryChange"
+                  :disabled="isCurrentPatient"
+                >
+                  <el-option
+                    v-for="item in activityCategoryList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="6" class="mb8">
+            <el-button
+              type="primary"
+              icon="Check"
+              @click="handleBatchExecute()"
+              :disabled="isMultiple"
+            >
+              批量执行
+            </el-button>
+            <el-button
+              type="danger"
+              icon="Delete"
+              @click="handleBatchCancel()"
+              :disabled="isMultiple"
+            >
+              批量取消
+            </el-button>
+          </el-col>
+        </el-row>
+        <div class="cards-column">
+          <el-card class="half-card">
+            <template #header>处置项目</template>
+            <el-table
+              :data="activityList"
+              ref="activityListRef"
+              style="width: 100%; height: 100%"
+              border
+              v-loading="loading"
+              :span-method="operationSpanMethod"
+              @select="handleSelectionChange"
+            >
+              <el-table-column type="selection" align="center" width="50" />
+              <el-table-column label="组" align="center" width="40" prop="groupIcon" />
+              <!-- <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="serviceStatus_enumText"
+                label="状态"
+                width="100"
+              >
+                <template #default="{ row }">
+                  <el-tag type="primary" size="small">
+                    {{
+                      row.serviceStatus_enumText
+                        ? row.serviceStatus_enumText
+                        : row.chargeStatus_enumText
+                    }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="center"
+                prop="serviceCategory_dictText"
+                label="项目类型"
+                width="80"
+              >
+                <template #default="scope">
                   {{
-                    scope.row.unitPrice ? scope.row.unitPrice.toFixed(2) + ' 元' : '0.00' + ' 元'
+                    scope.row.medCategory
+                      ? scope.row.medCategory_dictText
+                      : scope.row.serviceCategory_dictText
                   }}
-                </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
-                      ? row.serviceStatus_enumText
-                      : row.chargeStatus_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>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="size" label="数量" width="100">
+                <template #default="scope">
+                  <span v-if="scope.row.quantity !== 0 && scope.row.unitCode_dictText">
+                    {{ scope.row.quantity + ' ' + scope.row.unitCode_dictText }}
+                  </span>
+                  <span v-else> - </span>
+                </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="120">
+                <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>
 
-        <!-- 耗材区域 -->
-        <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>
+              <el-table-column
+                label="操作"
+                align="center"
+                width="150"
+                fixed="right"
+                class-name="no-hover-column"
+              >
+                <template #default="{ row }">
+                  <!-- <el-button type="text" @click="handleExecute(row)"> 执行 </el-button> -->
+                  <!-- <el-button type="danger" link @click="handleCancel(row)"> 取消 </el-button> -->
+                  <el-button link type="primary" icon="EditPen" @click="getRecord(row)">
+                    执行记录
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+          <el-card class="half-card">
+            <template #header> 耗材使用 </template>
+            <el-table
+              :data="deviceList"
+              style="width: 100%; height: 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 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 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="center" 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="center" 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>
+          </el-card>
         </div>
-      </div>
-    </div>
+      </el-col>
+    </el-row>
     <PerformRecordDialog :open="openDialog" :recordList="recordList" @close="openDialog = false" />
   </div>
 </template>
 
 <script setup>
-import { getCurrentInstance } from 'vue';
+import { getCurrentInstance, ref, computed } from 'vue';
 import {
   getList,
   getDisposalList,
@@ -235,6 +324,7 @@ import { formatDateStr } from '@/utils';
 import { hiprint } from 'vue-plugin-hiprint';
 import { advicePrint } from '@/api/public';
 import useUserStore from '@/store/modules/user';
+import { getGroupMarkers } from '@/utils/his';
 // 患者搜索
 const queryParams = ref({
   pageNo: 1,
@@ -254,6 +344,7 @@ const deviceList = ref([]);
 // 诊疗项目 + 耗材 打印处置单用
 const deviceActivityList = ref([]);
 const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
 
 // 当前选中的患者
 const currentPatient = ref({});
@@ -261,21 +352,40 @@ const recordList = ref([]);
 const openDialog = ref(false);
 const loading = ref(false);
 const activityListRef = ref(null);
-
-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
+const deviceListRef = ref(null);
+const rules = ref({
+  serviceCategory: [{ required: true, message: '请选择处置类型', trigger: 'blur' }],
+});
+//
+const { activity_category_code } = proxy.useDict('activity_category_code');
+const activityCategoryList = computed(() => {
+  const keywords = ['检验', '检查', '治疗'];
+  return (activity_category_code.value || []).filter((item) =>
+    keywords.some((k) => String(item.label || '').includes(k))
   );
+});
+const activitySelectedList = ref([]);
+const deviceSelectedList = ref([]);
+// 是否有批量选择：无任何选择时禁用
+const isMultiple = computed(() => {
+  // 未选择患者或为空对象时禁用
+  if (!currentPatient.value || Object.keys(currentPatient.value).length === 0) {
+    return true;
+  }
+  // 选中 处置列表
+  activitySelectedList.value = activityListRef.value?.getSelectionRows
+    ? activityListRef.value.getSelectionRows()
+    : [];
 
-  return treatmentCost + materialCost;
+  // 选中 耗材列表
+  deviceSelectedList.value = deviceListRef.value?.getSelectionRows
+    ? deviceListRef.value.getSelectionRows()
+    : [];
+  return deviceSelectedList.value.length === 0 && activitySelectedList.value.length === 0;
+});
+// 是否为当前患者
+const isCurrentPatient = computed(() => {
+  return Object.keys(currentPatient.value).length === 0;
 });
 getPatientList();
 function getPatientList() {
@@ -286,9 +396,32 @@ function getPatientList() {
     total.value = res.data.total;
   });
 }
+// 切换处置类型
+function handleServiceCategoryChange(value) {
+  // 就诊id
+  let encounterId = currentPatient.value.encounterId;
+  // 处置类型
+  let serviceCategory = value;
+  // 如果就诊id和处置类型不为空，则获取处置列表
+  if (encounterId && serviceCategory) {
+    getDisposalList(encounterId, serviceCategory).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'
+        );
+      });
+      deviceActivityList.value = res.data.records.filter((item) => {
+        return item.deviceCategory == '7' || item.serviceCategory == '21';
+      });
+    });
+  }
+}
 
 function handlePatientSelect(row) {
-  console.log(row, 3456789);
   loading.value = true;
   currentPatient.value = row;
   getDisposalList(row.encounterId).then((res) => {
@@ -300,14 +433,84 @@ function handlePatientSelect(row) {
         item.requestTable == 'wor_service_request' || item.requestTable == 'med_medication_request'
       );
     });
+    activityList.value = getGroupMarkers(activityList.value);
     deviceActivityList.value = res.data.records.filter((item) => {
       return item.deviceCategory == '7' || item.serviceCategory == '21';
     });
     loading.value = false;
-    console.log(activityList.value, 345678);
   });
 }
+// 批量操作校验
+function handleBatchValidate(type) {
+  let params = [];
+  // 是否批量选择了数据
+  if (isMultiple.value) {
+    proxy.$modal.msgError('请选择要执行的项目');
+    return;
+  }
+  if (type === 'execute') {
+    let activityList = activitySelectedList.value
+      .filter((item) => {
+        return item.chargeStatus === 5;
+      })
+      .map((item) => {
+        return {
+          requestId: item.requestId,
+          dispenseId: item.dispenseId,
+          requestTable: item.requestTable,
+          chargeStatus: item.chargeStatus_enumText,
+          dispenseStatus: item.dispenseStatus_enumText,
+          name: item.itemName,
+        };
+      });
+    let deviceList = deviceSelectedList.value
+      .filter((item) => {
+        return item.dispenseStatus === 2;
+      })
+      .map((item) => {
+        return {
+          requestId: item.requestId,
+          dispenseId: item.dispenseId,
+          requestTable: item.requestTable,
+          chargeStatus: item.chargeStatus_enumText,
+          dispenseStatus: item.dispenseStatus_enumText,
+          name: item.itemName,
+        };
+      });
 
+    return [...activityList, ...deviceList];
+  } else if (type === 'cancel') {
+    let list = [...activitySelectedList.value, ...deviceSelectedList.value];
+    list.forEach((item) => {
+      params.push({
+        requestId: item.requestId,
+        dispenseId: item.dispenseId,
+        requestTable: item.requestTable,
+      });
+    });
+    return list;
+  }
+}
+// 批量执行
+function handleBatchExecute() {
+  // 获取校验后数据
+  let params = handleBatchValidate('execute');
+  // 如果参数数组为空 不执行
+  if (params.length == 0) {
+    proxy.$modal.msgError('不存在需要执行的处置或耗材!');
+    return;
+  }
+  // 执行批量操作
+  execute(params).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('执行成功');
+      handlePatientSelect(currentPatient.value);
+    } else {
+      proxy.$modal.msgError(res.message);
+    }
+  });
+}
+// 单个执行
 function handleExecute(row) {
   let data = {
     requestId: row.requestId,
@@ -316,7 +519,9 @@ function handleExecute(row) {
   };
   let params = activityList.value
     .filter((item) => {
-      return item.groupId == row.groupId;
+      return (
+        (item.medCategory != null || item.medCategory != undefined) && item.groupId == row.groupId
+      );
     })
     .map((item) => {
       return {
@@ -325,14 +530,16 @@ function handleExecute(row) {
         requestTable: item.requestTable,
       };
     });
-  let list = proxy.$refs.deviceListRef.getSelectionRows().map((item) => {
+  let list = (
+    deviceListRef.value?.getSelectionRows ? deviceListRef.value.getSelectionRows() : []
+  ).map((item) => {
     return {
       requestId: item.requestId,
       dispenseId: item.dispenseId,
       requestTable: item.requestTable,
     };
   });
-  list.push(data);
+  params.push(...list);
   execute(params).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess('执行成功');
@@ -346,7 +553,7 @@ function handleExecute(row) {
 // 添加操作列的合并方法
 function operationSpanMethod({ row, column, rowIndex, columnIndex }) {
   // 操作列是最后一列，索引为11 (从0开始)
-  if (columnIndex === 11) {
+  if (columnIndex === 12) {
     const groupId = row.groupId;
     // 如果没有groupId，则不合并
     if (groupId === undefined || groupId === null) {
@@ -377,6 +584,7 @@ function operationSpanMethod({ row, column, rowIndex, columnIndex }) {
   return [1, 1];
 }
 
+// 打印处方
 function printPrescription() {
   // 取出状态为已收费已发药的requestId
   let requestIds = activityList.value
@@ -387,6 +595,10 @@ function printPrescription() {
       return item.requestId;
     })
     .join(',');
+  if (requestIds.length == 0) {
+    proxy.$modal.msgWarning('没有可打印的处方!');
+    return;
+  }
   advicePrint({ requestIds: requestIds, isPrescription: 1 }).then((res) => {
     // 按 sortNumber 排序
     const sortedList = res.data.adviceItemList.sort((a, b) => {
@@ -430,7 +642,7 @@ function printPrescription() {
     }); //开始打印
   });
 }
-
+// 打印处置单
 function printDisposal() {
   let requestIds = deviceActivityList.value
     .map((item) => {
@@ -469,6 +681,7 @@ function isFirstRowInGroup(rowIndex) {
   return true;
 }
 
+// 打印血条码
 function printBloodBarcode() {
   const selectedRows = activityListRef.value.getSelectionRows();
   if (selectedRows.length === 0) {
@@ -488,6 +701,27 @@ function printBloodBarcode() {
   }
 }
 
+// 批量取消
+function handleBatchCancel() {
+  // 获取校验后数据
+  let params = handleBatchValidate('cancel');
+
+  // 如果参数数组为空 不执行
+  if (params.length == 0) {
+    proxy.$modal.msgError('不存在需要执行的处置或耗材!');
+    return;
+  }
+  //
+  cancel(params).then((res) => {
+    if (res.code == 200) {
+      proxy.$modal.msgSuccess('操作成功');
+      handlePatientSelect(currentPatient.value);
+    } else {
+      proxy.$modal.msgError(res.message);
+    }
+  });
+}
+// 单个取消
 function handleCancel(row) {
   let data = {
     requestId: row.requestId,
@@ -514,13 +748,22 @@ function handleCancel(row) {
     }
   });
 }
-
+// 打印瓶贴
 function printBottleLabel() {
   let result = [];
   // 过滤出全部输液药品
-  let printLiist = activityList.value.filter((item) => {
-    return item.medCategory == '2';
-  });
+  let selectRows = activityListRef.value.getSelectionRows();
+  let printLiist = [];
+  // 有选中的优先打印选中行，没有的话打印全部的输液药品
+  if (selectRows.length > 0) {
+    printLiist = selectRows.filter((item) => {
+      return item.medCategory == '2' || item.medCategory == '1';
+    });
+  } else {
+    printLiist = activityList.value.filter((item) => {
+      return item.medCategory == '2' || item.medCategory == '1';
+    });
+  }
   // 按照groupId分组，但将多天的项目展开为独立项目
   let expandedList = [];
 
@@ -585,6 +828,7 @@ function printBottleLabel() {
   var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
   console.log(result, '打印机列表');
   hiprintTemplate.print2(result, {
+    // printer: 'Xprinter XP-365B',
     height: 210,
     width: 148,
   });
@@ -599,6 +843,18 @@ function printBottleLabel() {
   });
 }
 
+// 选择框改变时的处理
+function handleSelectionChange(selection, row) {
+  const isSelected = selection.some((item) => item.requestId === row.requestId);
+  activityList.value
+    .filter((item) => {
+      return item.groupId && item.groupId == row?.groupId;
+    })
+    .forEach((row) => {
+      activityListRef.value.toggleRowSelection(row, isSelected);
+    });
+}
+
 function getRecord(row) {
   getPerformRecord({ reqId: row.requestId }).then((res) => {
     recordList.value = res.data;
@@ -618,26 +874,6 @@ function getRecord(row) {
   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;
@@ -646,6 +882,28 @@ function getRecord(row) {
   min-width: 600px;
 }
 
+.cards-column {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  height: calc(90vh - 140px);
+  min-height: 300px;
+}
+
+.half-card {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.half-card :deep(.el-card__body) {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
 .current-patient {
   background: white;
   border-radius: 12px;
@@ -773,4 +1031,12 @@ function getRecord(row) {
   width: 200px;
   margin-bottom: 10px;
 }
+
+:deep(.no-hover-column) .cell:hover {
+  background-color: transparent !important;
+}
+
+:deep(.el-table__body) tr:hover td.no-hover-column {
+  background-color: inherit !important;
+}
 </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
index 28725fbc..51cf4cb3 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
@@ -27,7 +27,7 @@
           <span>CF0000000001</span>
         </div>
         <div style="text-align: center">
-          <h2>医院</h2>
+          <h2>长春大学医院</h2>
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>
diff --git a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
index 646858f7..70c7189c 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
@@ -112,7 +112,7 @@ import historicalPrescriptionDetail from './component/details.vue';
 import Prescription from './component/prescription.vue';
 const { proxy } = getCurrentInstance();
 
-const { item_type } = proxy.useDict('item_type');
+const { item_category_code } = proxy.useDict('item_category_code');
 const prescriptionNo = ref('');
 const typeDetail = ref('1');
 const purchaseinventoryList = ref([]);
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
index 28356a36..1967ab61 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -36,8 +36,10 @@
       <el-table-column label="单次剂量" align="center">
         <template #default="scope">
           <span>
-            {{ 
-              parseFloat(scope.row.dose).toFixed(2) === '0.00'
+            {{
+              !scope.row.dose || isNaN(parseFloat(scope.row.dose))
+                ? '-'
+                : parseFloat(scope.row.dose).toFixed(2) === '0.00'
                 ? '-'
                 : parseFloat(scope.row.dose).toFixed(2) + scope.row.doseUnitCode_dictText
             }}
@@ -46,8 +48,13 @@
       </el-table-column>
       <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">{{ getLocationName(scope.row) }}</template>
+      <!-- 修改价格列，从inventoryList中获取价格 -->
+      <el-table-column label="价格" align="center">
+        <template #default="scope">
+          <span>
+            {{ getPriceFromInventory(scope.row) }}
+          </span>
+        </template>
       </el-table-column>
       <el-table-column label="库存数量" align="center">
         <template #default="scope">{{ handleQuantity(scope.row) }}</template>
@@ -199,19 +206,31 @@ watch(
       // 全部类型
       queryParams.value.adviceTypes = '1,2,3';
     }
-    
-    // 设置categoryCode筛选条件（用于筛选西药和中成药）
-    if (newValue.categoryCode) {
-      queryParams.value.categoryCode = newValue.categoryCode;
-    } else {
-      queryParams.value.categoryCode = undefined;
-    }
-    
-    console.log('发送请求参数:', queryParams.value);
-    getList();
+    throttledGetList();
   },
-  { deep: true, immediate: true }
+  { deep: true }
 );
+
+getList();
+function getList() {
+  queryParams.value.organizationId = props.patientInfo.orgId;
+  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]);
+      });
+    }
+  });
+}
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
   if (row.priceList && row.priceList.length > 0) {
@@ -441,6 +460,7 @@ defineExpose({
 
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #409eff;
+  /* 聚焦时的高亮效果 */
 }
 </style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js
index 6d7ccb8a..c6db19d7 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -543,6 +543,16 @@ export function saveTcmDiagnosis(data) {
   })
 }
 
+/**
+ * 删除中医诊断
+ */
+export function deleteTcmDiagnosis(syndromeGroupNo) {
+  return request({
+    url: '/doctor-station/chinese-medical/tcm-diagnosis?syndromeGroupNo=' + syndromeGroupNo,
+    method: 'delete',
+  })
+}
+
 /**
  * 保存中医医嘱
  */
@@ -707,11 +717,11 @@ export function getOrderGroup(data) {
 }
 
 /**
- * 查询诊疗项目耗材绑定信息
+ * 查询项目绑定信息
  */
-export function getActivityBindDevice(data) {
+export function getBindDevice(data) {
   return request({
-    url: '/doctor-station/advice/activity-bind-device-info',
+    url: '/doctor-station/advice/order-bind-info',
     method: 'get',
     params: data
   })
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
index 8d6e00ef..96fee64c 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -2,61 +2,36 @@
   <div>
     <el-row :gutter="24">
       <el-col :span="4" :xs="24">
-        <el-input
-          v-model="diagnosis"
-          placeholder="诊断名称"
-          clearable
-          style="width: 100%; margin-bottom: 10px"
-          @keyup.enter="queryDiagnosisUse"
-        >
+        <el-input v-model="diagnosis" placeholder="诊断名称" clearable style="width: 100%; margin-bottom: 10px"
+          @keyup.enter="queryDiagnosisUse">
           <template #append>
             <el-button icon="Search" @click="queryDiagnosisUse" />
           </template>
         </el-input>
-        <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"
-        >
+        <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 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)"
-                >
+                <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 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>
@@ -78,25 +53,15 @@
             <el-table-column label="序号" type="index" width="50" />
             <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="120">
               <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 :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-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 diag_type"
@@ -111,25 +76,12 @@
             <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"
-                    />
+                  <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)"
-                      />
+                      <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>
@@ -169,11 +121,7 @@
             </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 link type="primary" @click="handleDeleteDiagnosis(scope.row, scope.$index)">
                   删除
                 </el-button>
               </template>
@@ -182,16 +130,9 @@
         </el-form>
       </el-col>
     </el-row>
-    <diagnosisdialog
-      :openDiagnosis="openDiagnosis"
-      @close="closeDiagnosisDialog"
-      :radio="orgOrUser"
-    />
-    <AddDiagnosisDialog
-      :openAddDiagnosisDialog="openAddDiagnosisDialog"
-      :patientInfo="props.patientInfo"
-      @close="closeDiagnosisDialog"
-    />
+    <diagnosisdialog :openDiagnosis="openDiagnosis" @close="closeDiagnosisDialog" :radio="orgOrUser" />
+    <AddDiagnosisDialog :openAddDiagnosisDialog="openAddDiagnosisDialog" :patientInfo="props.patientInfo"
+      @close="closeDiagnosisDialog" />
   </div>
 </template>
 
@@ -208,6 +149,7 @@ import {
   getChronicDisease,
   getTcmDiagnosis,
   delEncounterDiagnosis,
+  deleteTcmDiagnosis,
   isFoodDiseasesNew,
 } from '../api';
 import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
@@ -280,7 +222,6 @@ function getList() {
       form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
       
       emits('diagnosisSave', false);
-      console.log(form.value.diagnosisList);
     }
   });
   
@@ -298,7 +239,6 @@ function getList() {
         });
       }
       emits('diagnosisSave', false);
-      console.log(form.value.diagnosisList);
     }
   });
   
@@ -553,7 +493,7 @@ function closeDiagnosisDialog(str) {
   getTree();
 }
 
-function queryDiagnosisUse(value) {}
+function queryDiagnosisUse(value) { }
 
 function handleChange(value) {
   diagnosisSearchkey.value = value;
@@ -627,6 +567,7 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 .el-checkbox.is-bordered.el-checkbox--small {
   background-color: #ffffff;
 }
+
 .custom-tree-node {
   display: flex;
   align-items: center;
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
index 675f6136..da0b02dd 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
@@ -9,8 +9,8 @@
         @cell-click="clickRow"
       >
         <el-table-column label="模板名称" align="center" prop="templateName" />
-        <el-table-column label="使用范围" align="center" prop="useScopeCode" />
-        <el-table-column label="操作" align="center">
+        <!-- <el-table-column label="使用范围" align="center" prop="useScopeCode" /> -->
+        <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
             <el-button link type="primary" @click.stop="handelDelete(scope.row)">删除</el-button>
           </template>
@@ -43,7 +43,11 @@ const props = defineProps({
     required: true,
   },
 });
+<<<<<<< HEAD
 getList(); 
+=======
+getList();
+>>>>>>> upstream/develop
 function getList() {
   queryParams.value.useScopeCode = 1;
   getEmrTemplateList(queryParams.value).then((res) => {
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
index dc943b53..0391a5f4 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
@@ -743,7 +743,6 @@ function selectMedRow(key, row, index) {
       const item = list.sort((a, b) => {
         return new Date(b.begndate) - new Date(a.begndate);
       });
-      //debugger
       if (item.length > 0) {
         if (item[0].medChrgitmType != '11' && item[0].medChrgitmType != '09') {
           form.medicationInfoList.shift();
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
index 2ef152ea..71be0199 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue
@@ -11,14 +11,8 @@
     </div>
 
     <div>处方信息</div>
-    <el-table
-      max-height="650"
-      ref="eprescriptionRef"
-      :data="prescriptionList"
-      row-key="prescriptionNo"
-      border
-      @selection-change="handleSelectionChange"
-    >
+    <el-table max-height="650" ref="eprescriptionRef" :data="prescriptionList" row-key="prescriptionNo" border
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" :selectable="selectable" />
       <el-table-column label="处方号" align="center" prop="prescriptionNo" width="200" sortable>
         <template #default="scope">
@@ -46,16 +40,8 @@
           <span v-if="!scope.row.isEdit">
             {{ scope.row.validityDays }}
           </span>
-          <el-input-number
-            v-else
-            :min="0"
-            controls-position="right"
-            :controls="false"
-            v-model="scope.row.validityDays"
-            placeholder=""
-            @input="handleValidityDaysChange(scope.$index, $event)"
-            style="width: 90%"
-          />
+          <el-input-number v-else :min="0" controls-position="right" :controls="false" v-model="scope.row.validityDays"
+            placeholder="" @input="handleValidityDaysChange(scope.$index, $event)" style="width: 90%" />
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="statusEnum_enumText" width="80">
@@ -65,13 +51,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="开方医师"
-        align="center"
-        prop="practitionerName"
-        header-align="center"
-        width="90"
-      >
+      <el-table-column label="开方医师" align="center" prop="practitionerName" header-align="center" width="90">
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.practitionerName }}
@@ -138,44 +118,19 @@
       <el-table-column label="操作" align="center" width="220" fixed="right">
         <template #default="scope">
           <el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
-          <el-button
-            link
-            type="primary"
-            icon="Edit"
-            @click="handleEdit(scope.row)"
-            :disabled="scope.row.statusEnum == 2 || scope.row.statusEnum == 3 || scope.row.statusEnum == 6"
-            >编辑</el-button
-          >
-          <el-button
-            link
-            type="primary"
-            icon="Plus"
-            @click="savePrescriptionData(scope.row, scope.$index)"
-            :disabled="!scope.row.isEdit"
-            >保存</el-button
-          >
+          <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)"
+            :disabled="scope.row.statusEnum == 2 || scope.row.statusEnum == 3 || scope.row.statusEnum == 6">编辑</el-button>
+          <el-button link type="primary" icon="Plus" @click="savePrescriptionData(scope.row, scope.$index)"
+            :disabled="!scope.row.isEdit">保存</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"
-      style="margin-bottom: 5px"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" style="margin-bottom: 5px" />
 
-    <eprescriptiondialog
-      ref="prescriptionDialogRef"
-      :openPrescription="openPrescription"
-      :patient="props.patientInfo"
-      :prescriptionType="prescriptionTypeList"
-      :medicationInfo="medicationInfoList"
-      :prescriptionData="prescriptionInfo"
-      :title="title"
-      @close="closePrescriptionDialog"
-    />
+    <eprescriptiondialog ref="prescriptionDialogRef" :openPrescription="openPrescription" :patient="props.patientInfo"
+      :prescriptionType="prescriptionTypeList" :medicationInfo="medicationInfoList" :prescriptionData="prescriptionInfo"
+      :title="title" @close="closePrescriptionDialog" />
   </div>
 </template>
 
@@ -285,20 +240,12 @@ getElepPrescriptionInit();
 
 /** 处方信息取得 */
 function getList() {
-  console.log(
-    queryParams.value,
-    'queryParams.value电子处方',
-    props.patientInfo,
-    'props.patientInfo'
-  );
   prescriptionList.value = [];
   medicationInfoList.value = [];
   prescriptionNoTemp.value = undefined;
   queryParams.value.patientId = props.patientInfo.patientId;
-  console.log(queryParams.value, 'queryParams.value电子处方');
   getPrescriptionInfo(queryParams.value).then((res) => {
     prescriptionList.value = res.data.records;
-    console.log(res, '电子处方列表');
     total.value = res.data.total;
   });
 }
@@ -307,13 +254,11 @@ function getList() {
 function getElepPrescriptionInit() {
   elepPrescriptionInit().then((res) => {
     prescriptionTypeList.value = res.data.rxTypeCodeListOptions;
-    console.log(res, '电子处方下拉框');
   });
 }
 
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, 'selection');
   selectDataList.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   prescriptionNos.value = selection.map((item) => item.prescriptionNo);
   ids.value = selection
@@ -341,7 +286,6 @@ function handleAddPrescription() {
  */
 function selectable(row, index) {
   // 返回 true 表示该行可选，返回 false 表示该行不可选
-  // console.log(row, 'selectable', rowIndex.value);
   return ![2, 3, 6].includes(row.statusEnum);
 }
 
@@ -359,7 +303,6 @@ function handleView(row) {
   prescriptionInfo.value.extensionReason = row.extensionReason;
   prescriptionInfo.value.rxTypeCode = row.rxTypeCode;
   prescriptionInfo.value.prescriptionNo = row.prescriptionNo;
-  console.log(queryMedicationParams.value, '处方详细的药品信息参数', row.prescriptionNo);
   getMedicationInfo(queryMedicationParams.value).then((response) => {
     medicationInfoList.value = response.data.records;
     medicationInfoList.value.forEach((medicationInfo) => {
@@ -369,7 +312,6 @@ function handleView(row) {
     prescriptionInfo.value.conditionId = response.data.records[0].conditionId;
     openPrescriptionDialog();
 
-    console.log(response, '处方详细的药品信息', medicationInfoList.value);
   });
 }
 
@@ -385,7 +327,6 @@ function handleEdit(row) {
   prescriptionInfo.value.extensionReason = row.extensionReason;
   prescriptionInfo.value.rxTypeCode = row.rxTypeCode;
   prescriptionInfo.value.prescriptionNo = row.prescriptionNo;
-  console.log(queryMedicationParams.value, '处方详细的药品信息参数', row.prescriptionNo);
   getMedicationInfo(queryMedicationParams.value).then((response) => {
     medicationInfoList.value = response.data.records;
     medicationInfoList.value.forEach((medicationInfo) => {
@@ -393,7 +334,6 @@ function handleEdit(row) {
     });
     prescriptionInfo.value.conditionId = response.data.records[0].conditionId;
     openPrescriptionDialog();
-    console.log(response, '处方详细的药品信息', medicationInfoList.value);
   });
 }
 
@@ -419,7 +359,6 @@ function openPrescriptionDialog() {
   nextTick(() => {
     proxy.$refs['prescriptionDialogRef'].getPrescriptionNoInit();
   });
-  console.log(openPrescription.value, '打开新增处方弹窗');
 }
 
 /**
@@ -456,10 +395,8 @@ async function savePrescriptionData(row, index) {
     rxTypeCode: row.rxTypeCode,
   };
 
-  console.log(updateParam, ' 保存处方updateParam');
   updatePrescriptionInfo(updateParam).then((response) => {
     if (response.code == 200) {
-      console.log(response, '保存成功');
       proxy.$modal.msgSuccess('保存成功');
       getList();
     } else {
@@ -467,7 +404,6 @@ async function savePrescriptionData(row, index) {
     }
   });
   // } catch (error) {
-  //   console.log('验证失败:', error);
   //   // 验证失败，不执行保存
   // }
 }
@@ -513,7 +449,6 @@ function deletePrescription(index) {
     idList: ids.value,
     prescriptionNoList: prescriptionNos.value,
   };
-  console.log('deletePrescription删除', data);
   proxy.$modal
     .confirm('是否确认删除以上数据！')
     .then(function () {
@@ -530,13 +465,12 @@ function deletePrescription(index) {
       //     form.value.medicationInfoList.forEach((medicationInfo) => {
       //       medicationInfo.isEdit = false;
       //     });
-      //     console.log(response, '处方详细的药品信息', form.value.medicationInfoList);
       //     totalMedication.value = response.data.total;
       //   });
       // }
       proxy.$modal.msgSuccess('删除成功');
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 defineExpose({ getList });
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/api.js b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/api.js
new file mode 100644
index 00000000..25415ce2
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/api.js
@@ -0,0 +1,60 @@
+/*
+ * @Author: sjjh
+ * @Date: 2025-09-20 17:02:37
+ * @Description: 
+ */
+import request from '@/utils/request'
+
+// ====== 文书记录
+// 新增记录
+export function addRecord(data) {
+  return request({
+    url: '/document/record/addRecord',
+    method: 'post',
+    data
+  })
+}
+// 根据患者ID或就诊ID获取文书记录列表,只针对不需返回患者具体信息的列表，体温单除外，单独处理
+
+export function getRecordByEncounterIdList(params) {
+  return request({
+    url: '/document/record/getRecordByEncounterIdList',
+    method: 'get',
+    params
+  })
+}
+// 初始化文书定义
+export function init() {
+  return request({
+    url: '/document/record/init',
+    method: 'get',
+  })
+}
+
+// ====== 文书模板
+// 新增模板
+export function addTemplate(data) {
+  return request({
+    url: '/document/template/add',
+    method: 'post',
+    data
+  })
+}
+//
+export function getListByDefinitionId(definitionId) {
+  return request({
+    url: '/document/template/getListByDefinitionId',
+    method: 'get',
+    params: {definitionId}
+  })
+}
+// 更新模板
+export function updateTemplate(data) {
+  return request({
+    url: '/document/template/update',
+    method: 'put',
+    data
+  })
+}
+
+
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/history.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/history.vue
new file mode 100644
index 00000000..e7c8b7a1
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/history.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="emr-history-container">
+    <div class="search-box">
+      <el-input placeholder="病历名称搜索..." v-model="queryParams.searchKey">
+        <template #append>
+          <el-button @click="queryList">查询</el-button>
+        </template>
+      </el-input>
+    </div>
+    <el-scrollbar class="emr-history-scrollbar-container" style="width: 100%">
+      <div v-for="item in historyData" :key="item.id" class="scrollbar-item">
+        <el-tooltip effect="dark" :content="`${item.name}(${item.recordTime})`" placement="bottom">
+          <el-text class="w-150px mb-2" truncated @click="handleNodeClick(item)">
+            {{ item.name }}({{ item.recordTime }})
+          </el-text>
+        </el-tooltip>
+      </div>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, defineEmits, unref } from 'vue';
+import { getRecordByEncounterIdList } from '../api';
+import { ElTree } from 'element-plus';
+import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
+import { patientInfo } from '../../store/patient.js';
+const emits = defineEmits(['historyClick']);
+const props = defineProps({
+  definitionId: {
+    type: String,
+    default: '',
+  },
+});
+const definitionId = defineModel('definitionId', {
+  type: String,
+  default: '',
+});
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+};
+const queryParams = ref({
+  searchKey: '',
+  isPage: 0,
+});
+const historyData = ref([]);
+const queryList = async () => {
+  try {
+    if (patientInfo.value.encounterId && unref(definitionId) && unref(definitionId) !== '') {
+      const res = await getRecordByEncounterIdList({
+        ...queryParams.value,
+        encounterId: patientInfo.value.encounterId,
+        patientId: patientInfo.value.patientId,
+        definitionId: unref(definitionId),
+      });
+      historyData.value = res.data || [];
+    } else {
+      historyData.value = [];
+    }
+  } catch (error) {
+    // ElMessage.error('获取模板树失败');
+    historyData.value = [];
+  }
+};
+const handleNodeClick = (data) => {
+  emits('historyClick', data);
+};
+const currentSelectTemplate = ref({});
+defineExpose({ queryList });
+</script>
+
+<style lang="scss" scoped>
+.emr-history-container {
+  height: 100%;
+  //   padding: 8px;
+  .search-box {
+    height: 40px;
+    line-height: 40px;
+  }
+  .emr-history-scrollbar-container {
+    padding: 8px;
+    height: calc(100% - 40px);
+    .scrollbar-item {
+      height: 40px;
+      line-height: 40px;
+      border-radius: 4px;
+      cursor: pointer;
+      background: var(--el-color-primary-light-9);
+      & + .scrollbar-item {
+        margin-top: 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue
new file mode 100644
index 00000000..5e741e5b
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/template.vue
@@ -0,0 +1,112 @@
+<template>
+  <div class="emr-template-container">
+    <!-- <div class="search-box">
+      <el-input placeholder="病历名称搜索..." v-model="queryParams.searchKey">
+        <template #append>
+          <el-button @click="queryList">查询</el-button>
+        </template>
+      </el-input>
+    </div> -->
+    <el-scrollbar class="emr-template-scrollbar-container" style="width: 100%">
+      <div v-for="item in templateData" :key="item.id" class="scrollbar-item">
+        <el-tooltip
+          effect="dark"
+          :content="`${item.name}`"
+          placement="bottom"
+        >
+          <el-text class="2" truncated @click="handleNodeClick(item)">
+            <div class="template-item">{{ item.name }}
+               <el-space>
+             <el-icon><Edit @click="handleEdit(item)" /></el-icon>
+            </el-space></div>
+            
+          </el-text>
+        </el-tooltip>
+      </div>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, defineEmits, unref } from 'vue';
+import { getListByDefinitionId } from '../api';
+import { ElTree } from 'element-plus';
+import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
+import { patientInfo } from '../../store/patient.js';
+const emits = defineEmits(['templateClick','edit']);
+const props = defineProps({
+  definitionId: {
+    type: String,
+    default: '',
+  },
+});
+const definitionId = defineModel('definitionId', {
+  type: String,
+  default: '',
+});
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+};
+const queryParams = ref({
+  searchKey: '',
+  isPage: 0,
+});
+const templateData = ref([]);
+const queryList = async () => {
+  try {
+    if ( unref(definitionId)&&unref(definitionId) !== '') {
+      const res = await getListByDefinitionId(unref(definitionId));
+      templateData.value = res.data || [];
+    }else{
+      templateData.value = [];
+    }
+
+  } catch (error) {
+    ElMessage.error('获取模板失败');
+    templateData.value = [];
+  }
+};
+const handleNodeClick = (data) => {
+  emits('templateClick', data);
+};
+const handleEdit = (data) => {
+  emits('edit', data);
+};
+const currentSelectTemplate = ref({});
+defineExpose({ queryList });
+</script>
+
+<style lang="scss" scoped>
+.emr-template-container {
+    height: 100%;
+//   padding: 8px;
+ 
+.emr-template-scrollbar-container{
+    padding: 8px;
+    height: 100%;
+  .scrollbar-item {
+    height: 40px;
+    line-height: 40px;
+    border-radius: 4px;
+    cursor: pointer;
+    background: var(--el-color-primary-light-9);
+    & + .scrollbar-item {
+      margin-top: 8px;
+    }
+    .el-text{
+      width: calc(100% - 0px);
+    display: flex;
+    justify-content: space-between;
+    padding: 0 8px;
+    }
+    .template-item{
+      width: 100%;
+    display: flex;
+    justify-content: space-between;
+    }
+  }
+}
+
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/templateEdit.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/templateEdit.vue
new file mode 100644
index 00000000..008f1fbe
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/templateEdit.vue
@@ -0,0 +1,133 @@
+<template>
+  <!-- 病历文件基本信息弹窗 -->
+  <el-dialog
+    :title="formData.id ? '编辑模板' : '新增模板'"
+    v-model="dialogVisible"
+    width="900px"
+    destroy-on-close
+    @open="handleOpen"
+  >
+    <!-- 使用el-form包裹表单 -->
+    <el-form :model="formData" ref="formRef" :rules="rules" label-width="120px">
+      <el-row :gutter="24" class="mb8">
+        <el-col :span="24">
+          <el-form-item label="模板名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入模板名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="使用范围" prop="useRange">
+            <el-radio-group v-model="formData.useRange">
+              <el-radio :value="0" size="large">全院</el-radio>
+              <el-radio :value="1" size="large">指定机构</el-radio>
+              <el-radio :value="2" size="large">指定用户</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入版本"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <template #footer>
+      <div class="dialog-footer"></div>
+      <el-button @click="dialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="submitForm">确定</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import useUserStore from '@/store/modules/user';
+import { addTemplate, updateTemplate } from '../api';
+import { ElMessage } from 'element-plus';
+import { components } from '@/template';
+const emits = defineEmits(['submitOk']);
+const props = defineProps({
+  formData: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+const formRef = ref(null);
+
+const dialogVisible = defineModel('dialogVisible', {
+  type: Boolean,
+  default: false,
+});
+
+// 表单数据
+const formData = ref({
+  id: 0,
+  name: '',
+  displayOrder: 0,
+  contextJson: '',
+  definitionId: 0,
+  useRange: 2,
+  organizationId: 0,
+  userId: 0,
+  remark: '',
+});
+// 表单验证规则（响应式，支持动态验证）
+const rules = reactive({
+  name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+});
+const handleOpen = () => {
+  if (props.formData) {
+    formData.value = props.formData;
+  } else {
+    resetForm();
+  }
+};
+
+// 提交表单
+const submitForm = () => {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      // 表单验证通过，执行保存操作
+      saveForm();
+    } else {
+      // 表单验证失败
+      ElMessage.error('请填写必填项');
+      return false;
+    }
+  });
+};
+// 保存表单
+const saveForm = async () => {
+  try {
+    // 如果有当前节点数据，表示是编辑操作
+    if (formData.value.id && formData.value.id !== '') {
+      const res = await updateTemplate(formData.value);
+      if (res.code == 200) {
+        ElMessage.success('更新成功');
+        emits('submitOk');
+      } else {
+        ElMessage.error('更新失败', error);
+      }
+    } else {
+      // 新建操作
+      const res = await addTemplate(formData.value);
+      if (res.code == 200) {
+        ElMessage.success('保存成功');
+        emits('submitOk');
+      } else {
+        ElMessage.error('保存失败', error);
+      }
+    }
+  } catch (error) {
+    console.log(error);
+    // ElMessage.error('保存失败',error);
+  }
+};
+// 重置表单
+const resetForm = () => {
+  formRef.value?.resetFields();
+};
+
+onMounted(() => {});
+</script>
+<style lang="scss" scoped></style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/index.vue b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/index.vue
new file mode 100644
index 00000000..e9940c47
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/index.vue
@@ -0,0 +1,584 @@
+<!--
+ * @Author: sjjh
+ * @Date: 2025-09-18 15:41:10
+ * @Description: 门诊病历组件
+-->
+<template>
+  <div class="emr-use-container">
+    <div
+      class="disBtn"
+      :class="{ disLeftBtnNor: leftShow, disLeftBtnAct: !leftShow }"
+      @click="disNode"
+    >
+      <img src="../../../../assets/icons/svg/foldup.svg" />
+    </div>
+    <div
+      class="disBtn"
+      :class="{ disRightBtnNor: rightShow, disRightBtnAct: !rightShow }"
+      @click="disNode_R"
+    >
+      <img src="../../../../assets/icons/svg/foldup.svg" />
+    </div>
+    <transition name="el-zoom-in-left">
+      <div class="template-tree-container" v-if="leftShow">
+        <div class="search-box">
+          <el-input placeholder="病历名称搜索..." v-model="queryParams.name">
+            <template #append>
+              <el-button @click="queryTemplateTree">查询</el-button>
+            </template>
+          </el-input>
+        </div>
+        <el-scrollbar class="template-tree-scrollbar">
+          <el-tree
+            ref="templateTree"
+            :data="templateData"
+            :props="defaultProps"
+            auto-expand-parent
+            node-key="id"
+            @node-click="handleNodeClick"
+            class="template-tree"
+          ></el-tree>
+        </el-scrollbar>
+      </div>
+    </transition>
+
+    <div class="operate-container">
+      <div class="operate-btns">
+        <el-space>
+          <!-- <el-button type="primary" @click="newEmr">新建</el-button> -->
+          <el-button type="primary" @click="saveAsModel">存为模版</el-button>
+          <el-button @click="refresh">刷新</el-button>
+          <el-button type="primary" @click="save">保存</el-button>
+          <!-- <el-button type="primary" @click="print">打印</el-button> -->
+        </el-space>
+      </div>
+      <div class="operate-main">
+        <el-scrollbar class="template-tree-scrollbar">
+          <component
+            :is="currentComponent"
+            ref="emrComponentRef"
+            :patientInfo="props.patientInfo"
+            @submitOk="handleSubmitOk"
+          />
+        </el-scrollbar>
+      </div>
+    </div>
+
+    <transition name="el-zoom-in-left">
+      <div class="quickly-container" v-if="rightShow">
+        <el-tabs v-model="quicklyactiveName" type="card">
+          <el-tab-pane label="历史" name="history">
+            <History
+              @historyClick="handleHistoryClick"
+              ref="historyRef"
+              v-model:definitionId="currentSelectTemplate.id"
+            />
+          </el-tab-pane>
+          <el-tab-pane label="模版" name="model">
+            <Template
+              @templateClick="handleTemplateClick"
+              ref="templateRef"
+              v-model:definitionId="currentSelectTemplate.id"
+              @edit="templateEdit"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </transition>
+
+    <TemplateEdit
+      ref="templateEditRef"
+      :formData="editTemplateForm"
+      v-model:dialogVisible="templateEditVisible"
+      @submitOk="templateEditSubmitOk"
+    />
+  </div>
+</template>
+<script setup>
+import { getCurrentInstance, nextTick, onBeforeMount, onMounted, reactive, ref } from 'vue';
+import { ElMessageBox, ElMessage, ElLoading } from 'element-plus';
+import { getTreeList } from '@/views/basicmanage/caseTemplates/api';
+import { addRecord, addTemplate } from './api';
+import { patientInfo } from '../store/patient.js';
+import dayjs from 'dayjs';
+// 打印工具
+// import { simplePrint, PRINT_TEMPLATE } from '@/utils/printUtils.js';
+const { proxy } = getCurrentInstance();
+const emits = defineEmits(['emrSaved']);
+const props = defineProps({
+  /** 患者信息 doctorStation 传递信息*/
+  patientInfo: {
+    type: Object,
+    required: true,
+  },
+  activeTab: {
+    type: String,
+  },
+});
+const state = reactive({});
+import History from './components/history';
+import Template from './components/template';
+import TemplateEdit from './components/templateEdit.vue';
+
+import useUserStore from '@/store/modules/user';
+const userStore = useUserStore();
+// 定义响应式变量
+const templateData = ref([]);
+const queryParams = ref({
+  name: '',
+  useRanges: [1, 2], // 0 暂不使用 1 全院 2 科室 3 个人
+  organizationId: userStore.orgId,
+});
+
+const currentSelectTemplate = ref({
+  id: '',
+});
+const currentComponent = ref('');
+const emrComponentRef = ref(null);
+const quicklyactiveName = ref('history');
+const leftShow = ref(true);
+const rightShow = ref(true);
+
+// 树配置（模板树）
+const defaultProps = {
+  children: 'children',
+  label: 'name',
+  value: 'id',
+};
+/** 初始化病历模板树（按科室筛选） */
+const queryTemplateTree = async () => {
+  try {
+    const res = await getTreeList(queryParams.value);
+    templateData.value = res.data || [];
+  } catch (error) {
+    // ElMessage.error('获取模板树失败');
+    templateData.value = [];
+  }
+};
+
+// 处理节点点击，根据后台返回的路径加载组件
+const handleNodeClick = (data, node) => {
+  if (node.isLeaf) {
+    // 存储当前节点数据
+    currentSelectTemplate.value = data.document;
+    currentComponent.value = currentSelectTemplate.value.vueRouter || '';
+    // currentComponent.value = data.document.vueRouter || '';
+  } else {
+    currentSelectTemplate.value = {
+      id: '',
+    };
+    // currentComponent.value = null;
+  }
+  historyRef.value?.queryList();
+  templateRef.value?.queryList();
+};
+
+const newEmr = () => {
+  if (currentSelectTemplate.value) {
+    currentComponent.value = currentSelectTemplate.value.vueRouter || '';
+    return;
+  }
+  ElMessage.error('请选择模版！');
+};
+
+const saveAsModel = async () => {
+  try {
+    currentOperate.value = 'addTemplate';
+    await emrComponentRef.value?.submit();
+  } catch (error) {
+    ElMessage.error('存为模版失败');
+  }
+};
+const editForm = ref({
+  id: '',
+  definitionId: '',
+  definitionBusNo: '',
+  contentJson: '',
+  statusEnum: 1, // 0草稿/暂存 1提交 2归档 3修改
+  organizationId: 0,
+  encounterId: '',
+  patientId: '',
+  recordTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  createBy: '',
+  source: '',
+});
+const editTemplateForm = ref({
+  id: '',
+  name: '',
+  displayOrder: 0,
+  contextJson: '',
+  definitionId: '',
+  useRange: 2,
+  organizationId: '',
+  userId: '',
+  remark: '',
+});
+
+const currentOperate = ref('add');
+const handleSubmitOk = async (data) => {
+  if (currentOperate.value === 'add') {
+    //
+    try {
+      if (!patientInfo.value?.encounterId || !patientInfo.value?.patientId) {
+        ElMessage.error('请先选择患者！');
+        return;
+      }
+      editForm.value.definitionId = currentSelectTemplate.value.id;
+      editForm.value.definitionBusNo = currentSelectTemplate.value.busNo;
+      editForm.value.contentJson = JSON.stringify(data);
+      editForm.value.encounterId = patientInfo.value.encounterId;
+      editForm.value.patientId = patientInfo.value.patientId;
+      editForm.value.recordTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+      await addRecord(editForm.value);
+      ElMessage.success('病历保存成功');
+      historyRef.value?.queryList();
+      templateRef.value?.queryList();
+      // 通知父组件病历保存成功
+      emits('emrSaved', true);
+    } catch (error) {
+      ElMessage.error('提交失败');
+      console.log(error);
+    }
+  } else if (currentOperate.value === 'addTemplate') {
+    // 新增或者编辑模板
+    // editTemplateForm.value.id=
+    editTemplateForm.value.name =
+      currentSelectTemplate.value.name + dayjs().format('YYYY/MM/DD HH:mm');
+    editTemplateForm.value.contextJson = JSON.stringify(data);
+    editTemplateForm.value.definitionId = currentSelectTemplate.value.id;
+    templateEditVisible.value = true;
+  }
+};
+
+const refresh = () => {
+  queryTemplateTree();
+  historyRef.value?.queryList();
+  templateRef.value?.queryList();
+};
+
+const deleteEmr = async () => {
+  try {
+    // 这里应该添加实际的删除逻辑
+    ElMessage.success('删除成功！');
+  } catch (error) {
+    ElMessage.error('删除失败');
+  }
+};
+
+const save = async () => {
+  try {
+    currentOperate.value = 'add';
+    await emrComponentRef.value?.submit();
+  } catch (error) {
+    ElMessage.error('保存失败');
+  }
+};
+
+const historyRef = ref(null);
+const handleHistoryClick = (data) => {
+  newEmr();
+  editForm.value = data;
+  nextTick(() => {
+    emrComponentRef.value?.setFormData(JSON.parse(editForm.value.contentJson));
+  });
+};
+const templateRef = ref(null);
+
+const handleTemplateClick = (data) => {
+  newEmr();
+  editForm.value = data;
+  nextTick(() => {
+    emrComponentRef.value?.setFormData(JSON.parse(editForm.value.contextJson));
+  });
+};
+const templateEdit = (data) => {
+  editTemplateForm.value = data;
+  templateEditVisible.value = true;
+};
+// ====dialog
+const templateEditVisible = ref(false);
+// const templateEditSubmitOk = () => {};
+
+// 打印方法实现
+const print = async () => {
+  try {
+    // 检查是否有选中的病历模板
+    if (!currentSelectTemplate.value || !currentSelectTemplate.value.id) {
+      ElMessage.warning('请先选择病历模板');
+      return;
+    }
+
+    // 获取当前病历组件的表单数据
+    const formData = emrComponentRef.value?.formData || {};
+
+    // 准备打印数据（不依赖子组件的getPrintData方法）
+    // const printData = {
+    //   // 使用当前选中的模板信息
+    //   templateInfo: currentSelectTemplate.value,
+    //   // 添加患者信息
+    //   patientInfo: props.patientInfo,
+    //   // 添加打印时间
+    //   printTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    //   // 添加基本病历信息
+    //   emrInfo: {
+    //     documentName: currentSelectTemplate.value.name || '住院病历',
+    //     documentId: currentSelectTemplate.value.id || '',
+    //     encounterId: props.patientInfo.encounterId || '',
+    //     patientId: props.patientInfo.patientId || '',
+    //     recordTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    //   },
+    //   // 添加病历表单数据（包含红框内的所有字段）
+    //   formData: formData,
+    //   doctorName: userStore.nickName,
+    // };
+
+    const printData = {
+      // 模板信息
+      templateName: currentSelectTemplate.value.name || '住院病历',
+      templateId: currentSelectTemplate.value.id || '',
+
+      // 医生信息
+      doctorName: userStore.nickName,
+
+      // 患者信息
+      patientName: props.patientInfo.patientName || '',
+      patientId: props.patientInfo.patientId || '',
+      medicalRecordNo: props.patientInfo.medicalRecordNo || '',
+      gender: props.patientInfo.gender || '',
+      age: props.patientInfo.age || '',
+      genderEnum_enumText: props.patientInfo.genderEnum_enumText || '',
+      idCard: props.patientInfo.idCard || '',
+      phone: props.patientInfo.phone || '',
+      registerTime: props.patientInfo.registerTime || '',
+      // 就诊信息
+      encounterId: props.patientInfo.encounterId || '',
+      department: props.patientInfo.department || '',
+      attendingDoctor: props.patientInfo.attendingDoctor || '',
+
+      // 病历信息
+      documentName: currentSelectTemplate.value.name || '住院病历',
+      documentId: currentSelectTemplate.value.id || '',
+      recordTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+      printTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+
+      // 表单数据 - 需要将嵌套结构展开
+      ...flattenObject(formData),
+    };
+
+    // 执行打印
+    await simplePrint(PRINT_TEMPLATE.OUTPATIENT_MEDICAL_RECORD, printData);
+    ElMessage.success('打印成功');
+  } catch (error) {
+    console.error('打印失败:', error);
+    ElMessage.error('打印失败: ' + (error.message || '未知错误'));
+  }
+};
+// 辅助函数：将嵌套对象扁平化为单层结构
+const flattenObject = (obj, prefix = '') => {
+  const flattened = {};
+
+  for (let key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      const newKey = prefix ? `${prefix}_${key}` : key;
+
+      if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
+        // 递归处理嵌套对象
+        Object.assign(flattened, flattenObject(obj[key], newKey));
+      } else if (Array.isArray(obj[key])) {
+        // 数组转换为字符串
+        flattened[newKey] = JSON.stringify(obj[key]);
+      } else {
+        // 基本类型直接赋值
+        flattened[newKey] = obj[key];
+      }
+    }
+  }
+
+  return flattened;
+};
+
+// 重新添加被覆盖的函数定义
+const templateEditSubmitOk = () => {
+  templateEditVisible.value = false;
+  historyRef.value?.queryList();
+  templateRef.value?.queryList();
+};
+// onBeforeMount(() => {});
+// 刚进页面默认显示门诊病历
+const selectDefaultTemplate = () => {
+  nextTick(() => {
+    // 查找门诊病历(1.0.0)节点
+    const findTemplate = (nodes) => {
+      for (const node of nodes) {
+        if (node.children && node.children.length > 0) {
+          const found = findTemplate(node.children);
+          if (found) {
+            return found;
+          }
+        }
+        // 根据ID查找门诊病历模板
+        if (node.document && node.document.id === '1963474077201162242') {
+          return node;
+        }
+      }
+      return null;
+    };
+
+    const defaultTemplate = findTemplate(templateData.value);
+    if (defaultTemplate) {
+      // 模拟点击节点
+      const mockNode = {
+        isLeaf: true,
+      };
+      handleNodeClick(defaultTemplate, mockNode);
+    }
+  });
+};
+onMounted(async () => {
+  console.log('hospitalizationEmr mounted', userStore);
+  await queryTemplateTree();
+  selectDefaultTemplate();
+});
+
+defineExpose({ state });
+
+const disNode = () => {
+  leftShow.value = !leftShow.value;
+};
+const disNode_R = () => {
+  rightShow.value = !rightShow.value;
+};
+</script>
+<style lang="scss" scoped>
+.emr-use-container {
+  display: flex;
+  height: 100%;
+  img {
+    width: 200%;
+    height: 200%;
+  }
+  .disBtn {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+  }
+  .disLeftBtnNor {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    left: 18%;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(-90deg);
+    }
+  }
+  .disLeftBtnAct {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    left: 0;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(90deg);
+    }
+  }
+  .disRightBtnNor {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    right: 18.5%;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(90deg);
+    }
+  }
+  .disRightBtnAct {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    right: 0;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(-90deg);
+    }
+  }
+
+  .template-tree-container {
+    border-right: 1px solid #ebeef5;
+    width: 300px;
+    flex: none;
+    height: 100%;
+    padding: 0 8px 8px 0;
+    display: flex;
+    flex-direction: column;
+
+    .search-box {
+      height: 40px;
+      display: flex;
+      align-items: center;
+      flex: none;
+      border-bottom: 1px solid #ebeef5;
+    }
+
+    .template-tree-scrollbar {
+      height: calc(100% - 48px);
+      flex: auto;
+      overflow-y: auto;
+    }
+  }
+
+  .operate-container {
+    width: 100%;
+    //width: 300px;
+    //flex: auto;
+    display: flex;
+    flex-direction: column;
+    padding: 0 8px 8px 8px;
+
+    .operate-btns {
+      height: 40px;
+      flex: none;
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid #ebeef5;
+    }
+
+    .operate-main {
+      height: calc(100vh - 150px);
+      flex: auto;
+    }
+    .operate-main .template-tree-scrollbar {
+      height: 100%;
+      overflow-y: auto;
+    }
+  }
+
+  .quickly-container {
+    border-left: 1px solid #ebeef5;
+    width: 300px;
+    padding: 0 8px 8px 8px;
+    flex: none;
+    .el-tabs {
+      height: 100%;
+    }
+  }
+}
+
+@layer utilities {
+  .transition-width {
+    transition-property: width;
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    transition-duration: 300ms;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderBindInfo.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderBindInfo.vue
new file mode 100644
index 00000000..a243253d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderBindInfo.vue
@@ -0,0 +1,210 @@
+<!-- consumableDialog.vue -->
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="绑定耗材"
+    width="700px"
+    :close-on-click-modal="false"
+    :before-close="handleClose"
+  >
+    <div class="consumable-dialog">
+      <div class="dialog-header">
+        <el-alert
+          title="该诊疗项目已绑定所需耗材，可修改数量或删除不需要的耗材，点击确定将自动添加到医嘱列表"
+          type="warning"
+          show-icon
+          :closable="false"
+        />
+      </div>
+
+      <div class="table-container">
+        <el-table
+          ref="consumableTableRef"
+          :data="consumableList"
+          row-key="orderDefinitionId"
+          border
+          style="width: 100%"
+        >
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column prop="orderDefinitionName" align="center" label="项目名称" />
+          <el-table-column prop="unitCodeName" label="单位" align="center" width="80">
+            <template #default="scope">
+              {{ scope.row.unitCodeName || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量/执行次数" align="center" width="120">
+            <template #default="scope">
+              <el-input-number
+                v-model="scope.row.quantity"
+                :min="1"
+                size="small"
+                controls-position="right"
+                style="width: 100%"
+                @change="handleQuantityChange(scope.row)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="80" align="center" fixed="right">
+            <template #default="scope">
+              <el-button type="danger" link size="small" @click="handleDeleteRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 下次不再提示复选框 -->
+      <div class="dont-show-again">
+        <el-checkbox v-model="dontShowAgain" @change="handleDontShowAgainChange">
+          下次不再提示
+        </el-checkbox>
+      </div>
+    </div>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button ref="submitRef" type="primary" @click="handleSubmit">确定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { ref, nextTick, onBeforeUnmount } from 'vue';
+import useUserStore from '@/store/modules/user';
+
+const dialogVisible = ref(false);
+const consumableList = ref([]);
+const consumableTableRef = ref();
+const submitRef = ref();
+const dontShowAgain = ref(false); // 下次不再提示的状态
+const userStore = useUserStore();
+
+// 定义事件
+const emit = defineEmits(['submit']);
+
+// 键盘事件处理函数
+const handleKeyDown = (event) => {
+  // 检查是否按下了回车键
+  if (event.key === 'Enter' && dialogVisible.value) {
+    event.preventDefault();
+    handleSubmit();
+  }
+};
+
+// 打开弹窗方法
+const open = (data) => {
+  consumableList.value = data;
+  dialogVisible.value = true;
+
+  // 默认全选
+  nextTick(() => {
+    if (consumableTableRef.value) {
+      consumableList.value.forEach((row) => {
+        consumableTableRef.value.toggleRowSelection(row, true);
+      });
+    }
+
+    // 注册键盘事件监听器
+    document.addEventListener('keydown', handleKeyDown);
+  });
+};
+
+// 关闭弹窗方法
+const handleClose = () => {
+  // 移除键盘事件监听器
+  document.removeEventListener('keydown', handleKeyDown);
+  dialogVisible.value = false;
+  consumableList.value = [];
+};
+
+// 页面卸载前清理事件监听器
+onBeforeUnmount(() => {
+  document.removeEventListener('keydown', handleKeyDown);
+});
+
+// 数量变化处理
+const handleQuantityChange = (row) => {
+  if (row.quantity < 1) {
+    row.quantity = 1;
+  }
+};
+
+// 删除行处理
+const handleDeleteRow = (row) => {
+  ElMessageBox.confirm(`确定要删除 "${row.orderDefinitionName}" 吗？`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    const index = consumableList.value.findIndex(
+      (item) => item.orderDefinitionId === row.orderDefinitionId
+    );
+    if (index > -1) {
+      consumableList.value.splice(index, 1);
+    }
+  });
+};
+
+// 提交处理
+const handleSubmit = () => {
+  const selectedRows = consumableTableRef.value.getSelectionRows();
+  // 保存到本地存储
+  localStorage.setItem('doctor' + userStore.id.toString(), dontShowAgain.value);
+  if (selectedRows.length === 0) {
+    ElMessage.warning('请至少选择一项耗材');
+    return;
+  }
+  // 发送事件给父组件
+  emit('submit', selectedRows);
+  // 关闭弹窗并清理事件监听器
+  document.removeEventListener('keydown', handleKeyDown);
+  dialogVisible.value = false;
+  consumableList.value = [];
+};
+
+// 暴露方法给父组件
+defineExpose({
+  open,
+  close: handleClose,
+});
+</script>
+<style lang="scss" scoped>
+.consumable-dialog {
+  .dialog-header {
+    margin-bottom: 20px;
+  }
+
+  .table-container {
+    margin-bottom: 20px;
+  }
+
+  .dont-show-again {
+    margin-top: 10px;
+    text-align: left;
+  }
+
+  .dialog-footer-summary {
+    text-align: right;
+
+    .summary-text {
+      font-size: 14px;
+      color: #606266;
+
+      .total-amount {
+        font-size: 16px;
+        font-weight: bold;
+        color: #e64545;
+      }
+    }
+  }
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
index 2dc38fa3..6fcf9206 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue
@@ -42,7 +42,7 @@ const props = defineProps({
   organizationId: {
     type: String,
     required: true,
-  }
+  },
 });
 
 const drawer = ref(false);
@@ -59,7 +59,7 @@ function handleOpen() {
   getList();
 }
 
-function handelRadioChange(value){
+function handelRadioChange(value) {
   switch (value) {
     case 1:
       orderList.value = result.value.personalList;
@@ -74,24 +74,14 @@ function handelRadioChange(value){
 }
 
 function handleUseOrderGroup(row) {
-  // let value = JSON.parse(row.groupJson);
-  // value = value.map((item) => {
-  //   return {
-  //     ...item,
-  //     conditionId: props.diagnosis.conditionId,
-  //     conditionDefinitionId: props.diagnosis.definitionId,
-  //   };
-  // });
-  // value.conditionId = props.diagnosis.conditionId;
-  // value.conditionDefinitionId = props.diagnosis.definitionId;
   emit('useOrderGroup', row.detailList);
   drawer.value = false;
 }
 
 function getList() {
   getOrderGroup({ organizationId: props.organizationId }).then((res) => {
-    result.value = res.data
-    orderList.value = res.data.organizationList;
+    result.value = res.data;
+    handelRadioChange(queryParams.value.rangeCode);
   });
 }
 
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
index ff3c339e..211af037 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
@@ -19,7 +19,7 @@
           <span>{{ item.prescriptionNo }}</span>
         </div>
         <div style="text-align: center">
-          <h2>医院</h2>
+          <h2>长春大学医院</h2>
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>
@@ -76,7 +76,7 @@
         <div class="medicen-list">
           <div
             style="margin-bottom: 3px"
-            v-for="(medItem, index) in item.prescriptionInfoDetail"
+            v-for="(medItem, index) in item.prescriptionInfoDetailList"
             :key="medItem.requestId"
           >
             <span>{{ index + 1 + '. ' }}</span>
@@ -104,7 +104,7 @@
         <div style="display: flex; justify-content: space-between">
           <div>
             <span class="item-label">医师：</span>
-            <span class="item-value"></span>
+            <span class="item-value">{{ item.practitionerName }}</span>
           </div>
           <div>
             <span class="item-label">收费：</span>
@@ -112,7 +112,7 @@
           </div>
           <div>
             <span class="item-label">合计：</span>
-            <span class="item-value"></span>
+            <span class="item-value">{{ getTotalPrice(item) }}</span>
           </div>
         </div>
         <div style="display: flex; justify-content: space-between">
@@ -139,9 +139,11 @@
     </template>
   </el-dialog>
 </template>
-  
+
 <script setup>
 import { formatDateStr } from '@/utils/index';
+//高精度库
+import Decimal from 'decimal.js';
 const props = defineProps({
   open: {
     type: Boolean,
@@ -154,6 +156,17 @@ const props = defineProps({
 });
 const emit = defineEmits(['close']);
 
+//合计
+function getTotalPrice(item) {
+  let totalPrice = new Decimal(0);
+  item.prescriptionInfoDetailList.forEach((medItem) => {
+    const price = new Decimal(medItem.totalPrice);
+    const qty = new Decimal(medItem.quantity);
+    totalPrice = totalPrice.plus(price.times(qty));
+  });
+  return totalPrice.toNumber();
+}
+
 function close() {
   emit('close');
 }
@@ -202,4 +215,4 @@ function clickRow(row) {
   width: 87px;
   display: inline-block;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index c9034b14..725f1ef6 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -126,7 +126,7 @@
                   <el-form-item prop="lotNumber" label="药房：">
                     <el-select
                       v-model="scope.row.inventoryId"
-                      style="width: 400px; margin-right: 20px"
+                      style="width: 330px; margin-right: 20px"
                       placeholder="药房"
                     >
                       <el-option
@@ -167,7 +167,11 @@
                   </el-form-item>
                   <span class="medicine-info"> 注射药品：{{ scope.row.injectFlag_enumText }} </span>
                   <span class="total-amount">
-                    总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
+                    总金额：{{
+                      scope.row.totalPrice
+                        ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
+                        : '0.00 元'
+                    }}
                   </span>
                 </div>
                 <div style="display: flex; align-items: center; gap: 12px; flex-wrap: wrap">
@@ -198,11 +202,7 @@
                     >
                       <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']
-                          "
+                          v-if="item.type == unitMap['minUnit']"
                           :value="item.value"
                           :label="item.label"
                         />
@@ -264,6 +264,8 @@
                       >
                         <el-option
                           v-for="dict in method_code"
+                          @click="() => (scope.row.methodCode_dictText = dict.label)"
+                          @keyup="handleEnter('methodCode', scope.row, scope.$index)"
                           :key="dict.value"
                           :label="dict.label"
                           :value="dict.value"
@@ -292,12 +294,14 @@
                             if (!value) {
                               handleEnter('rateCode', scope.row, scope.$index);
                             }
+                            // inputRefs.rateCode.blur();
                           }
                         "
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].rateCode = el; }"
                       >
                         <el-option
                           v-for="dict in rate_code"
+                          @click="() => (scope.row.rateCode_dictText = dict.label)"
                           :key="dict.value"
                           :label="dict.label"
                           :value="dict.value"
@@ -371,7 +375,7 @@
                     >
                       <template v-for="item in scope.row.unitCodeList" :key="item.value">
                         <el-option
-                          v-if="item.type != unitMap['dose']"
+                          v-if="checkUnit(item, scope.row)"
                           :value="item.value"
                           :label="item.label"
                           @click="
@@ -750,7 +754,12 @@
                       />
                     </el-form-item>
                     <span class="total-amount">
-                      总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
+                      总金额：
+                      {{
+                        scope.row.totalPrice
+                          ? Number(scope.row.totalPrice).toFixed(2) + ' 元'
+                          : '0.00 元'
+                      }}
                     </span>
                     <span style="font-size: 16px; font-weight: 600">
                       <!-- 金额: {{ scope.row.priceList[0].price }} -->
@@ -798,7 +807,7 @@
       <!-- 医嘱类型列 -->
       <el-table-column label="医嘱类型" align="center" width="120">
         <template #default="scope">
-          <template v-if="getRowDisabled(scope.row)">
+          <template v-if="scope.row.isEdit">
             <el-select
               v-model="scope.row.adviceType"
               :ref="'adviceTypeRef_' + prescription.id + '_' + scope.$index"
@@ -832,7 +841,11 @@
                 :popoverVisible="scope.row.showPopover"
                 :adviceQueryParams="adviceQueryParams"
                 :patientInfo="props.patientInfo"
-                @selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
+                @selectAdviceBase="
+                  (row) => {
+                    selectAdviceBase(scope.row.uniqueKey, row);
+                  }
+                "
               />
               <template #reference>
                 <el-input
@@ -841,6 +854,7 @@
                   placeholder="请选择项目"
                   @input="handleChange"
                   @click="handleFocus(scope.row, scope.$index)"
+                  @blur="handleBlur(scope.row)"
                   @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
                   @keydown="handleInputKeyDown(scope.row, $event)"
                   @blur="handleBlur(scope.row)"
@@ -964,9 +978,38 @@
       :patientInfo="props.patientInfo"
       @userPrescriptionHistory="handleSaveHistory"
     />
+    <OrderBindInfo ref="orderBindInfoRef" @submit="handleOrderBindInfo" />
   </div>
+  <!-- 打印机选择对话框 -->
+  <!-- <el-dialog
+    v-model="isPrinterDialogVisible"
+    title="选择打印机"
+    width="400px"
+    :before-close="cancelPrinter"
+  >
+    <div class="printer-dialog-content">
+      <el-form label-position="top">
+        <el-form-item label="可用打印机">
+          <el-select v-model="selectedPrinter" placeholder="请选择打印机" style="width: 100%">
+            <el-option
+              v-for="printer in printerList"
+              :key="printer.name"
+              :label="printer.name"
+              :value="printer.name"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="cancelPrinter">取消</el-button>
+        <el-button type="primary" @click="confirmPrinter">确定</el-button>
+      </span>
+    </template>
+  </el-dialog> -->
 </template>
-      
+
 <script setup>
 import {
   getDiagnosisDefinitionList,
@@ -981,16 +1024,25 @@ import {
   updateGroupId,
   getContract,
   getAdviceBaseInfo,
-  getActivityBindDevice,
+  getBindDevice,
 } from '../api';
 import adviceBaseList from '../adviceBaseList.vue';
 import { computed, getCurrentInstance, nextTick, watch, unref, reactive } from 'vue';
 import { calculateQuantityByDays, formatNumber } from '@/utils/his';
 import OrderGroupDrawer from './orderGroupDrawer';
 import PrescriptionHistory from './prescriptionHistory';
+import OrderBindInfo from './orderBindInfo';
 import Decimal from 'decimal.js';
 import useUserStore from '@/store/modules/user';
-import { ElMessageBox } from 'element-plus';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import { ArrowDown } from '@element-plus/icons-vue';
+import { advicePrint } from '@/api/public';
+// import printUtils, {
+//   PRINT_TEMPLATE,
+//   getPrinterList,
+//   getCachedPrinter,
+//   savePrinterToCache,
+// } from '@/utils/printUtils';
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
@@ -1006,7 +1058,6 @@ const adviceQueryParams = ref({
 });
 const rowIndex = ref(-1);
 const groupIndex = ref(1);
-const groupIndexList = ref([]);
 const diagnosisList = ref([]);
 const nextId = ref(1);
 const unitCodeList = ref([]);
@@ -1047,6 +1098,7 @@ const props = defineProps({
   },
 });
 const isAdding = ref(false);
+const isSaving = ref(false);
 const prescriptionRef = ref();
 const expandOrder = ref([]); //目前的展开行
 const stockList = ref([]);
@@ -1054,6 +1106,7 @@ const contractList = ref([]);
 const conditionId = ref('');
 const accountId = ref('');
 const checkAll = ref(false);
+const bindMethod = ref({});
 const { proxy } = getCurrentInstance();
 const inputRefs = ref({}); // 存储输入框实例，格式: { rowIndex: { fieldName: el } }
 const requiredProps = ref([]); // 存储必填项 prop 顺序
@@ -1164,7 +1217,6 @@ watch(
   () => prescriptionList.value,
   (newVlaue) => {
     if (newVlaue && newVlaue.length > 0) {
-      console.log(prescriptionList.value, 'prescriptionList.value');
       handleTotalAmount();
     }
   },
@@ -1256,16 +1308,16 @@ function handleAdviceTypeChange(row, index) {
 function handleTotalAmount() {
   totalAmount.value = prescriptionList.value.reduce((accumulator, currentRow) => {
     if (currentRow.chargeStatus != 8) {
-      return accumulator + (Number(currentRow.totalPrice) || 0);
+      return new Decimal(accumulator).add(currentRow.totalPrice || 0);
     } else {
-      return 0;
+      // 跳过已退费项目，保持累加结果不变
+      return accumulator;
     }
-  }, 0);
+  }, new Decimal(0));
 }
 getList();
 function getList() {
   getDiagnosisDefinitionList(queryParams.value).then((res) => {
-    // prescriptionList.value = res.data.records;
     total.value = res.data.total;
   });
 }
@@ -1565,6 +1617,16 @@ function clickRow(row, column, cell, event, prescriptionId) {
   emit('selectDiagnosis', row);
 }
 
+function checkUnit(item, row) {
+  if (item.type == 'dose') {
+    return false;
+  } else if (row.partAttributeEnum == '2' && item.type == 'minUnit') {
+    return false;
+  } else {
+    return true;
+  }
+}
+
 // 行双击打开编辑块，仅待发送的可编辑
 function clickRowDb(row, event, prescriptionId) {
   // 如果传入了处方ID，先切换到该处方
@@ -1573,9 +1635,7 @@ function clickRowDb(row, event, prescriptionId) {
   }
   
   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;
     // 确保只有当前行展开，先清空数组再添加当前行的uniqueKey
@@ -2018,11 +2078,12 @@ function handleDelete(prescriptionId) {
   let sum = 0; // 未保存总数量
   for (let i = prescriptionList.value.length - 1; i >= 0; i--) {
     let deleteItem = prescriptionList.value[i];
+    let index = selectRows.findIndex((item) => item.uniqueKey === deleteItem.uniqueKey);
     // 通过requestId判断是否已保存，如果选中项未保存 直接从数组中移除，如果已保存，调接口删除
-    if (deleteItem.check && deleteItem.statusEnum == 1 && !deleteItem.requestId) {
+    if (index != -1 && deleteItem.statusEnum == 1 && !deleteItem.requestId) {
       prescriptionList.value.splice(i, 1);
       sum++;
-    } else if (deleteItem.check && deleteItem.statusEnum == 1 && deleteItem.requestId) {
+    } else if (index != -1 && deleteItem.statusEnum == 1 && deleteItem.requestId) {
       deleteList.push({
         requestId: deleteItem.requestId,
         dbOpType: '3',
@@ -2037,14 +2098,12 @@ function handleDelete(prescriptionId) {
   adviceQueryParams.value.categoryCode = undefined;
   if (sum == selectRow.length) {
     proxy.$modal.msgSuccess('删除成功');
-    groupIndexList.value = [];
     return;
   }
   if (deleteList.length > 0) {
     savePrescription({ adviceSaveList: deleteList }).then((res) => {
       if (res.code == 200) {
         proxy.$modal.msgSuccess('删除成功');
-        groupIndexList.value = [];
         getListInfo(false);
       }
     });
@@ -2052,7 +2111,6 @@ function handleDelete(prescriptionId) {
     proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
     return;
   }
-  groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
 }
 
 // 选择药房/耗材房处理
@@ -2173,9 +2231,11 @@ function handleEmrTreatment() {
   // 病历辅助检查字符串拼接
   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 +=
@@ -2188,9 +2248,22 @@ function handleEmrTreatment() {
           item.methodCode_dictText +
           '；  ';
         treatmentIndex++;
+      } else if (item.adviceType == 2) {
+        // 诊疗项目
+        treatment += '诊疗[' + (index + 1) + ']' + '  ';
+        treatment += item.adviceName + '  ';
+        if (item.quantity) {
+          treatment += '数量：' + item.quantity + item.unitCode_dictText + '  ';
+        }
+        treatment += '频次：' + item.rateCode_dictText + '  ';
+        if (item.methodCode_dictText) {
+          treatment += '方式：' + item.methodCode_dictText + '  ';
+        }
+        treatment += '；  ';
       } else if (item.adviceType == 3) {
-        treatment += '[' + (index + 1) + ']' + '  ';
-        treatment += item.adviceName + '；  ';
+        // 检查项目
+        auxiliaryExamination += '[' + (index + 1) + ']' + '  ';
+        auxiliaryExamination += item.adviceName + '；  ';
         auxiliaryExaminationIndex++;
       }
     }
@@ -2207,23 +2280,79 @@ function handleEmrTreatment() {
   });
 }
 
-function handleClickOutside(row, index) {
-  nextTick(() => {
-    handleSaveSign(row, index);
-  });
-}
+function stockFormat(partPercent, unitList, quantity) {
+  let unitCode = unitList.find((item) => {
+    return item.type == 'unit';
+  })?.label;
+  let minUnitCode = unitList.find((item) => {
+    return item.type == 'minUnit';
+  })?.label;
 
-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 + ' ' + unitCode;
   }
-  return b + ' ' + unit + ' ' + a + ' ' + minUnit;
+  return b + ' ' + unitCode + ' ' + a + ' ' + minUnitCode;
 }
 
+// 处理自动带出的诊疗或者耗材
+function handleOrderBindInfo(bindIdInfo) {
+  const adviceDefinitionIds = bindIdInfo.map((row) => row.orderDefinitionId);
+  getAdviceBaseInfo({ adviceDefinitionIdParamList: adviceDefinitionIds.join(',') }).then((res) => {
+    const list = res.data.records.map((item) => {
+      const info = bindIdInfo.find((k) => k.orderDefinitionId == item.adviceDefinitionId);
+      return {
+        ...item,
+        quantity: info.quantity,
+        unitCode: info.unitCode,
+      };
+    });
+
+    list?.forEach((item) => {
+      rowIndex.value = prescriptionList.value.length;
+      setValue(item);
+
+      // 创建新的处方项目
+      const newRow = {
+        ...prescriptionList.value[rowIndex.value],
+        uniqueKey: nextId.value++,
+        patientId: props.patientInfo.patientId,
+        encounterId: props.patientInfo.encounterId,
+        accountId: accountId.value,
+        quantity: item.quantity,
+        methodCode: item.methodCode,
+        rateCode: item.rateCode,
+        dispensePerDuration: item.dispensePerDuration,
+        dose: item.dose,
+        doseQuantity: item.doseQuantity,
+        executeNum: 1,
+        unitCode: item.unitCode,
+        unitCode_dictText: item.unitCodeName || '',
+        statusEnum: 1,
+        dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
+        conditionId: conditionId.value,
+        conditionDefinitionId: conditionDefinitionId.value,
+        encounterDiagnosisId: encounterDiagnosisId.value,
+      };
+
+      // 计算价格和总量
+      const unitInfo = unitCodeList.value.find((k) => k.value == item.unitCode);
+      if (unitInfo && unitInfo.type == 'minUnit') {
+        newRow.price = newRow.minUnitPrice;
+        newRow.totalPrice = (item.quantity * newRow.minUnitPrice).toFixed(6);
+        newRow.minUnitQuantity = item.quantity;
+      } else {
+        newRow.price = newRow.unitPrice;
+        newRow.totalPrice = (item.quantity * newRow.unitPrice).toFixed(6);
+        newRow.minUnitQuantity = item.quantity * item.partPercent;
+      }
+
+      newRow.contentJson = JSON.stringify(newRow);
+      prescriptionList.value[rowIndex.value] = newRow;
+    });
+  });
+}
 // 单行处方保存
 function handleSaveSign(row, index, prescriptionId) {
   // 如果传入了处方ID，先切换到该处方
@@ -2272,6 +2401,29 @@ function handleSaveSign(row, index, prescriptionId) {
   
   formRef.validate((valid) => {
     if (valid) {
+      if (row.adviceType != 2) {
+        // 1:用法绑东西 2:诊疗绑东西
+        let typeCode = row.adviceType == 1 ? '1' : '2';
+        // 用法字典值/诊疗定义id
+        let itemNo = row.adviceType == 1 ? row.methodCode : row.adviceDefinitionId;
+        getBindDevice({ typeCode: typeCode, itemNo: itemNo }).then((res) => {
+          if (res.data.length == 0) {
+            return;
+          }
+          // 是否需要打开弹窗
+          let openBindDialog = localStorage.getItem('doctor' + userStore.id);
+          if (!JSON.parse(openBindDialog)) {
+            proxy.$refs['orderBindInfoRef'].open(res.data);
+          } else {
+            // 如果弹窗不提示带出的项目，自动带出
+            // 如果有未签发的项目，并且当前的项目没有带出过绑定项目，则自动带出
+            if (!bindMethod.value[itemNo]) {
+              handleOrderBindInfo(res.data);
+              bindMethod.value[itemNo] = true;
+            }
+          }
+        });
+      }
       row.isEdit = false;
       isAdding.value = false;
       updateExpandOrder([]);
@@ -2453,23 +2605,17 @@ function handleSaveBatch(prescriptionId) {
 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',
-    });
-  }
+  unitCodeList.value.push({
+    value: row.doseUnitCode,
+    label: row.doseUnitCode_dictText,
+    type: 'dose',
+  });
+
+  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,
@@ -2527,10 +2673,9 @@ function setValue(row) {
           return item.quantity > 0 && item.locationId == row.positionId;
         })[0];
         if (stock == {} || stock == undefined) {
-          proxy.$modal.msgWarning('该项目库存不足，请选择其它库房');
+          proxy.$modal.msgWarning(row.adviceName + '库存不足，请选择其它库房');
+          return;
         }
-        // proxy.$modal.msgWarning('该项目库存不足，请选择其它库房');
-        // return;
       }
       prescriptionList.value[targetIndex].lotNumber = stock.lotNumber;
       prescriptionList.value[targetIndex].inventoryId = stock.inventoryId;
@@ -2539,7 +2684,8 @@ function setValue(row) {
       prescriptionList.value[targetIndex].positionName = stock.locationName;
       prescriptionList.value[targetIndex].minUnitPrice = new Decimal(stock.price)
         .div(row.partPercent)
-        .toFixed(2);
+        .toFixed(6);
+      prescriptionList.value[rowIndex.value].positionName = stock.locationName;
     }
   } else {
   // 执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
@@ -2549,34 +2695,11 @@ function setValue(row) {
 }
 }
 
-// 组套保存
+// 选择组套
 function handleSaveGroup(orderGroupList) {
-  // orderGroupList.map((item) => {
-  //   item.patientId = props.patientInfo.patientId;
-  //   item.encounterId = props.patientInfo.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: props.patientInfo.orgId,
-  // }).then((res) => {
-  // getOrgList();
-  orderGroupList.forEach((item, index) => {
+  orderGroupList.forEach((item) => {
     rowIndex.value = prescriptionList.value.length;
     setValue(item.orderDetailInfos);
-    // let orderGroupValue = orderGroupList.find(
-    //   (k) => k.adviceDefinitionId == item.adviceDefinitionId
-    // );
 
     prescriptionList.value[targetIndex] = {
       ...prescriptionList.value[targetIndex],
@@ -2698,7 +2821,7 @@ function escKeyListener(e) {
       }
       prescriptionList.value.shift();
       isAdding.value = false;
-      groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
+      getGroupMarkers(); // 删除行会出现组号混乱的情况，所以这里重新更新标记
     }
   }
 }
@@ -2712,13 +2835,14 @@ function handleSingOut(prescriptionId) {
   
   let requestIdList = prescriptionList.value
     .filter((item) => {
-      return item.check && item.statusEnum == 2;
+      return item.statusEnum == 2;
     })
     .map((item) => {
       return item.requestId;
     });
   if (requestIdList.length == 0) {
     proxy.$modal.msgWarning('请选择已签发医嘱撤回');
+    return;
   }
   singOut(requestIdList).then((res) => {
     if (res.code == 200) {
@@ -2726,12 +2850,11 @@ function handleSingOut(prescriptionId) {
       getListInfo(false);
     }
   });
+  prescriptionRef.value.clearSelection();
 }
 
 function handleGroupId(paramList) {
-  updateGroupId(paramList).then(() => {
-    getListInfo(false);
-  });
+  updateGroupId(paramList);
 }
 
 // 组合
@@ -2747,31 +2870,22 @@ function combination(prescriptionId) {
     proxy.$modal.msgWarning('至少选择两项');
     return;
   }
-
   // 相同分组用法需要相同
   let uniqueValues = new Set();
   // 相同分组诊断需要相同
   let uniqDiagnosis = new Set();
-  // 相同分组诊断需要相同
-  let uniqInjectFlag = new Set();
+  // 相同状态
+  let statusEnum = new Set();
   let status = false;
-  let isSave = false;
-  groupIndexList.value.forEach((index) => {
-    if (prescriptionList.value[index].statusEnum == 2) {
+  selectRows.forEach((item) => {
+    if (item.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);
+    uniqueValues.add(item.methodCode);
+    uniqDiagnosis.add(item.diagnosisName);
+    statusEnum.add(item.statusEnumf);
   });
   // 校验是否有已签发的医嘱
-  if (isSave) {
-    proxy.$modal.msgWarning('请先保存当前医嘱后再进行分组');
-    return;
-  }
   if (status) {
     proxy.$modal.msgWarning('已签发医嘱不允许分组');
     return;
@@ -2784,28 +2898,31 @@ function combination(prescriptionId) {
     proxy.$modal.msgWarning('同一分组诊断必须相同');
     return;
   }
-  if (uniqInjectFlag.size != 1) {
-    proxy.$modal.msgWarning('同一分组必须全部为输液药品');
+  if (statusEnum.size != 1) {
+    proxy.$modal.msgWarning('不同状态医嘱无法组合');
     return;
   }
   // 获取当前时间戳拼接组号做唯一组号
   let timestamp = Date.now().toString();
   let updateList = [];
-  groupIndexList.value.forEach((index) => {
+
+  selectRows.forEach((item) => {
+    // 直接更新表格数据中的groupId
+    const index = prescriptionList.value.findIndex((row) => row.uniqueKey === item.uniqueKey);
+    if (index !== -1) {
+      prescriptionList.value[index].groupId = timestamp + groupIndex.value;
+    }
     updateList.push({
-      requestId: prescriptionList.value[index].requestId,
+      requestId: item.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 = [];
+  if (selectRows[0].statusEnum == 1 && selectRows[0].requestId) {
+    // 更新组号
+    handleGroupId({ groupList: updateList });
+  }
+  prescriptionRef.value.clearSelection();
+  getGroupMarkers(); // 更新标记
 }
 
 // 拆组
@@ -2819,84 +2936,51 @@ function split(prescriptionId) {
     proxy.$modal.msgWarning('至少选择一项');
     return;
   }
-
-  // 获取选中的所有行
-  const selectedRows = groupIndexList.value.map((index) => prescriptionList.value[index]);
-
   // 校验是否包含已签发的医嘱
-  if (selectedRows.some((row) => row.statusEnum === 2)) {
+  if (selectRows.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) {
+  if (selectRows.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: '',
-        }))
-      );
+  selectRows.forEach((item) => {
+    // 直接更新表格数据中的groupId
+    const index = prescriptionList.value.findIndex((row) => row.uniqueKey === item.uniqueKey);
+    if (index !== -1) {
+      prescriptionList.value[index].groupId = undefined;
     }
+    updateList.push({
+      requestId: item.requestId,
+      groupId: null,
+    });
   });
-
-  // 清除本地数据中的 groupId
-  prescriptionList.value.forEach((item) => {
-    if (updateList.some((u) => u.requestId === item.requestId)) {
-      item.groupId = undefined;
-      item.check = false; // 取消勾选
-    }
-  });
-
-  // 更新分组号
-  handleGroupId({ groupList: updateList });
-
+  if (selectRows[0].statusEnum == 1 && selectRows[0].requestId) {
+    // 更新组号
+    handleGroupId({ groupList: updateList });
+  }
+  prescriptionRef.value.clearSelection();
   // 更新分组标记
-  groupMarkers.value = getGroupMarkers(prescriptionList.value);
-
-  // 排序保持一致性
-  sortPrescriptionList();
-
-  // 清空选中索引
-  groupIndexList.value = [];
-
+  getGroupMarkers();
   proxy.$modal.msgSuccess('拆组成功');
 }
 // 分组标记处理
-function getGroupMarkers(prescriptionList) {
-  const groupMap = {};
-  const markers = [];
+function getGroupMarkers() {
+  // 初始化所有行的 groupIcon 为 null
+  prescriptionList.value.forEach((item) => {
+    item.groupIcon = null;
+  });
 
-  // 遍历处方列表，记录每组的索引范围（忽略无 groupId 的项）
-  prescriptionList.forEach((item, index) => {
+  // 创建一个映射来存储每个 groupId 对应的行索引
+  const groupMap = {};
+
+  // 遍历处方列表，按 groupId 分组（忽略无 groupId 的项）
+  prescriptionList.value.forEach((item, index) => {
     if (!item.groupId) {
-      markers[index] = null; // 没有组号的标记为 null
       return;
     }
 
@@ -2906,37 +2990,36 @@ function getGroupMarkers(prescriptionList) {
     groupMap[item.groupId].push(index);
   });
 
-  // 根据每组的索引范围设置标记
+  // 为每个组设置 groupIcon
   Object.values(groupMap).forEach((indices) => {
-    if (indices.length === 1) {
-      // 单个组成员，显示上下括号
-      markers[indices[0]] = 'all';
-    } else {
+    // 只有当组内元素大于1个时才需要显示分组标记
+    if (indices.length > 1) {
       indices.forEach((index, i) => {
         if (i === 0) {
-          markers[index] = '┏';
+          // 第一行
+          prescriptionList.value[index].groupIcon = '┏';
         } else if (i === indices.length - 1) {
-          markers[index] = '┗';
+          // 最后一行
+          prescriptionList.value[index].groupIcon = '┗';
         } else {
-          markers[index] = '┃';
+          // 中间行
+          prescriptionList.value[index].groupIcon = '┃';
         }
       });
     }
   });
-  return markers;
 }
-const groupMarkers = ref([]);
 
 // 计算总价
 function calculateTotalPrice(row, index) {
   nextTick(() => {
     if (row.adviceType == 3) {
-      row.totalPrice = (row.unitPrice * row.quantity * 100) / 100;
+      row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
     } else {
       if (row.unitCode == row.minUnitCode) {
-        row.totalPrice = row.minUnitPrice * row.quantity;
+        row.totalPrice = (row.minUnitPrice * row.quantity).toFixed(6);
       } else {
-        row.totalPrice = (row.unitPrice * row.quantity * 100) / 100;
+        row.totalPrice = (row.unitPrice * row.quantity).toFixed(6);
       }
     }
   });
@@ -2945,7 +3028,7 @@ function calculateTotalPrice(row, index) {
 // 单位切换时 自动计算对应单位的总量
 function convertValues(row, index) {
   nextTick(() => {
-    let code = unitCodeList.value.filter((item) => {
+    let code = row.unitCodeList.filter((item) => {
       return item.value == row.doseUnitCode;
     })[0];
 
@@ -2966,13 +3049,13 @@ function convertValues(row, index) {
         break;
     }
   });
-  calculateTotalAmount(row, index);
+  // calculateTotalAmount(row, index);
 }
 
 // 单次剂量数量改变时自动计算总量
 function convertDoseValues(row, index) {
   nextTick(() => {
-    let code = unitCodeList.value.filter((item) => {
+    let code = row.unitCodeList.filter((item) => {
       return item.value == row.doseUnitCode;
     })[0];
 
@@ -2993,7 +3076,7 @@ function convertDoseValues(row, index) {
         break;
     }
   });
-  calculateTotalAmount(row, index);
+  // calculateTotalAmount(row, index);
 }
 
 // 总量计算,仅适用只有两种单位的情况
@@ -3002,7 +3085,7 @@ function calculateTotalAmount(row, index) {
     // 项目为西药或中成药时，根据用药天数和用药频次自动计算总量
     if (row.adviceType == 1 || row.adviceType == 2) {
       if (row.rateCode && row.dispensePerDuration) {
-        // 根据用药天数和用药频次计算数量
+        // 根据用药天数和用药频次计算数量，医生按顺序填的情况
         let count = calculateQuantityByDays(row.rateCode, row.dispensePerDuration);
         if (count) {
           let quantity;
@@ -3038,6 +3121,13 @@ function calculateTotalAmount(row, index) {
             }
           }
         }
+      } else if (row.quantity) {
+        // 如果医生开药先填总量 直接计算总价格
+        if (row.unitCode == row.minUnitCode) {
+          prescriptionList.value[index].totalPrice = (row.quantity * row.minUnitPrice).toFixed(6);
+        } else {
+          prescriptionList.value[index].totalPrice = (row.quantity * row.unitPrice).toFixed(6);
+        }
       }
     }
   });
@@ -3577,11 +3667,12 @@ function getSignedPrescriptionInfo() {
 
 defineExpose({ getListInfo, getDiagnosisInfo, getSignedPrescriptionInfo });
 </script>
-    
+
 <style lang="scss" scoped>
 :deep(.el-table__expand-icon) {
   display: none !important;
 }
+
 .medicine-title {
   font-size: 16px;
   font-weight: 600;
@@ -3623,6 +3714,7 @@ defineExpose({ getListInfo, getDiagnosisInfo, getSignedPrescriptionInfo });
 .el-input-number .el-input__inner {
   text-align: center;
 }
+
 .el-table__cell .el-form-item--default {
   margin-bottom: 0px;
 }
@@ -3683,4 +3775,4 @@ defineExpose({ getListInfo, getDiagnosisInfo, getSignedPrescriptionInfo });
   display: inline-block !important;
   opacity: 1 !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
index 411d4e31..2aa4d8cc 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue
@@ -10,7 +10,9 @@
   >
     <div class="footer">
       <div class="statistics">
-        <span>共 {{ total }} 个项目</span>
+        <span> 共 </span>
+        <el-tag type="danger" style="font-size: 20px">{{ total }}</el-tag>
+        <span> 个项目 </span>
         <!-- <span class="total">合计金额：¥ {{ totalAmount.toFixed(2) }}</span> -->
       </div>
     </div>
@@ -38,6 +40,7 @@
         v-loading="tableLoading"
         border
         height="600"
+        :span-method="tableSpanMethod"
       >
         <el-table-column
           type="selection"
@@ -50,14 +53,15 @@
             }
           "
         />
+        <el-table-column label="支付单据号" align="center" prop="paymentId" width="180" />
         <el-table-column label="处方号" align="center" prop="prescriptionNo" />
-        <el-table-column label="项目名" align="center" prop="itemName" />
+        <el-table-column label="项目名" align="center" prop="itemName" width="180" />
         <el-table-column label="数量" align="center" prop="quantity" />
         <el-table-column label="单位" align="center" prop="unitCode_dictText" />
         <el-table-column label="收款金额" align="center" prop="totalPrice" />
         <el-table-column label="发放状态" align="center">
           <template #default="scope">
-            <el-tag v-if="scope.row.dispenseStatus != 0" type="default">
+            <el-tag v-if="scope.row.dispenseStatus != 0" type="danger">
               {{ scope.row.dispenseStatus_enumText }}
             </el-tag>
             <el-tag v-else type="default">{{ scope.row.serviceStatus_enumText }}</el-tag>
@@ -110,7 +114,7 @@ const props = defineProps({
     default: '',
   },
 });
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close', 'refresh']);
 const total = ref(0);
 const tableLoading = ref(false);
 const queryParams = ref({
@@ -126,7 +130,6 @@ const totalAmount = ref(0);
 function openDialog() {
   getList();
 }
-
 function getList() {
   refundList.value = [];
   tableLoading.value = true;
@@ -140,6 +143,40 @@ function getList() {
   });
 }
 
+// 计算相同支付单据号的行合并信息（仅对相邻行生效）
+const paymentIdRowSpans = computed(() => {
+  const data = refundList.value || [];
+  const spans = [];
+  let index = 0;
+  while (index < data.length) {
+    let next = index + 1;
+    while (next < data.length && data[next].paymentId === data[index].paymentId) {
+      next++;
+    }
+    const groupSize = next - index;
+    spans[index] = groupSize; // 首行显示合并行数
+    for (let i = index + 1; i < next; i++) {
+      spans[i] = 0; // 其余行隐藏
+    }
+    index = next;
+  }
+  return spans;
+});
+
+function tableSpanMethod({ row, column, rowIndex }) {
+  // 仅合并“支付单据号”列
+  if (column && column.property === 'paymentId') {
+    const rowspan = paymentIdRowSpans.value[rowIndex] ?? 1;
+    return { rowspan, colspan: rowspan > 0 ? 1 : 0 };
+  }
+  // 仅合并“处方号”列
+  if (column && column.property === 'prescriptionNo') {
+    const rowspan = paymentIdRowSpans.value[rowIndex] ?? 1;
+    return { rowspan, colspan: rowspan > 0 ? 1 : 0 };
+  }
+  return { rowspan: 1, colspan: 1 };
+}
+
 function submit() {
   // 1. 获取当前选中行并提取去重的 paymentId 列表
   const selectedRows = proxy.$refs['refundListRef'].getSelectionRows();
@@ -162,6 +199,7 @@ function submit() {
     if (res.code === 200) {
       proxy.$modal.msgSuccess('操作成功');
       getList();
+      emit('refresh');
     }
   });
 
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/store/patient.js b/openhis-ui-vue3/src/views/doctorstation/components/store/patient.js
new file mode 100644
index 00000000..671fec3f
--- /dev/null
+++ b/openhis-ui-vue3/src/views/doctorstation/components/store/patient.js
@@ -0,0 +1,20 @@
+/*
+ * @Author: sjjh
+ * @Date: 2025-04-09 17:55:05
+ * @Description:
+ */
+// import  { IInPatient } from '@/model/IInPatient'
+import { ref } from 'vue';
+
+// 定义护士等级(没接口前mock)
+export const nursingLevel = ref('0');
+
+export function updateNursingLevel(level) {
+  nursingLevel.value = level;
+}
+
+// 选择患者信息
+export const patientInfo = ref();
+export function updatePatientInfo(info) {
+  patientInfo.value = info;
+}
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
index 8ba3deb3..68e5998a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
@@ -1,10 +1,14 @@
 <template>
-  <div style="max-height: 750px; overflow-y: auto;">
-    <div class="prescription-section" v-for="(item, index) in tcmPrescriptionList" :key="index">
+  <div style="max-height: 750px; overflow-y: auto">
+    <div
+      class="prescription-section"
+      v-for="(prescription, pIndex) in tcmPrescriptionList"
+      :key="pIndex"
+    >
       <div class="section-header">
         <div class="title first-prescription">
           <i class="el-icon-notebook-2"></i>
-          <span>{{ '处方' + (index + 1) }}</span>
+          <span>{{ '处方' + (pIndex + 1) }}</span>
           <el-icon
             class="add-icon"
             title="新增处方"
@@ -14,6 +18,7 @@
             <plus />
           </el-icon>
           <el-icon
+<<<<<<< HEAD
             class="delete-icon"
             title="删除处方单"
             @click="handleDeletePrescriptionClick(index)"
@@ -26,15 +31,31 @@
         <div class="summary">
           <span class="summary-item">药品数: {{ getPrescriptionMedicineCount(index) }}种</span>
           <span class="summary-item">总价: ¥ {{ getPrescriptionTotalPrice(index) }}</span>
+=======
+            class="add-icon"
+            title="删除处方"
+            @click="deletePrescription()"
+            style="font-size: 26px !important; margin-left: 10px; color: red"
+          >
+            <Delete />
+          </el-icon>
+        </div>
+        <div class="summary">
+          <span class="summary-item">
+            药品数:
+            {{ prescription.prescriptionList ? prescription.prescriptionList.length : '0' }}种
+          </span>
+          <span class="summary-item">总价: ¥ {{ calculatePrescriptionTotal(pIndex) }}</span>
+>>>>>>> upstream/develop
         </div>
       </div>
       <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 type="primary" @click="handleAddMedicine(pIndex)" plain> 添加药品 </el-button>
+          <el-button type="primary" @click="handleSaveBatch(pIndex)" plain> 保存 </el-button>
+          <el-button type="primary" @click="handleSave(pIndex)" plain> 签发 </el-button>
+          <el-button type="warning" plain @click="handleSingOut(pIndex)"> 撤回 </el-button>
+          <el-button type="danger" plain @click="handleDelete(pIndex)" :disabled="false">
             删除
           </el-button>
         </div>
@@ -43,17 +64,21 @@
           style="padding: 10px 10px 10px 0; margin-left: 0; font-size: 15px"
         >
           <span class="doctor-station" style="margin-left: 0"> 诊断： </span>
-          <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
+          <el-select
+            v-model="prescription.conditionDefinitionId"
+            placeholder="诊断"
+            style="width: 180px"
+          >
             <el-option
               v-for="item in diagnosisList"
               :key="item.definitionId"
               :label="item.name"
               :value="item.definitionId"
-              @click="handleDiagnosisChange(item)"
+              @click="handleDiagnosisChange(item, pIndex)"
             />
           </el-select>
           <span class="doctor-station"> 费用性质： </span>
-          <el-select v-model="accountId" placeholder="费用性质" style="width: 120px">
+          <el-select v-model="prescription.accountId" placeholder="费用性质" style="width: 120px">
             <el-option
               v-for="item in contractList"
               :key="item.accountId"
@@ -61,10 +86,15 @@
               :value="item.accountId"
             />
           </el-select>
+<<<<<<< HEAD
           <span class="doctor-station"> 配方名称： </span>
           <el-input v-model="formulaName" placeholder=" " style="width: 100px" />
           <span class="doctor-station"> 用药途径： </span>
           <el-select v-model="methodCode" placeholder="费用性质" style="width: 120px">
+=======
+          <span class="doctor-station"> 用法： </span>
+          <el-select v-model="prescription.methodCode" placeholder="用法" style="width: 120px">
+>>>>>>> upstream/develop
             <el-option
               v-for="dict in method_code"
               :key="dict.value"
@@ -82,7 +112,7 @@
             />
           </el-select>
           <span class="doctor-station"> 频次： </span>
-          <el-select v-model="rateCode" placeholder="费用性质" style="width: 120px">
+          <el-select v-model="prescription.rateCode" placeholder="频次" style="width: 120px">
             <el-option
               v-for="dict in rate_code"
               :key="dict.value"
@@ -91,40 +121,58 @@
             />
           </el-select>
           <span class="doctor-station"> 用药天数： </span>
-          <el-input v-model="dispensePerDuration" placeholder=" " style="width: 70px" />
+          <el-input
+            v-model="prescription.dispensePerDuration"
+            placeholder=" "
+            style="width: 70px"
+          />
           <span class="doctor-station"> 付数： </span>
           <el-input
-            v-model="chineseHerbsDoseQuantity"
+            v-model="prescription.chineseHerbsDoseQuantity"
             placeholder=" "
             style="width: 70px"
             @input="
               (value) => {
                 let price = 0;
-                prescriptionList.forEach((item) => {
+                prescription.prescriptionList.forEach((item) => {
                   price += item.totalPrice;
                 });
-                totalAmount = dispensePerDuration * value * price;
+                prescription.totalAmount = prescription.dispensePerDuration * value * price;
               }
             "
           />
           <span class="doctor-station"> 是否代煎： </span>
-          <el-checkbox v-model="sufferingFlag" placeholder=" " />
+          <el-checkbox
+            v-model="prescription.sufferingFlag"
+            :true-value="'1'"
+            :false-value="'0'"
+            placeholder=" "
+            @change="
+              (value) => {
+                console.log(value, prescription.sufferingFlag, 123456789);
+              }
+            "
+          />
           <span class="doctor-station" style="float: right"> </span>
         </div>
         <el-table
           max-height="650"
           ref="prescriptionRef"
-          :data="prescriptionList"
+          :data="prescription.prescriptionList"
           row-key="uniqueKey"
           border
           @cell-click="clickRow"
-          @row-dblclick="clickRowDb"
+          @row-dblclick="(row) => clickRowDb(row, pIndex)"
           v-loading="loading"
-          :expand-row-keys="expandOrder"
+          :expand-row-keys="prescription.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">
+              <el-form
+                :model="scope.row"
+                :rules="rowRules"
+                :ref="'formRef' + pIndex + '-' + scope.$index"
+              >
                 <div
                   class="expend_div"
                   style="padding: 16px; background: #f8f9fa; border-radius: 8px"
@@ -167,7 +215,7 @@
                               '/' +
                               item.unitCode_dictText
                             "
-                            @click="handleNumberClick(item, scope.$index)"
+                            @click="handleNumberClick(item, scope.$index, pIndex)"
                           />
                         </el-select>
                       </el-form-item>
@@ -185,7 +233,7 @@
                             controls-position="right"
                             :controls="false"
                             style="width: 70px; margin-right: 20px"
-                            :ref="(el) => (inputRefs.dose = el)"
+                            :ref="(el) => (inputRefs.minUnitQuantity = el)"
                             @input="
                               () => {
                                 nextTick(() => {
@@ -194,7 +242,9 @@
                                 });
                               }
                             "
-                            @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index)"
+                            @keyup.enter.prevent="
+                              handleEnter('minUnitQuantity', scope.row, scope.$index, pIndex)
+                            "
                           />
                         </el-form-item>
                         <!-- 剂量单位 -->
@@ -215,6 +265,7 @@
                             />
                           </template>
                         </el-select>
+<<<<<<< HEAD
                         <span class="doctor-station"> 脚注： </span>
                           <el-select
                             v-model="footNote"
@@ -230,13 +281,35 @@
                               :value="dict.value">
                             </el-option>
                           </el-select>
+=======
+                        <!-- 单次剂量 -->
+                        <el-form-item
+                          label="特殊煎法："
+                          prop="dosageInstruction"
+                          class="required-field"
+                          data-prop="dosageInstruction"
+                        >
+                          <el-select
+                            v-model="scope.row.dosageInstruction"
+                            style="width: 90px; margin-right: 20px"
+                            placeholder=" "
+                          >
+                            <template v-for="item in dosage_instruction" :key="item.value">
+                              <el-option :value="item.value" :label="item.label" />
+                            </template>
+                          </el-select>
+                        </el-form-item>
+>>>>>>> upstream/develop
                       </div>
                       <span class="total-amount">
                         总金额：{{
                           scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元'
                         }}
                       </span>
-                      <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                      <el-button
+                        type="primary"
+                        @click="handleSaveSign(scope.row, scope.$index, pIndex)"
+                      >
                         确定
                       </el-button>
                     </div>
@@ -248,11 +321,11 @@
           <el-table-column label="" align="center" prop="groupId" width="60">
             <template #header>
               <el-checkbox
-                v-model="checkAll"
+                v-model="prescription.checkAll"
                 @change="
                   (value) => {
-                    prescriptionList.forEach((item, index) => {
-                      groupIndexList.push(index);
+                    prescription.prescriptionList.forEach((item, index) => {
+                      prescription.groupIndexList.push(index);
                       item.check = value;
                     });
                   }
@@ -264,7 +337,7 @@
                 v-model="scope.row.check"
                 @dblclick.stop=""
                 placeholder=""
-                @change="(value) => handleCheckBoxChange(value, scope.$index, scope.row)"
+                @change="(value) => handleCheckBoxChange(value, scope.$index, scope.row, pIndex)"
               />
             </template>
           </el-table-column>
@@ -282,17 +355,17 @@
                     :popoverVisible="scope.row.showPopover"
                     :adviceQueryParams="adviceQueryParams"
                     :patientInfo="props.patientInfo"
-                    @selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
+                    @selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row, pIndex)"
                   />
                   <template #reference>
                     <el-input
-                      :ref="'adviceRef' + scope.$index"
+                      :ref="'adviceRef' + pIndex + '-' + 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)"
+                      @click="handleFocus(scope.row, scope.$index, pIndex)"
+                      @keyup.enter.stop="handleFocus(scope.row, scope.$index, pIndex)"
                       @keydown="
                         (e) => {
                           if (!scope.row.showPopover) return;
@@ -344,6 +417,15 @@
               </span>
             </template>
           </el-table-column>
+          <el-table-column label="特殊煎法" align="right" prop="" header-align="center">
+            <template #default="scope">
+              <span v-if="!scope.row.isEdit" style="text-align: right">
+                {{
+                  scope.row.dosageInstruction_dictText ? scope.row.dosageInstruction_dictText : '-'
+                }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="药房/科室" align="center" prop="" width="240">
             <template #default="scope">
               <span v-if="!scope.row.isEdit">
@@ -351,22 +433,6 @@
               </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="diagnosisName" width="200">
             <template #default="scope">
               <span v-if="!scope.row.isEdit">
@@ -399,28 +465,45 @@ import {
 import tcmMedicineList from './tcmMedicineList';
 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 tcmdiagnosisDialog from './tcmdiagnosisDialog';
+import { Delete, Minus } from '@element-plus/icons-vue';
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
 const queryParams = ref({});
-const prescriptionList = ref([]);
-const form = ref({
-  prescriptionList: prescriptionList.value,
-});
+const form = ref({});
 const adviceQueryParams = ref({});
 const rowIndex = ref(-1);
 const groupIndex = ref(1);
-const groupIndexList = ref([]);
 const diagnosisList = ref([]);
-const tcmPrescriptionList = ref([1]);
-const nextId = ref(1);
+const patientId = ref('');
+const encounterId = ref('');
+const accountId = ref('');
+const encounterDiagnosisId = ref('');
+
+const tcmPrescriptionList = ref([
+  {
+    prescriptionList: [],
+    conditionDefinitionId: '',
+    accountId: '',
+    methodCode: '',
+    rateCode: '',
+    dispensePerDuration: '',
+    chineseHerbsDoseQuantity: '',
+    sufferingFlag: '0',
+    checkAll: false,
+    groupIndexList: [],
+    expandOrder: [],
+    totalAmount: 0,
+    nextId: 1,
+    isAdding: false,
+  },
+]);
 const unitCodeList = ref([]);
 const adviceTableRef = ref([]);
 const organization = ref([]);
+<<<<<<< HEAD
 const conditionDefinitionId = ref('');
 const encounterDiagnosisId = ref('');
 const diagnosisName = ref('');
@@ -445,6 +528,11 @@ const rowRules = ref({
   rateCode: [{ required: true, message: '请选择频次', trigger: 'change' }],
   methodCode: [{ required: true, message: '请选择给药途径', trigger: 'change' }],
   orgId: [{ required: true, message: '请选择执行科室', trigger: 'change' }],
+=======
+const loading = ref(false);
+const rowRules = ref({
+  minUnitQuantity: [{ required: true, message: '请输入单次剂量', trigger: 'change' }],
+>>>>>>> upstream/develop
 });
 const unitMap = ref({
   dose: 'dose',
@@ -463,20 +551,18 @@ const props = defineProps({
     type: String,
   },
 });
-const isAdding = ref(false);
 const prescriptionRef = ref();
-const expandOrder = ref([]); //目前的展开行
 const stockList = ref([]);
 const contractList = ref([]);
 const tcmDiagnosisList = 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 tcmDianosis = ref();
+<<<<<<< HEAD
 const { method_code, unit_code, rate_code, method_of_decocting_medicine,hjerbal_footnotes,distribution_category_code } = proxy.useDict(
   'method_code',
   'unit_code',
@@ -508,6 +594,17 @@ const adviceTypeList = ref([
     value: '',
   },
 ]);
+=======
+const { method_code, unit_code, rate_code, distribution_category_code, dosage_instruction } =
+  proxy.useDict(
+    'method_code',
+    'unit_code',
+    'rate_code',
+    'distribution_category_code',
+    'dosage_instruction'
+  );
+
+>>>>>>> upstream/develop
 onMounted(() => {
   document.addEventListener('keydown', escKeyListener);
 });
@@ -515,46 +612,25 @@ onMounted(() => {
 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);
-      });
-    } else {
-      requiredProps.value = {};
-    }
-  }
-);
-watch(
-  () => prescriptionList.value,
-  (newVlaue) => {
-    if (newVlaue && newVlaue.length > 0) {
-      handleTotalAmount();
-    }
-  },
-  { immediate: true }
-);
-function handleTotalAmount() {
-  totalAmount.value = prescriptionList.value.reduce((accumulator, currentRow) => {
-    // if (currentRow.statusEnum != 2) {
-    return accumulator + (Number(currentRow.totalPrice) || 0);
-    // } else {
-    // return accumulator || 0;
-    // }
-  }, 0);
+
+function calculatePrescriptionTotal(pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  if (!prescription.prescriptionList) return 0;
+
+  return prescription.prescriptionList
+    .reduce((total, item) => {
+      return total + (Number(item.totalPrice) || 0);
+    }, 0)
+    .toFixed(2);
 }
-getList();
+
 function getList() {
   getDiagnosisDefinitionList(queryParams.value).then((res) => {
-    // prescriptionList.value = res.data.records;
     total.value = res.data.total;
   });
 }
 
+<<<<<<< HEAD
 function getListInfo(addNewRow) {
   isAdding.value = false;
   
@@ -599,11 +675,83 @@ function getListInfo(addNewRow) {
     } else {
       console.error('获取医嘱列表失败或数据格式错误:', res);
       prescriptionList.value = [];
+=======
+async function getListInfo(addNewRow) {
+  // 重置所有处方的添加状态
+  tcmPrescriptionList.value.forEach((prescription) => {
+    prescription.isAdding = false;
+  });
+  await getTcmAdviceList({ encounterId: props.patientInfo.encounterId }).then(async (res) => {
+    // 按 groupId 分组数据
+    const groupedData = {};
+    res.data.forEach((item) => {
+      const groupId = item.groupId || 'default';
+      if (!groupedData[groupId]) {
+        groupedData[groupId] = [];
+      }
+      groupedData[groupId].push({
+        ...item,
+        doseQuantity: JSON.parse(item.contentJson)?.doseQuantity,
+        doseUnitCode_dictText: JSON.parse(item.contentJson)?.doseUnitCode_dictText,
+      });
+    });
+
+    await getContract({ encounterId: props.patientInfo.encounterId }).then((res) => {
+      contractList.value = res.data;
+    });
+    // 更新处方列表
+    const groupIds = Object.keys(groupedData);
+    tcmPrescriptionList.value = groupIds.map((groupId, index) => {
+      const prescription = tcmPrescriptionList.value[index] || {
+        prescriptionList: [],
+        conditionDefinitionId: '',
+        accountId: contractList.value[0].accountId,
+        methodCode: '',
+        rateCode: '',
+        dispensePerDuration: '',
+        chineseHerbsDoseQuantity: '',
+        sufferingFlag: '0',
+        checkAll: false,
+        groupIndexList: [],
+        expandOrder: [],
+        totalAmount: 0,
+        nextId: 1,
+        isAdding: false,
+      };
+
+      prescription.prescriptionList = groupedData[groupId];
+      return prescription;
+    });
+
+    // 如果没有处方数据，确保至少有一个空处方
+    if (tcmPrescriptionList.value.length === 0) {
+      tcmPrescriptionList.value.push({
+        prescriptionList: [],
+        conditionDefinitionId: '',
+        accountId: contractList.value[0].accountId,
+        methodCode: '',
+        rateCode: '',
+        dispensePerDuration: '',
+        chineseHerbsDoseQuantity: '',
+        sufferingFlag: '0',
+        checkAll: false,
+        groupIndexList: [],
+        expandOrder: [],
+        totalAmount: 0,
+        nextId: 1,
+        isAdding: false,
+      });
+    }
+    tcmPrescriptionList.value.accountId = contractList.value[0].accountId;
+    if (props.activeTab == 'prescription' && addNewRow) {
+      handleAddMedicine(0);
+>>>>>>> upstream/develop
     }
   }).catch(error => {
     console.error('获取医嘱列表异常:', error);
     prescriptionList.value = [];
   });
+<<<<<<< HEAD
   
   tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId);
   
@@ -614,6 +762,11 @@ function getListInfo(addNewRow) {
   });
   
   accountId.value = props.patientInfo.accountId || '';
+=======
+
+  tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId);
+  accountId.value = props.patientInfo.accountId;
+>>>>>>> upstream/develop
 }
 
 function getDiagnosisInfo() {
@@ -629,11 +782,16 @@ function getDiagnosisInfo() {
         });
       });
     }
-    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;
+    // 默认选择第一个诊断
+    if (diagnosisList.value.length > 0) {
+      const firstDiagnosis = diagnosisList.value[0];
+      tcmPrescriptionList.value.forEach((prescription) => {
+        prescription.diagnosisName = firstDiagnosis.name;
+        prescription.conditionId = firstDiagnosis.conditionId;
+        prescription.encounterDiagnosisId = firstDiagnosis.encounterDiagnosisId;
+        prescription.conditionDefinitionId = firstDiagnosis.definitionId;
+      });
+    }
   });
 }
 
@@ -642,27 +800,36 @@ function getRowDisabled(row) {
 }
 
 // 新增医嘱
-function handleAddMedicine() {
-  // if (diagnosisList.value.length == 0) {
-  //   proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
-  //   return;
-  // }
-  if (isAdding.value) {
+function handleAddMedicine(pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  if (!prescription.conditionId) {
+    proxy.$modal.msgWarning('请选择诊断');
+    return;
+  }
+  if (prescription.isAdding) {
     proxy.$modal.msgWarning('请先保存当前医嘱');
     return;
   }
-  isAdding.value = true;
+  prescription.isAdding = true;
+  let groupId = '';
+  if (prescription.prescriptionList.length > 0) {
+    groupId = prescription.prescriptionList[0].groupId;
+  }
   // 在数组最前方添加一行，让新增行显示在最上边
-  prescriptionList.value.unshift({
-    uniqueKey: nextId.value++,
+  prescription.prescriptionList.unshift({
+    uniqueKey: prescription.nextId++,
     showPopover: false,
     check: false,
     isEdit: true,
     statusEnum: 1,
+    groupId: groupId,
   });
-  groupMarkers.value = getGroupMarkers(prescriptionList.value);
+
   nextTick(() => {
-    proxy.$refs['adviceRef0'].focus();
+    const refName = 'adviceRef' + pIndex + '-0';
+    if (proxy.$refs[refName] && proxy.$refs[refName][0]) {
+      proxy.$refs[refName][0].focus();
+    }
   });
 }
 
@@ -674,24 +841,28 @@ function clickRow(row) {
 }
 
 // 行双击打开编辑块，仅待发送的可编辑
-function clickRowDb(row) {
+function clickRowDb(row, pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
   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];
+    const index = prescription.prescriptionList.findIndex(
+      (item) => item.uniqueKey === row.uniqueKey
+    );
+    prescription.prescriptionList[index] = row;
+    prescription.expandOrder = [row.uniqueKey];
   }
 }
 
-function handleDiagnosisChange(item) {
-  diagnosisName.value = item.name;
-  conditionId.value = item.conditionId;
-  encounterDiagnosisId.value = item.encounterDiagnosisId;
+function handleDiagnosisChange(item, pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  prescription.diagnosisName = item.name;
+  prescription.conditionId = item.conditionId;
+  prescription.encounterDiagnosisId = item.encounterDiagnosisId;
 }
 
-function handleFocus(row, index) {
+function handleFocus(row, index, pIndex) {
   rowIndex.value = index;
   row.showPopover = true;
 }
@@ -704,27 +875,32 @@ function handleChange(value) {
   adviceQueryParams.value.searchKey = value;
 }
 
-function openDialog() {
-  tcmDianosis.value.openDialog();
+function addNewPrescription() {
+  tcmPrescriptionList.value.push({
+    prescriptionList: [],
+    conditionDefinitionId: '',
+    accountId: accountId.value,
+    methodCode: '',
+    rateCode: '',
+    dispensePerDuration: '',
+    chineseHerbsDoseQuantity: '',
+    sufferingFlag: '0',
+    checkAll: false,
+    groupIndexList: [],
+    expandOrder: [],
+    totalAmount: 0,
+    nextId: 1,
+    isAdding: false,
+  });
 }
 
-function deleteDiagnosisBind(id) {
-  const data = localStorage.getItem(`tcmDiagnosisList_${props.patientInfo.encounterId}`);
-  let list = [];
-  list = JSON.parse(data);
-  // 添加到列表
-  const index = list.findIndex((item) => item.id === id);
-  if (index === -1) return;
+function deletePrescription(index) {
+  if (tcmPrescriptionList.value.length <= 1) {
+    proxy.$modal.msgError('至少保留一张处方');
+    return;
+  }
 
-  list.splice(index, 1);
-  localStorage.removeItem(`tcmDiagnosisList_${props.patientInfo.encounterId}`);
-  // 保存到本地缓存
-  localStorage.setItem(`tcmDiagnosisList_${props.patientInfo.encounterId}`, JSON.stringify(list));
-  getListInfo();
-}
-
-function addNewPrescription(){
-  tcmPrescriptionList.value.push({})
+  tcmPrescriptionList.value.splice(index, 1);
 }
 
 // 删除处方单
@@ -790,7 +966,9 @@ function getPrescriptionMedicineCount(prescriptionIndex) {
 /**
  * 选择药品回调
  */
-function selectAdviceBase(key, row) {
+function selectAdviceBase(key, row, pIndex) {
+  // ... 保持原有逻辑，但使用对应处方的数据 ...
+  const prescription = tcmPrescriptionList.value[pIndex];
   getOrgList();
   unitCodeList.value = [];
   unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
@@ -818,36 +996,32 @@ function selectAdviceBase(key, row) {
       type: 'minUnit',
     });
   }
-  prescriptionList.value[rowIndex.value] = {
-    ...prescriptionList.value[rowIndex.value],
+  prescription.prescriptionList[rowIndex.value] = {
+    ...prescription.prescriptionList[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 =
+  prescription.prescriptionList[rowIndex.value].orgId = undefined;
+  prescription.prescriptionList[rowIndex.value].dose = undefined;
+  prescription.prescriptionList[rowIndex.value].unitCodeList = unitCodeList.value;
+  prescription.prescriptionList[rowIndex.value].doseUnitCode = row.doseUnitCode;
+  prescription.prescriptionList[rowIndex.value].minUnitCode = row.minUnitCode;
+  prescription.prescriptionList[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(
+  prescription.prescriptionList[rowIndex.value].definitionId = JSON.parse(
     JSON.stringify(row)
   ).chargeItemDefinitionId;
 
   // 库存列表 + 价格列表拼成批次号的下拉框
   if (row.adviceType != 3) {
     if (row.inventoryList && row.inventoryList.length == 0) {
-      expandOrder.value = [];
+      prescription.expandOrder = [];
       proxy.$modal.msgWarning('该项目无库存');
       return;
     }
     stockList.value = row.inventoryList.map((item, index) => {
       return { ...item, ...row.priceList[index] };
     });
-    prescriptionList.value[rowIndex.value].stockList = stockList.value;
+    prescription.prescriptionList[rowIndex.value].stockList = stockList.value;
     // 获取默认批次号的库存，如果没有让医生重新选
     let stock = stockList.value.filter((item) => {
       return item.lotNumber == row.defaultLotNumber;
@@ -857,17 +1031,19 @@ function selectAdviceBase(key, row) {
         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;
+      prescription.prescriptionList[rowIndex.value].lotNumber = stock.lotNumber;
+      prescription.prescriptionList[rowIndex.value].inventoryId = stock.inventoryId;
+      prescription.prescriptionList[rowIndex.value].locationId = stock.locationId;
+      prescription.prescriptionList[rowIndex.value].unitPrice = stock.price;
+      prescription.prescriptionList[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;
+    prescription.prescriptionList[rowIndex.value].orgId = JSON.parse(
+      JSON.stringify(row)
+    ).positionId;
+    prescription.prescriptionList[rowIndex.value].unitPrice = row.priceList[0].price;
   }
-  expandOrder.value = [key];
+  prescription.expandOrder = [key];
   nextTick(() => {
     if (row.adviceType == 1) {
       if (row.injectFlag == 1) {
@@ -887,8 +1063,9 @@ function getOrgList() {
   });
 }
 
-function handleDelete() {
-  let selectRow = prescriptionList.value.filter((item) => {
+function handleDelete(pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  let selectRow = prescription.prescriptionList.filter((item) => {
     return item.check;
   });
   if (selectRow.length == 0) {
@@ -896,14 +1073,15 @@ function handleDelete() {
     return;
   }
   let deleteList = [];
-  for (let i = prescriptionList.value.length - 1; i >= 0; i--) {
-    let deleteItem = prescriptionList.value[i];
+  for (let i = prescription.prescriptionList.length - 1; i >= 0; i--) {
+    let deleteItem = prescription.prescriptionList[i];
     // 通过requestId判断是否已保存，如果选中项未保存 直接从数组中移除，如果已保存，调接口删除
     if (deleteItem.check && deleteItem.statusEnum == 1 && !deleteItem.requestId) {
-      prescriptionList.value.splice(i, 1);
+      prescription.prescriptionList.splice(i, 1);
     } else if (deleteItem.check && deleteItem.statusEnum == 1 && deleteItem.requestId) {
       deleteList.push({
         requestId: deleteItem.requestId,
+        prescriptionNo: deleteItem.prescriptionNo,
         dbOpType: '3',
         adviceType: deleteItem.adviceType,
       });
@@ -922,12 +1100,12 @@ function handleDelete() {
     proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
     return;
   }
-  expandOrder.value = [];
-  isAdding.value = false;
+  prescription.expandOrder = [];
+  prescription.isAdding = false;
   adviceQueryParams.value.adviceType = undefined;
-  groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
 }
 
+<<<<<<< HEAD
 
 
 function handleNumberClick(item, index) {
@@ -936,22 +1114,35 @@ function handleNumberClick(item, index) {
   prescriptionList.value[index].locationId = item.locationId;
   prescriptionList.value[index].positionId = item.locationId;
   prescriptionList.value[index].positionName = item.locationName;
+=======
+function handleNumberClick(item, index, pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  prescription.prescriptionList[index].unitPrice = item.price;
+  prescription.prescriptionList[index].locationId = item.locationId;
+  prescription.prescriptionList[index].positionId = item.locationId;
+  prescription.prescriptionList[index].positionName = item.locationName;
+>>>>>>> upstream/develop
 }
 
 /**
  * 签发处方
  */
-function handleSave() {
-  if (expandOrder.value.length > 0) {
+function handleSave(pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  if (prescription.expandOrder.length > 0) {
     proxy.$modal.msgWarning('请先保存当前医嘱');
     return;
   }
-  if (prescriptionList.value[0].isEdit && !prescriptionList.value[0].adviceType) {
-    prescriptionList.value.shift();
-    isAdding.value = false;
-    expandOrder.value = [];
+  if (
+    prescription.prescriptionList[0] &&
+    prescription.prescriptionList[0].isEdit &&
+    !prescription.prescriptionList[0].adviceType
+  ) {
+    prescription.prescriptionList.shift();
+    prescription.isAdding = false;
+    prescription.expandOrder = [];
   }
-  let saveList = prescriptionList.value.filter((item) => {
+  let saveList = prescription.prescriptionList.filter((item) => {
     return item.statusEnum == 1;
   });
 
@@ -974,21 +1165,28 @@ function handleSave() {
       ...item,
       adviceType: item.adviceType,
       requestId: item.requestId,
-      dbOpType: '1',
       groupId: item.groupId,
+      patientId: props.patientInfo.patientId,
+      encounterId: props.patientInfo.encounterId,
+      accountId: accountId.value,
+      conditionId: prescription.conditionId,
+      encounterDiagnosisId: prescription.encounterDiagnosisId,
+      diagnosisName: prescription.diagnosisName,
+      dbOpType: '1',
       uniqueKey: undefined,
       statusEnum: 2,
     };
   });
   signTcmAdvice({
     organizationId: props.patientInfo.orgId,
+    sufferingFlag: prescription.sufferingFlag,
     adviceSaveList: list,
   })
     .then((res) => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('保存成功');
         getListInfo(false);
-        nextId.value == 1;
+        prescription.nextId = 1;
       }
     })
     .finally(() => {
@@ -996,13 +1194,8 @@ function handleSave() {
     });
 }
 
-function handleClickOutside(row, index) {
-  nextTick(() => {
-    handleSaveSign(row, index);
-  });
-}
-
 // 单行处方保存
+<<<<<<< HEAD
 function handleSaveSign(row, index) {
   try {
     // 直接执行保存逻辑，不再进行表单验证
@@ -1076,13 +1269,53 @@ function handleSaveSign(row, index) {
 
 function handleSaveBatch() {
   let saveList = prescriptionList.value
+=======
+function handleSaveSign(row, index, pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  const formRefName = 'formRef' + pIndex + '-' + index;
+  proxy.$refs[formRefName][0].validate((valid) => {
+    row.isEdit = false;
+    prescription.isAdding = false;
+    prescription.expandOrder = [];
+    row.contentJson = undefined;
+    row.patientId = props.patientInfo.patientId;
+    row.encounterId = props.patientInfo.encounterId;
+    row.accountId = prescription.accountId;
+    row.quantity = row.minUnitQuantity;
+    row.conditionId = prescription.conditionId;
+    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 = prescription.conditionDefinitionId;
+    row.encounterDiagnosisId = prescription.encounterDiagnosisId;
+    row.diagnosisName = prescription.diagnosisName;
+    row.contentJson = JSON.stringify(row);
+  });
+}
+
+function handleSaveBatch(pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+
+  let timestamp = new Date().getTime();
+  let saveList = prescription.prescriptionList
+>>>>>>> upstream/develop
     .filter((item) => {
       return item.statusEnum == 1;
     })
     .map((item, index) => {
       return {
         ...item,
-        chineseHerbsDoseQuantity: chineseHerbsDoseQuantity.value,
+        accountId: accountId.value,
+        conditionId: prescription.conditionId,
+        encounterDiagnosisId: prescription.encounterDiagnosisId,
+        conditionDefinitionId: prescription.conditionDefinitionId,
+        encounterId: props.patientInfo.encounterId,
+        patientId: props.patientInfo.patientId,
+        requestId: item.requestId,
+        groupId: item.groupId ? item.groupId : timestamp.toString(),
+
+        chineseHerbsDoseQuantity: prescription.chineseHerbsDoseQuantity,
         dbOpType: item.requestId ? '2' : '1',
       };
     });
@@ -1090,7 +1323,10 @@ function handleSaveBatch() {
     proxy.$modal.msgWarning('当前没有可保存医嘱');
     return;
   }
-  if (chineseHerbsDoseQuantity.value == undefined || chineseHerbsDoseQuantity.value == 0) {
+  if (
+    prescription.chineseHerbsDoseQuantity == undefined ||
+    prescription.chineseHerbsDoseQuantity == 0
+  ) {
     proxy.$modal.msgWarning('请输入付数');
     return;
   }
@@ -1098,7 +1334,7 @@ function handleSaveBatch() {
     if (res.code === 200) {
       proxy.$modal.msgSuccess('保存成功');
       getListInfo(true);
-      nextId.value == 1;
+      prescription.nextId = 1;
     }
   });
 }
@@ -1114,167 +1350,10 @@ function getFromDiagnosis(encounterId) {
     return null;
   }
 }
-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 = props.patientInfo.patientId;
-  //   item.encounterId = props.patientInfo.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: props.patientInfo.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: props.patientInfo.patientId,
-        encounterId: props.patientInfo.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: props.patientInfo.patientId,
-    encounterId: props.patientInfo.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) => {
+const handleEnter = (currentProp, row, rowIndex, pIndex) => {
+  const formRefName = 'formRef' + pIndex + '-' + rowIndex;
+  proxy.$refs[formRefName].validateField(currentProp, (valid) => {
     if (valid) {
       const index = requiredProps.value.indexOf(currentProp);
       if (index === -1) return;
@@ -1286,7 +1365,7 @@ const handleEnter = (currentProp, row, rowIndex, e) => {
           inputRefs.value[nextProp]?.focus(); // 直接调用 Element 的 focus 方法
         }, 100);
       } else {
-        handleSaveSign(row, rowIndex);
+        handleSaveSign(row, rowIndex, pIndex);
       }
     }
   });
@@ -1294,29 +1373,34 @@ const handleEnter = (currentProp, row, rowIndex, e) => {
 
 function escKeyListener(e) {
   if (e.key === 'Escape') {
-    if (isAdding.value == true) {
+    // 查找正在添加的处方
+    const addingPrescriptionIndex = tcmPrescriptionList.value.findIndex((p) => p.isAdding);
+    if (addingPrescriptionIndex !== -1) {
+      const prescription = tcmPrescriptionList.value[addingPrescriptionIndex];
       let index;
-      if (expandOrder.value.length > 0) {
-        index = prescriptionList.value.findIndex((item) => item.uniqueKey == expandOrder.value[0]);
+      if (prescription.expandOrder.length > 0) {
+        index = prescription.prescriptionList.findIndex(
+          (item) => item.uniqueKey == prescription.expandOrder[0]
+        );
       }
       if (index == 0) {
-        expandOrder.value = [];
+        prescription.expandOrder = [];
       }
-      prescriptionList.value.shift();
-      isAdding.value = false;
-      groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记
+      prescription.prescriptionList.shift();
+      prescription.isAdding = false;
     }
   }
 }
 
 // 签退
-function handleSingOut() {
-  let requestIdList = prescriptionList.value
+function handleSingOut(pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
+  let requestIdList = prescription.prescriptionList
     .filter((item) => {
       return item.check && item.statusEnum == 2;
     })
     .map((item) => {
-      item.requestId;
+      return item.requestId;
     });
   if (requestIdList.length == 0) {
     proxy.$modal.msgWarning('请选择已签发医嘱撤回');
@@ -1330,365 +1414,19 @@ function handleSingOut() {
   });
 }
 
-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;
-  groupIndexList.value.forEach((index) => {
-    if (prescriptionList.value[index].statusEnum == 2) {
-      status = true;
-    }
-    uniqueValues.add(prescriptionList.value[index].methodCode);
-    uniqDiagnosis.add(prescriptionList.value[index].diagnosisName);
-    uniqInjectFlag.add(prescriptionList.value[index].injectFlag);
-  });
-  // 校验是否有已签发的医嘱
-  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 = (row.unitPrice * row.quantity * 100) / 100;
-    } else {
-      row.totalPrice = new Decimal(row.unitPrice).div(row.partPercent) * row.quantity;
-    }
-  });
-}
-
-// 单位切换时 自动计算对应单位的总量
-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.unitPrice) / row.partPercent).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.unitPrice) /
-              row.partPercent
-            ).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) {
+// 处理行checkbox选中
+function handleCheckBoxChange(value, index, row, pIndex) {
+  const prescription = tcmPrescriptionList.value[pIndex];
   // 选中将当前行索引记录下来，取消将当前行索引删除
   if (value) {
-    groupIndexList.value.push(index);
+    prescription.groupIndexList.push(index);
   } else {
-    groupIndexList.value.splice(groupIndexList.value.indexOf(index), 1);
+    prescription.groupIndexList.splice(prescription.groupIndexList.indexOf(index), 1);
   }
   // 如果选中或取消行有组号，将全部相同组号的行全部选中，并记录或删除这些行的索引
   if (row.groupId) {
     // 获取组号相同行
-    let sameGroupIdList = prescriptionList.value.filter((item) => {
+    let sameGroupIdList = prescription.prescriptionList.filter((item) => {
       return item.groupId == row.groupId;
     });
     // 如果只有一个组号的情况不做处理
@@ -1699,18 +1437,22 @@ function handleCheckBoxChange(value, index, row) {
         // 排除掉当前选中行
         if (row.uniqueKey != item.uniqueKey) {
           // 同步选中状态
-          let currentIndex = prescriptionList.value.findIndex((k) => k.uniqueKey == item.uniqueKey);
-          prescriptionList.value[currentIndex].check = value;
+          let currentIndex = prescription.prescriptionList.findIndex(
+            (k) => k.uniqueKey == item.uniqueKey
+          );
+          prescription.prescriptionList[currentIndex].check = value;
           if (value) {
-            groupIndexList.value.push(currentIndex); // 或使用索引或唯一标识
+            prescription.groupIndexList.push(currentIndex); // 或使用索引或唯一标识
           } else if (!value) {
-            groupIndexList.value.splice(groupIndexList.value.indexOf(currentIndex), 1);
+            prescription.groupIndexList.splice(
+              prescription.groupIndexList.indexOf(currentIndex),
+              1
+            );
           }
         }
       });
     }
   }
-  console.log(groupIndexList.value);
 }
 
 // 校验每个组号数量是否大于5和对应分组金额是否大于500
diff --git a/openhis-ui-vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue
index e2f8bdb1..0976a1a9 100644
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -26,7 +26,7 @@
         <el-date-picker
           v-model="registerTime"
           @change="handleTimeChange"
-          type="daterange"
+          type="date"
           style="width: 100%; margin-bottom: 10px"
           :clearable="false"
           placeholder="挂号时间"
@@ -78,8 +78,8 @@
     </div>
     <div class="disabled-wrapper" style="width: 85%; border: 1px solid #eee; position: relative">
       <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-left: 0">
-        <el-descriptions :column="4">
-          <el-descriptions-item label="患者信息:" width="150">
+        <el-descriptions :column="5" class="patient-info-descriptions">
+          <el-descriptions-item label="患者信息:" width="420">
             {{
               Object.keys(patientInfo).length !== 0
                 ? patientInfo.patientName +
@@ -88,13 +88,47 @@
                   ' / ' +
                   patientInfo.genderEnum_enumText +
                   ' / ' +
-                  patientInfo.contractName
+                  patientInfo.contractName +
+                  '/' +
+                  patientInfo.phone
                 : '-'
             }}
           </el-descriptions-item>
-          <el-descriptions-item label="挂号时间：" width="150">
+          <el-descriptions-item label="挂号时间：" width="300">
             {{ Object.keys(patientInfo).length !== 0 ? formatDate(patientInfo.registerTime) : '-' }}
           </el-descriptions-item>
+          <el-descriptions-item label="医生：" width="250">
+            {{ userStore.nickName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="" width="300">
+            <el-button type="primary" plain @click.stop="handleFinish(patientInfo.encounterId)">
+              完诊
+            </el-button>
+            <el-button type="primary" plain @click.stop="handleLeave(patientInfo.encounterId)">
+              暂离
+            </el-button>
+            <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-item label="医生：" width="150">{{
             userStore.name
           }}</el-descriptions-item>
@@ -145,6 +179,13 @@
           v-model="activeTab"
           @tab-change="handleClick(activeTab)"
         >
+          <el-tab-pane label="门诊病历" name="hospitalizationEmr">
+            <hospitalizationEmr
+              :patientInfo="patientInfo"
+              :activeTab="activeTab"
+              @emrSaved="handleEmrSaved"
+            />
+          </el-tab-pane>
           <el-tab-pane label="病历" name="emr">
             <Emr
               :patientInfo="patientInfo"
@@ -174,14 +215,16 @@
               :patientInfo="patientInfo"
               ref="prescriptionRef"
               :activeTab="activeTab"
+              :outpatientEmrSaved="outpatientEmrSaved"
             />
           </el-tab-pane>
           <el-tab-pane label="中医" name="tcm">
             <tcmAdvice :patientInfo="patientInfo" ref="tcmRef" />
           </el-tab-pane>
-          <el-tab-pane label="电子处方" name="eprescription">
+          <!-- <el-tab-pane label="电子处方" name="eprescription">
             <eprescriptionlist :patientInfo="patientInfo" ref="eprescriptionRef" />
           </el-tab-pane>
+          -->
         </el-tabs>
         <div class="overlay" v-if="disabled"></div>
       </div>
@@ -193,6 +236,7 @@
       :open="openRefundListDialog"
       :encounterId="currentEncounterId"
       @close="openRefundListDialog = false"
+      @refresh="() => prescriptionRef.getListInfo()"
     />
     <HospitalizationDialog
       :open="openDialog"
@@ -208,6 +252,7 @@
   </div>
 </template>
 <script setup>
+import hospitalizationEmr from './components/hospitalizationEmr/index.vue';
 import Emr from './components/emr/emr.vue';
 import {
   getList,
@@ -222,13 +267,14 @@ 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 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';
 import { nextTick } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
+import { updatePatientInfo } from './components/store/patient.js';
 
 // // 监听路由离开事件
 // onBeforeRouteLeave((to, from, next) => {
@@ -257,15 +303,18 @@ const openRefundListDialog = ref(false);
 const openDialog = ref(false);
 const openPrescriptionDialog = ref(false);
 const saveStatus = ref(false);
+const outpatientEmrSaved = ref(false); // 门诊病历保存状态
 const currentEncounterId = ref('');
 const emits = defineEmits(['click']);
-const activeTab = ref('emr');
+// const activeTab = ref('emr');
+const activeTab = ref('hospitalizationEmr');
+
 const patientList = ref([]);
 const patientInfo = ref({});
 const visitTypeDisabled = ref(false);
 
 const prescriptionInfo = ref([]);
-const registerTime = ref([formatDate(new Date()), formatDate(new Date())]);
+const registerTime = ref(formatDate(new Date()));
 const patientDrawerRef = ref();
 const prescriptionRef = ref();
 const tcmRef = ref();
@@ -279,12 +328,41 @@ const firstVisitDate = ref('');
 const disabled = computed(() => {
   return Object.keys(patientInfo.value).length === 0;
 });
+const shortcuts = [
+  {
+    text: '今天',
+    value: new Date(),
+  },
+  {
+    text: '昨天',
+    value: () => {
+      const date = new Date();
+      date.setDate(date.getDate() - 1);
+      return date;
+    },
+  },
+  {
+    text: '三天内',
+    value: () => {
+      const date = new Date();
+      date.setDate(date.getDate() - 3);
+      return date;
+    },
+  },
+  {
+    text: '一周内',
+    value: () => {
+      const date = new Date();
+      date.setDate(date.getDate() - 7);
+      return date;
+    },
+  },
+];
 
-const eprescriptionRef = ref();
+// const eprescriptionRef = ref();
 onMounted(() => {
   getWaitPatient();
 });
-
 getPatientList();
 // 获取现诊患者列表
 function getPatientList() {
@@ -373,9 +451,9 @@ function handleClick(tab) {
     case 'tcm':
       tcmRef.value.getDiagnosisInfo();
       break;
-    case 'eprescription':
-      eprescriptionRef.value.getList();
-      break;
+    // case 'eprescription':
+    //   eprescriptionRef.value.getList();
+    //   break;
   }
   // if (tab != 'emr') {
   //   if (!saveStatus.value) {
@@ -393,6 +471,11 @@ function handleClick(tab) {
 
 // 查看本次就诊处方单（从医嘱Tab页获取已开立的处方单信息）
 function getEnPrescription(encounterId) {
+  getEnPrescriptionInfo({ encounterId: encounterId }).then((res) => {
+    console.log('处方单 res', res);
+    prescriptionInfo.value = res.data.records;
+    openPrescriptionDialog.value = true;
+  });
   // 检查是否有选中的患者
   if (!patientInfo.value || !patientInfo.value.encounterId) {
     proxy.$modal.msgWarning('请先选择患者');
@@ -470,6 +553,9 @@ function handleCardClick(item, index) {
     patient.active = patient.encounterId === item.encounterId;
   });
   patientInfo.value = item;
+  // 将患者信息保存到store中，供hospitalizationEmr组件使用
+  updatePatientInfo(item);
+  activeTab.value = 'hospitalizationEmr';
   
   // 优先使用数据库中保存的初复诊值
   if (item.visitType) {
@@ -489,7 +575,7 @@ function handleCardClick(item, index) {
     prescriptionRef.value.getListInfo();
     tcmRef.value.getListInfo();
     diagnosisRef.value.getList();
-    eprescriptionRef.value.getList();
+    // eprescriptionRef.value.getList();
     emrRef.value.getDetail(item.encounterId);
     setTimeout(() => {
       loading.value = false;
@@ -520,8 +606,8 @@ function handleFinish(encounterId) {
 }
 
 function handleTimeChange(value) {
-  queryParams.value.registerTimeSTime = value[0] + ' 00:00:00';
-  queryParams.value.registerTimeETime = value[1] + ' 23:59:59';
+  queryParams.value.registerTimeSTime = value + ' 00:00:00';
+  queryParams.value.registerTimeETime = value + ' 23:59:59';
   getPatientList();
 }
 
@@ -534,6 +620,11 @@ function handleReceive(row) {
   getWaitPatient();
 }
 
+// 处理门诊病历保存成功事件
+function handleEmrSaved(isSaved) {
+  outpatientEmrSaved.value = isSaved;
+}
+
 function openDrawer() {
   drawer.value = true;
 }
@@ -564,6 +655,16 @@ function handleCancelEncounter(){
 </script>
 
 <style lang="scss" scoped>
+// 患者信息
+.patient-info-descriptions {
+  :deep(.el-descriptions__label) {
+    font-size: 16px !important;
+  }
+  :deep(.el-descriptions__content) {
+    font-size: 16px !important;
+  }
+}
+
 .patient-card {
   width: 100%;
   overflow: hidden;
diff --git a/openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json b/openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json
index 50ece356..20c0a70a 100644
--- a/openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json
+++ b/openhis-ui-vue3/src/views/drug/inHospitalDispensing/components/templateJson.json
@@ -15,7 +15,7 @@
             "top": 16.5,
             "height": 22.5,
             "width": 120,
-            "title": "医院",
+            "title": "长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontFamily": "Microsoft YaHei",
diff --git a/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/DetailMedicationTable.vue b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/DetailMedicationTable.vue
new file mode 100644
index 00000000..e81fea18
--- /dev/null
+++ b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/DetailMedicationTable.vue
@@ -0,0 +1,330 @@
+<template>
+  <div
+    class="app-container"
+    style="border: 1px solid #e0e0e0; border-radius: 4px; box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.1)"
+  >
+    <el-row :gutter="10" justify="end" align="middle" style="margin-bottom: 10px">
+      <el-button type="danger" plain icon="Refresh" @click="handleSendDrug" :disabled="!encounterId"
+        >发药</el-button
+      >
+      <el-button type="primary" plain icon="Download" @click="handleExport" :disabled="!encounterId"
+        >导出</el-button
+      >
+      <el-button
+        type="success"
+        plain
+        icon="Refresh"
+        @click="handleDispense"
+        :disabled="!encounterId"
+        >退药</el-button
+      >
+    </el-row>
+    <div class="tableContainer">
+      <el-table
+        v-loading="loading"
+        :data="displayTableData"
+        style="width: 100%; height: 70vh"
+        border
+        stripe
+        :header-cell-style="headerCellStyle"
+        :row-style="rowStyle"
+        :cell-style="{ textAlign: 'center' }"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- 基础信息 -->
+        <el-table-column prop="itemName" label="项目名称" min-width="120" />
+        <el-table-column prop="totalVolume" label="规格" min-width="100" />
+        <el-table-column prop="locationName" label="发放药房" min-width="100" />
+        <el-table-column prop="lotNumber" label="批次号" min-width="100" />
+        <el-table-column prop="departmentName" label="科室" min-width="100" />
+        <el-table-column prop="doctorName" label="开单医生" min-width="100" />
+        <el-table-column prop="dispenseDoctorName" label="发药医生" min-width="100" />
+        <el-table-column prop="itemType_dictText" label="项目类型" min-width="100">
+          <template #default="scope">
+            {{ scope.row.itemType_dictText || scope.row.itemType || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="statusEnum_enumText" label="发药状态" min-width="100">
+          <template #default="scope">
+            {{ scope.row.statusEnum_enumText || scope.row.statusEnum || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="conditionName" label="诊断名称" min-width="100" />
+        <el-table-column prop="prescriptionNo" label="处方号" min-width="120" />
+
+        <!-- 用药信息 -->
+        <el-table-column prop="dose" label="单次剂量" min-width="100" />
+        <el-table-column prop="rateCode_dictText" label="用药频次" min-width="100">
+          <template #default="scope">
+            {{ scope.row.rateCode_dictText || scope.row.rateCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="methodCode_dictText" label="用法" min-width="100">
+          <template #default="scope">
+            {{ scope.row.methodCode_dictText || scope.row.methodCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="doseUnitCode_dictText" label="剂量单位" min-width="100">
+          <template #default="scope">
+            {{ scope.row.doseUnitCode_dictText || scope.row.doseUnitCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="unitCode_dictText" label="单位" min-width="80">
+          <template #default="scope">
+            {{ scope.row.unitCode_dictText || scope.row.unitCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="dispensePerQuantity" label="单次发药数" min-width="100" />
+        <el-table-column prop="dispensePerDuration" label="每次发药供应天数" min-width="150" />
+        <el-table-column prop="quantity" label="数量" min-width="80" />
+        <el-table-column prop="unitPrice" label="单价" min-width="80" />
+        <el-table-column prop="totalPrice" label="金额" min-width="80" />
+
+        <!-- 其他信息 -->
+        <el-table-column prop="manufacturerText" label="生产厂家" min-width="150" />
+        <el-table-column prop="traceNo" label="追溯码" min-width="120" />
+        <el-table-column prop="encounterBusNo" label="就诊NO" min-width="120" />
+        <el-table-column prop="reqAuthoredTime" label="开具日期" min-width="150">
+          <template #default="scope">
+            {{ formatDate(scope.row.reqAuthoredTime) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="skinTestFlag" label="皮试标志" min-width="100">
+          <template #default="scope">
+            {{ scope.row.skinTestFlag === 1 ? '是' : scope.row.skinTestFlag === 0 ? '否' : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="tcmFlag" label="中药标识" min-width="100">
+          <template #default="scope">
+            {{ scope.row.tcmFlag === 1 ? '是' : scope.row.tcmFlag === 0 ? '否' : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="itemTable" label="所在表" min-width="100" />
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { ElMessage } from 'element-plus';
+import { totalSendDrug, totalReturnDrug } from './api';
+import { getCurrentInstance } from 'vue';
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(['call-medication-summary-detail']);
+// 定义props，接收父组件传递的表格数据和选中的ID
+const props = defineProps({
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  encounterId: {
+    type: String,
+    default: '',
+  },
+});
+
+// 定义响应式数据
+const selectedRows = ref([]);
+const loading = ref(false);
+
+// 计算属性，直接使用props.tableData，并添加日志用于调试
+const displayTableData = computed(() => {
+  return props.tableData;
+});
+
+// 处理表格选择变化
+function handleSelectionChange(rows) {
+  selectedRows.value = rows;
+}
+
+// 格式化日期
+function formatDate(dateTime) {
+  if (!dateTime) return '-';
+
+  const date = new Date(dateTime);
+  if (isNaN(date.getTime())) return '-';
+
+  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}`;
+}
+
+// 监听props.tableData变化，当外部数据变化时清空选中状态
+watch(
+  () => props.tableData,
+  () => {
+    selectedRows.value = [];
+  }
+);
+
+// 表格样式
+const headerCellStyle = {
+  backgroundColor: '#f5f7fa',
+  color: '#333',
+  fontWeight: 'bold',
+  height: '48px',
+  textAlign: 'center',
+  lineHeight: '48px',
+  padding: '0',
+  fontSize: '14px',
+};
+
+const rowStyle = {
+  height: '40px',
+};
+// 发药功能
+const handleSendDrug = () => {
+  if (!props.encounterId) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning('请先选择需要发药的数据');
+    return;
+  }
+  let data = [];
+  selectedRows.value.forEach((row) => {
+    data.push({
+      dispenseId: row.dispenseId,
+    });
+  });
+  loading.value = true;
+  proxy.$modal
+    .confirm('确定要发药吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(async () => {
+      const response = await totalSendDrug(data);
+      if (response.code === 200) {
+        ElMessage.success('发药成功');
+        loading.value = false;
+      }
+    })
+    .catch(() => {
+      loading.value = false;
+    });
+};
+// 导出功能
+const handleExport = () => {
+  if (!props.encounterId) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+  if (displayTableData.value.length === 0) {
+    ElMessage.warning('暂无数据可导出');
+    return;
+  }
+
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning('请先选择要导出的数据');
+    return;
+  }
+
+  // 这里可以实现导出逻辑
+  console.log('导出数据:', selectedRows.value);
+  ElMessage.success('导出成功');
+};
+
+// 退药功能
+const handleDispense = () => {
+  if (!props.encounterId) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+  if (selectedRows.value.length === 0) {
+    ElMessage.warning('请先选择需要退药的数据');
+    return;
+  }
+  let data = [];
+  selectedRows.value.forEach((row) => {
+    data.push({
+      dispenseId: row.dispenseId,
+    });
+  });
+  loading.value = true;
+  proxy.$modal
+    .confirm('确定要退药吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(async () => {
+      const response = await totalReturnDrug(data);
+      emit('call-medication-summary-detail', props.encounterId);
+      console.log(response);
+      if (response.code === 200) {
+        ElMessage.success('退药成功');
+        loading.value = false;
+        // 通知父组件刷新明细数据
+        emit('call-medication-summary-detail', props.encounterId);
+      } else {
+        console.log(response.message);
+        ElMessage.error('退药失败');
+      }
+    })
+    .catch(() => {
+      loading.value = false;
+    });
+};
+
+// 定义暴露给父组件的数据和方法
+defineExpose({
+  selectedRows,
+});
+</script>
+
+<style lang="scss" scoped>
+.medicationTableDetail {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .buttonGroup {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 0;
+    gap: 10px;
+    margin-right: 20px;
+
+    :deep(.el-button) {
+      padding: 6px 16px;
+      font-size: 14px;
+    }
+  }
+
+  .tableContainer {
+    flex: 1;
+    overflow-x: auto; /* 启用横向滚动 */
+    overflow-y: auto; /* 同时启用纵向滚动 */
+    border: 1px solid #e0e0e0;
+    border-radius: 4px;
+
+    :deep(.el-table) {
+      height: 100%;
+
+      .el-table__header {
+        th {
+          background-color: #f5f7fa;
+          height: 48px !important;
+          line-height: 48px !important;
+          padding: 0 !important;
+        }
+      }
+
+      .el-table__row:hover {
+        background-color: #f5f7fa;
+      }
+    }
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationTable.vue b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationTable.vue
new file mode 100644
index 00000000..0d126cfe
--- /dev/null
+++ b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationTable.vue
@@ -0,0 +1,187 @@
+<template>
+  <div
+    class="app-container"
+    style="border: 1px solid #e0e0e0; border-radius: 4px; box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.1)"
+  >
+    <el-row :gutter="10" justify="end" align="middle" style="margin-bottom: 10px">
+      <el-button type="danger" plain icon="Refresh" @click="handleSendDrug" :disabled="!busNo">
+        发药
+      </el-button>
+      <el-button type="primary" plain icon="Download" @click="handleExport" :disabled="!busNo">
+        导出
+      </el-button>
+    </el-row>
+    <div class="tableContainer">
+      <el-table
+        :data="tableData"
+        style="width: 100%; height: 70vh"
+        :header-cell-style="headerCellStyle"
+        :row-style="rowStyle"
+        :cell-style="{ textAlign: 'center' }"
+      >
+        <el-table-column prop="currentIndex" label="序号" min-width="60" />
+        <el-table-column prop="itemName" label="项目名称" min-width="150">
+          <template #default="scope">
+            {{ scope.row.itemName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalVolume" label="规格" min-width="120">
+          <template #default="scope">
+            {{ scope.row.totalVolume || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="lotNumber" label="批次号" min-width="100">
+          <template #default="scope">
+            {{ scope.row.lotNumber || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="quantity" label="数量" min-width="80" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.quantity" size="mini">
+              {{ scope.row.quantity }}
+            </el-tag>
+            <el-tag v-if="scope.row.maxUnitCode_dictText" size="mini" type="danger">
+              {{ scope.row.maxUnitCode_dictText }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sourceLocationName" label="发放地点" min-width="100">
+          <template #default="scope">
+            {{ scope.row.sourceLocationName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="manufacturerText" label="生产厂家" min-width="120">
+          <template #default="scope">
+            {{ scope.row.manufacturerText || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="busNo" label="单据号" min-width="150">
+          <template #default="scope">
+            {{ scope.row.busNo || '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { ElMessage } from 'element-plus';
+import { totalSendDrug } from './api.js';
+import { getCurrentInstance } from 'vue';
+const { proxy } = getCurrentInstance();
+// 定义组件属性
+const props = defineProps({
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  selectedId: {
+    type: String,
+    default: '',
+  },
+  busNo: {
+    type: String,
+    default: '',
+  },
+});
+
+// 定义响应式数据
+const selectedRows = ref([]);
+// 定义loading状态
+const loading = ref(false);
+
+// 表格样式
+const headerCellStyle = {
+  backgroundColor: '#f5f7fa',
+  color: '#333',
+  fontWeight: 'bold',
+  height: '48px',
+  textAlign: 'center',
+  lineHeight: '48px',
+  padding: '0',
+  fontSize: '14px',
+};
+
+const rowStyle = {
+  height: '40px',
+};
+
+// 发药功能
+const handleSendDrug = () => {
+  if (!props.busNo) {
+    ElMessage.warning('请先选择单据号');
+    return;
+  }
+  let data = [{ busNo: props.busNo }];
+  loading.value = true;
+  proxy.$modal
+    .confirm('确定要发药吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(async () => {
+      const response = await totalSendDrug(data);
+      if (response.code === 200) {
+        ElMessage.success('发药成功');
+        loading.value = false;
+      }
+    })
+    .catch(() => {
+      loading.value = false;
+    });
+};
+
+// 定义暴露给父组件的数据和方法
+defineExpose({
+  selectedRows,
+});
+</script>
+
+<style lang="scss" scoped>
+.medicationTableDetail {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .buttonGroup {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 0;
+    gap: 10px;
+    margin-right: 20px;
+
+    :deep(.el-button) {
+      padding: 6px 16px;
+      font-size: 14px;
+    }
+  }
+
+  .tableContainer {
+    flex: 1;
+    overflow: hidden;
+    border: 1px solid #e0e0e0;
+    border-radius: 4px;
+
+    :deep(.el-table) {
+      height: 100%;
+
+      .el-table__header {
+        th {
+          background-color: #f5f7fa;
+          height: 48px !important;
+          lineheight: 48px !important;
+          padding: 0 !important;
+        }
+      }
+
+      .el-table__row:hover {
+        background-color: #f5f7fa;
+      }
+    }
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/api.js b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/api.js
new file mode 100644
index 00000000..b7bea8b4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/api.js
@@ -0,0 +1,123 @@
+import request from '@/utils/request';
+
+// 获取病区下拉选
+export function getPractitionerWard (queryParams) {
+  return request ({
+    url: '/app-common/practitioner-ward',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+// 住院汇总发药单左侧
+export function getFromSummaryList (queryParams) {
+  return request ({
+    url: 'pharmacy-manage/summary-dispense-medicine/from_summary-list',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+// 住院汇总发药单右侧
+export function getFromDetailList (queryParams) {
+  return request ({
+    url: 'pharmacy-manage/summary-dispense-medicine/from-list',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+// 明细左侧
+export function getEncounterList (queryParams) {
+  return request ({
+    url: '/pharmacy-manage/summary-dispense-medicine/encounter-list',
+    method: 'get',
+    params: queryParams,
+  });
+}
+//明细 右侧
+export function getMedicationSummaryDetail (queryParams) {
+  return request ({
+    url: '/pharmacy-manage/summary-dispense-medicine/medication_summary-list',
+    method: 'get',
+    params: queryParams,
+  });
+}
+//以下是组件的接口
+
+/**
+ * 获取住院患者列表
+ */
+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,
+  });
+}
+
+/**
+ * 执行医嘱
+ */
+export function adviceExecute (data) {
+  return request ({
+    url: '/nurse-station/advice-process/advice-execute',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 取消执行医嘱
+ */
+export function adviceCancel (data) {
+  return request ({
+    url: '/nurse-station/advice-process/advice-cancel',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 明细发药
+ * 
+ */
+export function totalSendDrug (data) {
+  return request ({
+    url: '/pharmacy-manage/summary-dispense-medicine/summary-dispense-medicine',
+    method: 'put',
+    data: data,
+  });
+}
+/**
+ * 明细退药
+ */
+export function totalReturnDrug (data) {
+  return request ({
+    url: '/pharmacy-manage/summary-dispense-medicine/medicine-return',
+    method: 'put',
+    data: data,
+  });
+}
diff --git a/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/index.vue b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/index.vue
new file mode 100644
index 00000000..92998b26
--- /dev/null
+++ b/openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/index.vue
@@ -0,0 +1,456 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20" style="margin-bottom: 20px">
+      <el-col :span="4" :xs="24">
+        <el-button
+          :type="selectType === 'total' ? 'primary' : 'default'"
+          @click="handleSelectType('total')"
+          >汇总</el-button
+        >
+        <el-button
+          :type="selectType === 'drug' ? 'primary' : 'default'"
+          @click="handleSelectType('drug')"
+          >发药</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="18" :xs="24">
+        <el-form ref="queryParams" label-width="100px" :model="queryParams" :inline="true">
+          <el-form-item label="窗口" prop="windowDataText" label-width="120px">
+            <el-select
+              v-model="queryParams.windowDataText"
+              placeholder="请选择"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in windowData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="摆药单" prop="medicationListText" label-width="120px">
+            <el-select
+              v-model="queryParams.medicationListText"
+              placeholder="请选择"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in medicationList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="范围" prop="time" label-width="100px">
+            <el-radio-group v-model="queryParams.timeRange">
+              <el-radio v-for="(item, index) in timeRangeList" :key="index" :value="item.value">
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="时间" prop="time" label-width="100px">
+            <el-date-picker
+              v-model="dateRange"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+        </el-form>
+      </el-col> -->
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="6" class="left-container">
+        <el-row>
+          <el-col :span="24">
+            <el-form
+              :model="queryParamsPatient"
+              ref="queryRef"
+              v-show="showSearch"
+              label-width="120"
+              inline="true"
+            >
+              <el-form-item label="患者信息" prop="searchKey" label-width="120">
+                <el-input
+                  v-model="queryParamsPatient.searchKey"
+                  placeholder="请输入姓名/证件号"
+                  clearable
+                  style="width: 240px"
+                  @keyup.enter="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item
+                label="发药状态"
+                prop="statusEnum"
+                v-if="selectType !== 'drug'"
+                label-width="120"
+              >
+                <el-select
+                  v-model="queryParamsPatient.statusEnum"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  style="width: 240px"
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="item in dispenseStatusOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="就诊日期" prop="startTime">
+                <el-date-picker
+                  v-model="dateRange"
+                  type="daterange"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="YYYY-MM-DD"
+                  style="width: 240px"
+                  @keyup.enter="handleQuery"
+                  @change="handleQuery"
+                />
+              </el-form-item>
+            </el-form>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" style="border-radius: 4px">
+          <el-col :span="24">
+            <el-table
+              :data="patientList"
+              border
+              highlight-current-row
+              style="height: cal(100%-200px); width: 100%"
+              @row-click="handleCurrentChange"
+            >
+              <!-- 汇总状态下显示的字段 -->
+              <template v-if="selectType === 'total'">
+                <el-table-column prop="applicantName" label="申请人" align="center" />
+                <el-table-column prop="sourceLocationName" label="发药药房" align="center" />
+                <el-table-column prop="statusEnum_enumText" label="状态" align="center" />
+                <el-table-column prop="applyTime" label="申请日期" align="center">
+                  <template #default="scope">
+                    {{ scope.row.applyTime ? parseTime(scope.row.applyTime, '{y}-{m}-{d}') : '-' }}
+                  </template>
+                </el-table-column>
+              </template>
+              <!-- 明细状态下显示的字段 -->
+              <template v-else>
+                <el-table-column prop="patientName" label="姓名" align="center" />
+                <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
+                <el-table-column prop="age" label="年龄" align="center" />
+                <el-table-column prop="startTime" label="就诊日期" align="center">
+                  <template #default="scope">
+                    {{ scope.row.startTime ? parseTime(scope.row.startTime, '{y}-{m}-{d}') : '-' }}
+                  </template>
+                </el-table-column>
+              </template>
+            </el-table>
+          </el-col>
+          <el-col :span="24" style="padding: 10px 12px 12px 12px">
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              v-model:page="queryParams.pageNo"
+              v-model:limit="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="18" :xs="24">
+        <!-- 根据当前选中的tab显示不同的表格组件 -->
+        <MedicationTable v-if="selectType === 'total'" :tableData="tableData" :busNo="busNo" />
+        <DetailMedicationTable
+          v-else-if="selectType === 'drug'"
+          :tableData="detailTableData"
+          :encounterId="encounterId"
+          @call-medication-summary-detail="callMedicationSummaryDetail"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import MedicationTable from './components/MedicationTable.vue';
+import DetailMedicationTable from './components/DetailMedicationTable.vue';
+import { getCurrentInstance } from 'vue';
+import {
+  getFromSummaryList,
+  getEncounterList,
+  getMedicationSummaryDetail,
+  getFromDetailList,
+} from './components/api';
+
+// 响应式数据
+const loading = ref(false);
+const patientList = ref([]);
+const total = ref(0);
+const showSearch = ref(true);
+const { proxy } = getCurrentInstance();
+// 查询参数
+const queryParams = reactive({
+  searchKey: '',
+  statusEnum: '',
+  pageNo: 1,
+  pageSize: 10,
+  windowDataText: '',
+  medicationListText: '',
+  timeRange: 1,
+});
+const queryParamsPatient = ref({
+  searchKey: '',
+  statusEnum: '1',
+  pageNo: 1,
+  pageSize: 10,
+});
+// 日期范围
+const dateRange = ref([
+  new Date().toISOString().split('T')[0],
+  new Date().toISOString().split('T')[0],
+]);
+
+// 发药状态选项
+const dispenseStatusOptions = ref([
+  { label: '待发药', value: '1' },
+  { label: '已发药', value: '2' },
+  { label: '全部', value: '0' },
+]);
+
+// 加载患者列表数据
+async function getList() {
+  if (dateRange.value == null) {
+    proxy.$message.warning('请选择日期');
+    return;
+  }
+  loading.value = true;
+  try {
+    let response;
+    // 构建查询参数 - 只保留必要的分页和筛选条件
+    const params = {
+      searchKey: queryParamsPatient.value.searchKey,
+      statusEnum: queryParamsPatient.value.statusEnum,
+      pageNo: queryParamsPatient.value.pageNo,
+      pageSize: queryParamsPatient.value.pageSize,
+      startTime: dateRange.value[0],
+      endTime: dateRange.value[1],
+    };
+    // 根据当前标签页调用不同的接口
+    if (selectType.value === 'total') {
+      // 汇总标签页
+      response = await getFromSummaryList(params);
+      patientList.value = response.data;
+      total.value = response.data.length || 0;
+    } else {
+      // 明细标签页
+      response = await getEncounterList(params);
+      patientList.value = response.data.records;
+      total.value = response.data.total || 0;
+    }
+  } catch (error) {
+    patientList.value = [];
+    total.value = 0;
+  } finally {
+    loading.value = false;
+  }
+}
+
+// 搜索处理
+async function handleQuery() {
+  queryParamsPatient.value.pageNo = 1; // 重置为第一页
+  await getList();
+}
+const busNo = ref('');
+const encounterId = ref('');
+// 处理表格行点击
+function handleCurrentChange(row) {
+  busNo.value = row.busNo;
+  encounterId.value = row.encounterId;
+  if (selectType.value === 'total') {
+    // 汇总标签页
+    callSummaryMedicationDetail(row.busNo);
+  } else {
+    // 明细标签页
+    callMedicationSummaryDetail(row.encounterId);
+  }
+}
+
+// 明细标签页
+async function callMedicationSummaryDetail(encounterId) {
+  console.log('点击明细标签页', encounterId);
+  // 显示加载提示
+  loading.value = true;
+  try {
+    const params = {
+      encounterId,
+    };
+
+    const response = await getMedicationSummaryDetail(params);
+    // 处理药品汇总详情数据
+    handleMedicationSummaryDetail(response.data);
+  } catch (error) {
+    ElMessage.error('获取药品汇总详情失败：' + (error.message || '未知错误'));
+    // 发生错误时清空数据
+    handleMedicationSummaryDetail([]);
+  } finally {
+    // 无论成功失败都关闭加载状态
+    loading.value = false;
+  }
+}
+
+// 汇总标签页
+async function callSummaryMedicationDetail(busNo) {
+  // 显示加载提示
+  loading.value = true;
+  try {
+    const params = {
+      busNo,
+    };
+
+    const response = await getFromDetailList(params);
+
+    // 处理汇总药品详情数据
+    handleMedicationSummaryDetail(response.data);
+  } catch (error) {
+    ElMessage.error('获取汇总药品详情失败：' + (error.message || '未知错误'));
+    // 发生错误时清空数据
+    handleMedicationSummaryDetail([]);
+  } finally {
+    // 无论成功失败都关闭加载状态
+    loading.value = false;
+  }
+}
+
+// 窗口数据
+const windowData = reactive([
+  {
+    label: '窗口1',
+    value: 1,
+  },
+  {
+    label: '窗口2',
+    value: 2,
+  },
+  {
+    label: '窗口3',
+    value: 3,
+  },
+]);
+
+// 摆药单数据
+const medicationList = reactive([
+  {
+    label: '药单1',
+    value: 1,
+  },
+  {
+    label: '药单2',
+    value: 2,
+  },
+  {
+    label: '药单3',
+    value: 3,
+  },
+]);
+
+// 时间范围选项
+const timeRangeList = [
+  {
+    label: '全部',
+    value: 1,
+  },
+  {
+    label: '长期',
+    value: 2,
+  },
+  {
+    label: '临时',
+    value: 3,
+  },
+];
+
+// 表格类型
+const selectType = ref('total');
+
+// 表格数据，用于显示右侧药品列表（汇总tab）
+const tableData = reactive([]);
+
+// 明细表格数据，用于明细tab
+const detailTableData = reactive([]);
+
+// 切换表格类型
+function handleSelectType(type) {
+  selectType.value = type;
+  reset();
+  getList();
+}
+function reset() {
+  busNo.value = '';
+  encounterId.value = '';
+  patientList.value = [];
+  total.value = 0;
+  // 保持响应式引用不变，逐字段还原默认
+  queryParamsPatient.value.searchKey = '';
+  queryParamsPatient.value.statusEnum = '1';
+  queryParamsPatient.value.pageNo = 1;
+  queryParamsPatient.value.pageSize = 10;
+}
+// 处理子组件传递的药品汇总详情数据
+function handleMedicationSummaryDetail(data) {
+  // 检查数据是否为数组
+  const medicationData = Array.isArray(data)
+    ? data
+    : typeof data === 'object' && data !== null && Array.isArray(data.records)
+    ? data.records
+    : [];
+
+  // 根据当前tab将数据分配到不同的表格
+  if (selectType.value === 'total') {
+    // 汇总tab - 清空表格数据
+    tableData.splice(0, tableData.length);
+    if (medicationData.length > 0) {
+      medicationData.forEach((item, index) => {
+        tableData.push({
+          currentIndex: index + 1,
+          ...item,
+        });
+      });
+    }
+  } else {
+    // 明细tab - 将数据渲染到DetailMedicationTable组件
+    detailTableData.splice(0, detailTableData.length);
+    medicationData.forEach((item) => {
+      detailTableData.push({
+        ...item,
+      });
+    });
+  }
+}
+
+// 组件挂载时初始化数据
+onMounted(() => {
+  getList();
+});
+</script>
+<style scoped>
+.left-container {
+  border-radius: 4px;
+  border: 1px solid #f5f5f5;
+  background-color: #fff;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/gf/ratioApplicationRecord/index.vue b/openhis-ui-vue3/src/views/gf/ratioApplicationRecord/index.vue
new file mode 100644
index 00000000..9e7cb089
--- /dev/null
+++ b/openhis-ui-vue3/src/views/gf/ratioApplicationRecord/index.vue
@@ -0,0 +1,1416 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
+      <el-form-item label="申请" prop="searchKey">
+        <el-input v-model="queryParams.searchKey" placeholder="申请编号/项目名称/项目编号/医保编码" clearable style="width: 280px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="可打印" prop="printable" label-width="80px">
+        <el-checkbox v-model="queryParams.printable" true-label="1" false-label="0">是</el-checkbox>
+      </el-form-item>
+      <el-form-item label="项目分类" prop="itemType" label-width="100">
+        <el-select v-model="queryParams.itemType" clearable style="width: 200px;">
+          <el-option label="药品" value="1"></el-option>
+          <el-option label="诊疗" value="2"></el-option>
+        </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="handleAdd">发起申请</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Printer" @click="handlePrint"
+          :disabled="selectedRows.length === 0">打印申请单</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 表格数据 -->
+    <el-table v-loading="loading" :data="ratioApplicationRecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column label="申请编号" prop="applicationNo" :show-overflow-tooltip="true" />
+      <el-table-column label="项目名称" prop="name" :show-overflow-tooltip="true" />
+      <el-table-column label="项目编号" prop="busNo" :show-overflow-tooltip="true" />
+      <el-table-column label="医保编码">
+        <template #default="scope">
+          <span v-if="scope.row.ybNo !== null && scope.row.ybNo !== undefined && scope.row.ybNo !== ''">
+            {{ scope.row.ybNo }}
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目分类" prop="itemTypeName" :show-overflow-tooltip="true" align="center" width="100" />
+      <!-- 自付比例列 -->
+      <el-table-column label="自付比例" align="center" width="150">
+        <template #default="scope">
+          <span
+            v-if="scope.row.applicationRatio !== null && scope.row.applicationRatio !== undefined && scope.row.applicationRatio !== ''">
+            {{ scope.row.applicationRatio }}%
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <!-- 二次自付比例列 -->
+      <el-table-column label="二次自付比例" align="center" width="150">
+        <template #default="scope">
+          <span
+            v-if="scope.row.twiceRatio !== null && scope.row.twiceRatio !== undefined && scope.row.twiceRatio !== ''">
+            {{ scope.row.twiceRatio }}%
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" prop="startDate" :show-overflow-tooltip="true" align="center" width="150" />
+      <el-table-column label="结束时间" prop="endDate" :show-overflow-tooltip="true" align="center" width="150" />
+      <!-- 申请状态列 -->
+      <el-table-column label="申请状态" width="120" align="center">
+        <template #default="scope">
+          <el-tag :type="getApplicationStatusType(scope.row.applicationStatus)"
+            :color="getApplicationStatusColor(scope.row.applicationStatus)"
+            :style="{ color: getApplicationStatusTextColor(scope.row.applicationStatus) }" effect="plain" size="small">
+            {{ getApplicationStatusName(scope.row.applicationStatus) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批进度" width="150" align="center">
+        <template #default="scope">
+          <div class="progress-bar">
+            <div v-for="(segment, index) in getApprovalProcess(scope.row)" :key="index"
+              :class="getSegmentClass(segment, index)" class="progress-segment"></div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template #default="scope">
+          <el-tooltip content="详情" placement="top">
+            <el-button link type="primary" icon="View" @click="openDialog(scope.row.id)">详情</el-button>
+          </el-tooltip>
+          <el-tooltip content="取消" placement="top"
+            v-if="scope.row.applicationStatus == 0 && scope.row.initialApprovalResult == 0">
+            <el-button link type="primary" icon="Close" @click="cancelApply(scope.row.id)">取消</el-button>
+          </el-tooltip>
+          <el-tooltip content="盈亏测算" placement="top"
+            v-if="scope.row.applicationStatus == 0 && scope.row.initialApprovalResult == 0">
+            <el-button link type="primary" icon="Money" @click="processApply(scope.row.id, 1)">盈亏测算</el-button>
+          </el-tooltip>
+          <el-tooltip content="财务报批" placement="top"
+            v-if="scope.row.applicationStatus == 0 && scope.row.financeApprovalResult == 0">
+            <el-button link type="primary" icon="DocumentChecked"
+              @click="processApply(scope.row.id, 2)">财务报批</el-button>
+          </el-tooltip>
+          <el-tooltip content="上会决议" placement="top"
+            v-if="scope.row.applicationStatus == 0 && scope.row.finalApprovalResult == 0">
+            <el-button link type="primary" icon="ChatRound" @click="processApply(scope.row.id, 3)">上会决议</el-button>
+          </el-tooltip>
+        </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" />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-form ref="ratioApplicationRecordRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <!-- 左侧列 -->
+          <el-col :span="12">
+            <el-form-item label="项目分类" prop="itemType">
+              <el-radio-group v-model="form.itemType">
+                <el-radio :label="1">药品</el-radio>
+                <el-radio :label="2">诊疗</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="自付比例" prop="applicationRatio">
+              <el-input v-model="form.applicationRatio" placeholder="请输入自付比例" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="开始时间" prop="startDate">
+              <el-date-picker v-model="form.startDate" type="date" placeholder="选择开始时间" value-format="YYYY-MM-DD"
+                style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <!-- 右侧列 -->
+          <el-col :span="12">
+            <el-form-item label="申请项目" prop="definitionId">
+              <el-input v-model="form.definitionName" placeholder="请选择申请项目" style="width: 100%"
+                :disabled="!form.itemType" readonly @click="handleShowDefinitionDialog">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="二次自付比例" prop="twiceRatio">
+              <el-input v-model="form.twiceRatio" placeholder="请输入二次自付比例" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="结束时间" prop="endDate">
+              <el-date-picker v-model="form.endDate" type="date" placeholder="选择结束时间" value-format="YYYY-MM-DD"
+                style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="申请原因" prop="applicationReason">
+          <el-input type="textarea" :rows="5" v-model="form.applicationReason" placeholder="请输入申请原因" maxlength="500"
+            show-word-limit>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="submitCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 审批对话框 -->
+    <el-dialog :title="processTitle" v-model="processOpen" width="700px" append-to-body>
+      <el-form ref="ratioApplicationProcessRef" :model="processForm" :rules="processRules" label-width="100px">
+        <el-form-item label="审批结果" prop="approvalResult">
+          <el-radio-group v-model="processForm.approvalResult">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="2">驳回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批意见" prop="approvalOpinion">
+          <el-input type="textarea" :rows="5" v-model="processForm.approvalOpinion" placeholder="审批意见" maxlength="500"
+            show-word-limit>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitProcessForm">提 交</el-button>
+          <el-button @click="submitProcessCancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 项目选择弹窗 -->
+    <el-dialog v-model="definitionDialogVisible" title="选择申请项目" width="70%">
+      <el-form :model="queryDefinitionParams" ref="queryDefinitionRef" :inline="true" label-width="68px"
+        @submit.native.prevent>
+        <el-form-item label="项目" prop="searchDefinitionKey">
+          <el-input v-model="queryDefinitionParams.searchKey" placeholder="项目编号/项目名称/医保编码" clearable
+            style="width: 240px" @keyup.enter="handleDefinitionQuery" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleDefinitionQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetDefinitionQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 表格数据 -->
+      <el-table v-loading="definitionLoading" :data="definitionList" highlight-current-row @row-click="handleRowClick"
+        style="width: 100%;" ref="definitionTableRef">
+        <!-- 单选列 -->
+        <el-table-column width="60" align="center">
+          <template #default="scope">
+            <el-radio v-model="selectedDefinitionId" :label="scope.row.id"
+              @change="handleRadioChange(scope.row)">&nbsp;</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目编号" prop="busNo" :show-overflow-tooltip="true" />
+        <el-table-column label="项目名称" prop="name" :show-overflow-tooltip="true" />
+        <el-table-column label="医保编码" prop="ybNo" :show-overflow-tooltip="true" />
+        <el-table-column label="医保等级" prop="chrgitmLvName" :show-overflow-tooltip="true" />
+        <el-table-column label="生产厂家" prop="manufacturerText" :show-overflow-tooltip="true" />
+        <el-table-column label="规格" prop="totalVolume" :show-overflow-tooltip="true" />
+      </el-table>
+      <pagination v-show="definitionTotal > 0" :total="definitionTotal" v-model:page="queryDefinitionParams.pageNo"
+        v-model:limit="queryDefinitionParams.pageSize" @pagination="getDefinitionList" style="margin: 20px 0;" />
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitDefinitionForm">确 定</el-button>
+          <el-button @click="definitionDialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="dialogVisible" :title="`比例调整申请详情 - ${detailData.applicationNo}`" width="1000px"
+      :close-on-click-modal="false" :destroy-on-close="true" class="approval-detail-dialog">
+      <!-- 基本信息区域 -->
+      <div class="basic-info-section">
+        <div class="container-wrapper">
+          <div class="section-header">
+            <i class="el-icon-document"></i>
+            <span>申请基本信息</span>
+          </div>
+          <div class="info-cards">
+            <el-row :gutter="8">
+              <el-col :span="12" v-for="(item, index) in basicInfoItems" :key="index">
+                <el-card shadow="never" class="compact-card">
+                  <div class="horizontal-layout">
+                    <div class="label-column">{{ item.label }}</div>
+                    <div class="value-column">{{ item.value }}</div>
+                  </div>
+                </el-card>
+              </el-col>
+            </el-row>
+
+            <el-card shadow="never" class="compact-card reason-card adaptive-card">
+              <div class="horizontal-layout">
+                <div class="label-column">申请原因</div>
+                <div class="value-column adaptive-content">
+                  {{ detailData.applicationReason || '-' }}
+                </div>
+              </div>
+            </el-card>
+          </div>
+        </div>
+      </div>
+
+      <!-- 审批流程区域 -->
+      <div class="approval-flow-section">
+        <div class="section-header">
+          <i class="el-icon-s-operation"></i>
+          <span>审批流程状态</span>
+        </div>
+
+        <div class="status-summary">
+          <div class="status-badge">
+            <el-tag :type="getOverallStatusType(detailData.applicationStatus)" size="large" class="status-tag">
+              {{ getApplicationStatusName(detailData.applicationStatus) }}
+            </el-tag>
+            <span class="status-desc">{{ getStatusDescription(detailData) }}</span>
+          </div>
+        </div>
+
+        <!-- 水平流程步骤 -->
+        <div class="horizontal-flow">
+          <div class="flow-container">
+            <div v-for="(step, index) in approvalSteps" :key="index" class="flow-step" :class="step.status">
+              <div class="step-header">
+                <div class="step-title">{{ step.title }}</div>
+              </div>
+
+              <div class="step-content">
+                <div v-if="step.approver" class="step-info-item">
+                  <i class="el-icon-user"></i>
+                  <span>{{ step.approver || '待分配' }}</span>
+                </div>
+                <div v-if="step.time" class="step-info-item">
+                  <i class="el-icon-time"></i>
+                  <span>{{ step.time || '待处理' }}</span>
+                </div>
+                <div v-if="step.opinion" class="step-info-item full-width">
+                  <i class="el-icon-chat-line-round"></i>
+                  <span class="opinion-text">{{ step.opinion || '无' }}</span>
+                </div>
+              </div>
+
+              <div class="step-result">
+                <el-tag :type="getResultTagType(step.result)" effect="dark" size="small" class="result-tag">
+                  {{ step.resultText }}
+                </el-tag>
+              </div>
+            </div>
+
+            <!-- 连接线 -->
+            <div class="flow-connectors">
+              <div v-for="n in 3" :key="n" class="connector" :class="getConnectorClass(n)"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="dialog-footer-1">
+        <el-button @click="closeDialog">关闭</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup name="GfStudentList">
+import {
+  getPage,
+  getDetail,
+  add,
+  cancel,
+  process,
+  getDefinitionSelectPage,
+  getPrintList
+} from "@/api/gf/ratioApplicationRecord.js";
+import { computed, ref } from 'vue'
+
+const { proxy } = getCurrentInstance();
+const {
+  application_status,
+} = proxy.useDict(
+  "application_status",
+);
+
+const ratioApplicationRecordList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+const definitionList = ref([]);
+const definitionDialogVisible = ref(false)
+const definitionLoading = ref(true);
+const definitionTotal = ref(0);
+const definitionDateRange = ref([]);
+const selectedDefinitionId = ref(undefined)
+const selectedDefinition = ref(undefined)
+const definitionTableRef = ref();
+const processTitle = ref("");
+const processOpen = ref(false);
+// 选中的行数据
+const selectedRows = ref([])
+
+// 对话框显示状态
+const dialogVisible = ref(false)
+// 详情数据
+const detailData = ref({})
+
+const data = reactive({
+  form: {},
+  processForm: {
+    id: undefined,
+    approvalRole: undefined,
+    approvalResult: 1,
+    approvalOpinion: undefined,
+  },
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    itemType: undefined,
+    applicationStatus: undefined,
+    printable: '0',
+  },
+  queryDefinitionParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    itemType: undefined,
+  },
+  rules: {
+    itemType: [
+      { required: true, message: "项目分类不能为空", trigger: ["blur", "change"] }
+    ],
+    definitionId: [
+      { required: true, message: "申请项目不能为空", trigger: ["blur", "change"] }
+    ],
+    applicationRatio: [
+      { required: true, message: "自付比例不能为空", trigger: ["blur", "change"] },
+      { pattern: /^(100(\.0{1,2})?$|^[1-9]?\d(\.\d{1,2})?)$/, message: '请输入0-100之间的数字，最多保留两位小数', trigger: 'blur' }
+    ],
+    twiceRatio: [
+      { pattern: /^(100(\.0{1,2})?$|^[1-9]?\d(\.\d{1,2})?)$/, message: '请输入0-100之间的数字，最多保留两位小数', trigger: 'blur' }
+    ],
+    startDate: [
+      { required: true, message: "开始时间不能为空", trigger: ["blur", "change"] }
+    ],
+    endDate: [
+      { required: true, message: "结束时间不能为空", trigger: ["blur", "change"] }
+    ],
+    applicationReason: [
+      { required: true, message: "申请原因不能为空", trigger: "change" }
+    ],
+  },
+  processRules: {
+    approvalResult: [
+      { required: true, message: "审批结果不能为空", trigger: ["blur", "change"] }
+    ],
+    approvalOpinion: [
+      { required: true, message: "审批意见不能为空", trigger: ["blur", "change"] }
+    ],
+  },
+});
+
+const { queryParams, form, processForm, rules, processRules, queryDefinitionParams } = toRefs(data);
+
+/** 查询分页 */
+function getList() {
+  loading.value = true;
+  getPage(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+    ratioApplicationRecordList.value = response.data.records;
+    total.value = response.data.total;
+    loading.value = false;
+  });
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 重置新增的表单以及其他数据  */
+function reset() {
+  form.value = {
+    itemType: undefined,
+    applicationRatio: undefined,
+    twiceRatio: undefined,
+    startDate: undefined,
+    endDate: undefined,
+    applicationReason: undefined,
+    definitionId: undefined,
+    definitionName: undefined,
+  };
+  proxy.resetForm("ratioApplicationRecordRef");
+}
+/** 发起申请 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "发起申请";
+}
+
+
+/** 打印申请单 */
+function handlePrint() {
+  for (const row of selectedRows.value) {
+    if (row.applicationStatus != 0 && row.finalApprovalResult != 0) {
+      proxy.$modal.msgWarning("只有等待上会决议的申请才可打印，已为您自动勾选筛选条件");
+      queryParams.value.printable = '1'
+      getList()
+      return
+    }
+  }
+  let itemTypeNow = ''
+  let idArray = []
+  for (const row of selectedRows.value) {
+    if (itemTypeNow && itemTypeNow != row.itemType) {
+      proxy.$modal.msgWarning("只能批量选择药品或诊疗项目，不可同时选择药品和诊疗项目");
+      return
+    }
+    itemTypeNow = row.itemType
+    idArray.push(row.id)
+  }
+  getPrintList(idArray).then(response => {
+    console.log(response.data)
+    //TODO:郭睿打印申请单组件调用
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["ratioApplicationRecordRef"].validate(valid => {
+    if (valid) {
+      add(form.value).then(response => {
+        proxy.$modal.msgSuccess("创建成功");
+        open.value = false;
+        getList();
+      });
+    }
+  });
+}
+/** 取消按钮 */
+function submitCancel() {
+  open.value = false;
+  reset();
+}
+
+
+/** 提交按钮 */
+function submitProcessForm() {
+  proxy.$refs["ratioApplicationProcessRef"].validate(valid => {
+    if (valid) {
+      process(processForm.value).then(response => {
+        proxy.$modal.msgSuccess("提交成功");
+        processOpen.value = false
+        processTitle.value = ""
+        getList();
+      });
+    }
+  });
+}
+/** 取消按钮 */
+function submitProcessCancel() {
+  processOpen.value = false;
+  processForm.value = {
+    id: undefined,
+    approvalRole: undefined,
+    approvalResult: 1,
+    approvalOpinion: undefined,
+  };
+  proxy.resetForm("ratioApplicationProcessRef");
+}
+
+
+// 打开对话框方法
+const processApply = (id, role) => {
+  console.log(id)
+  console.log(role)
+  if (role == 1) {
+    processTitle.value = "盈亏测算"
+  } else if (role == 2) {
+    processTitle.value = "财务报批"
+  } else if (role == 3) {
+    processTitle.value = "上会决议"
+  }
+  processForm.value = {
+    id: id,
+    approvalRole: role,
+    approvalResult: 1,
+    approvalOpinion: undefined,
+  };
+  processOpen.value = true;
+}
+
+/** 处理申请项目选择框 */
+function handleShowDefinitionDialog() {
+  // 确保有项目分类后再打开弹窗
+  if (!form.value.itemType) {
+    proxy.$modal.msgWarning("请先选择项目分类");
+    return;
+  }
+  definitionDialogVisible.value = true;
+  // 重置弹窗内的选中状态
+  selectedDefinitionId.value = undefined;
+  selectedDefinition.value = undefined;
+  // 重置查询条件并获取列表
+  queryDefinitionParams.value.pageNo = 1;
+  queryDefinitionParams.value.searchKey = '';
+  getDefinitionList(); // 此函数内部已包含回显逻辑
+}
+
+// 行点击事件
+const handleRowClick = (row) => {
+  selectedDefinitionId.value = row.id
+  selectedDefinition.value = row
+}
+
+// 单选按钮变化事件
+const handleRadioChange = (row) => {
+  selectedDefinition.value = row
+}
+
+//提交单选表单
+const submitDefinitionForm = () => {
+  if (!selectedDefinition.value) {
+    proxy.$modal.msgWarning("请选择一个项目");
+    return
+  }
+  if (selectedDefinition.value.chrgitmLv == 3) {
+    proxy.$modal.msgWarning("不能选择医保自费项目");
+    return
+  }
+  // 将id和name传回表单
+  form.value.definitionId = selectedDefinition.value.id
+  form.value.definitionName = selectedDefinition.value.name
+  definitionDialogVisible.value = false
+}
+
+// 监听项目分类变化，切换时清空已选项目
+watch(() => form.value.itemType, (newVal, oldVal) => {
+  // 确保分类确实发生了变化，并且新值不是undefined或null
+  if (newVal !== oldVal && newVal != null) {
+    form.value.definitionId = undefined;
+    form.value.definitionName = undefined;
+    // 同时清空弹窗内可能存在的选中状态
+    selectedDefinitionId.value = undefined;
+    selectedDefinition.value = null;
+  }
+});
+
+/** 获取分页项目列表 */
+function getDefinitionList() {
+  definitionLoading.value = true;
+  queryDefinitionParams.value.itemType = form.value.itemType; // 确保传入了当前分类
+  getDefinitionSelectPage(proxy.addDateRange(queryDefinitionParams.value, definitionDateRange.value)).then(response => {
+    definitionList.value = response.data.records;
+    definitionTotal.value = response.data.total;
+    definitionLoading.value = false;
+
+    // 重点：在下一个时间片（DOM更新后）执行回显逻辑
+    proxy.$nextTick(() => {
+      // 如果表单中已有选中的项目ID
+      if (form.value.definitionId) {
+        // 在当前页数据中查找对应的行
+        const selectedRow = definitionList.value.find(item => item.id === form.value.definitionId);
+        if (selectedRow) {
+          // 找到后，更新弹窗内的选中状态
+          selectedDefinitionId.value = selectedRow.id;
+          selectedDefinition.value = selectedRow;
+        }
+      }
+    });
+  }).catch(error => {
+    definitionLoading.value = false;
+    proxy.$modal.msgError("加载项目列表失败");
+  });
+}
+/** 搜索按钮操作 */
+function handleDefinitionQuery() {
+  queryDefinitionParams.value.pageNo = 1;
+  getDefinitionList();
+}
+/** 重置按钮操作 */
+function resetDefinitionQuery() {
+  definitionDateRange.value = [];
+  proxy.resetForm("queryDefinitionRef");
+  handleDefinitionQuery();
+}
+
+// 确保这些方法在setup中正确定义
+function getApplicationStatusType(status) {
+  const typeMap = {
+    '0': 'primary',
+    '1': 'success',
+    '2': 'danger',
+    '3': 'info'
+  }
+  return typeMap[status]
+}
+
+function getApplicationStatusColor(status) {
+  const colorMap = {
+    '0': '#E6F7FF',
+    '1': '#F3FEF0',
+    '2': '#FBF2F2',
+    '3': '#8F9293'
+  }
+  return colorMap[status]
+}
+
+function getApplicationStatusTextColor(status) {
+  const colorMap = {
+    '3': '#FFF'
+  }
+  return colorMap[status]
+}
+
+function getApplicationStatusName(status) {
+  const colorMap = {
+    '0': '处理中',
+    '1': '已通过',
+    '2': '已驳回',
+    '3': '已取消'
+  }
+  return colorMap[status]
+}
+
+// 获取审批进度数组
+const getApprovalProcess = (row) => {
+  if (row.applicationStatus === 0 && row.initialApprovalResult === 0) {
+    return [1, 2, 0, 0]
+  }
+  if (row.applicationStatus === 3) {
+    return [3, 0, 0, 0]
+  }
+  if (row.applicationStatus === 0 && row.initialApprovalResult === 1 && row.financeApprovalResult === 0) {
+    return [1, 1, 2, 0]
+  }
+  if (row.applicationStatus === 2 && row.initialApprovalResult === 2) {
+    return [1, 3, 0, 0]
+  }
+  if (row.applicationStatus === 0 && row.initialApprovalResult === 1 && row.financeApprovalResult === 1 && row.finalApprovalResult === 0) {
+    return [1, 1, 1, 2]
+  }
+  if (row.applicationStatus === 2 && row.initialApprovalResult === 1 && row.financeApprovalResult === 2) {
+    return [1, 1, 3, 0]
+  }
+  if (row.applicationStatus === 1 && row.initialApprovalResult === 1 && row.financeApprovalResult === 1 && row.finalApprovalResult === 1) {
+    return [1, 1, 1, 1]
+  }
+  if (row.applicationStatus === 2 && row.initialApprovalResult === 1 && row.financeApprovalResult === 1 && row.finalApprovalResult === 2) {
+    return [1, 1, 1, 3]
+  }
+  return [0, 0, 0, 0];
+};
+
+// 获取段落的CSS类名
+const getSegmentClass = (segment, index) => {
+  const baseClass = index === 0 ? 'first-segment' :
+    index === 3 ? 'last-segment' : 'middle-segment';
+
+  if (segment === 1) {
+    return `${baseClass} completed`; // 已完成 - 绿色
+  } else if (segment === 2) {
+    return `${baseClass} current`;    // 当前进行中 - 蓝色
+  } else if (segment === 3) {
+    return `${baseClass} rejected`;   // 驳回/取消 - 红色
+  } else {
+    return `${baseClass} pending`;    // 未开始 - 灰色
+  }
+};
+
+// 打开对话框方法
+const openDialog = (id) => {
+  getDetail(id).then(response => {
+    detailData.value = response.data
+  })
+  dialogVisible.value = true
+}
+
+// 打开对话框方法
+const closeDialog = () => {
+  dialogVisible.value = false
+}
+
+// 打开对话框方法
+const cancelApply = (id) => {
+  cancel(id).then(response => {
+    proxy.$modal.msgSuccess("取消成功");
+    getList();
+  })
+}
+
+// 计算审批步骤数据
+const approvalSteps = computed(() => {
+  const data = detailData.value
+  const steps = []
+
+  // 申请提交步骤
+  steps.push({
+    title: '申请提交',
+    approver: data.applicant,
+    time: data.applicationTime,
+    opinion: data.applicationReason,
+    result: 'submitted',
+    resultText: '已提交',
+    status: 'success',
+    icon: 'el-icon-upload'
+  })
+
+  // 盈亏测算步骤
+  const initialStatus = getStepStatus(data.initialApprovalResult, 1, data.applicationStatus)
+  steps.push({
+    title: '盈亏测算',
+    approver: data.initialApprover,
+    time: data.initialApprovalTime,
+    opinion: data.initialApprovalOpinion,
+    result: data.initialApprovalResult,
+    resultText: getResultText(data.initialApprovalResult),
+    status: initialStatus,
+    icon: 'el-icon-calculator'
+  })
+
+  // 财务报批步骤
+  const financeStatus = getStepStatus(data.financeApprovalResult, 2, data.applicationStatus, data.initialApprovalResult)
+  steps.push({
+    title: '财务报批',
+    approver: data.financeApprover,
+    time: data.financeApprovalTime,
+    opinion: data.financeApprovalOpinion,
+    result: data.financeApprovalResult,
+    resultText: getResultText(data.financeApprovalResult),
+    status: financeStatus,
+    icon: 'el-icon-money'
+  })
+
+  // 上会决议步骤
+  const finalStatus = getStepStatus(data.finalApprovalResult, 3, data.applicationStatus, data.financeApprovalResult)
+  steps.push({
+    title: '上会决议',
+    approver: data.finalRecorder,
+    time: data.finalRecordTime,
+    opinion: data.finalApprovalOpinion,
+    result: data.finalApprovalResult,
+    resultText: getResultText(data.finalApprovalResult),
+    status: finalStatus,
+    icon: 'el-icon-s-check'
+  })
+
+  return steps
+})
+
+// 计算当前激活的步骤索引
+const currentStepIndex = computed(() => {
+  const data = detailData.value
+  if (data.applicationStatus === 3) return -1 // 已取消
+  if (data.finalApprovalResult === 1) return 3 // 会议通过
+  if (data.finalApprovalResult === 0) return 3 // 会议处理中
+  if (data.financeApprovalResult === 1) return 2 // 财务通过，进入会议
+  if (data.financeApprovalResult === 0) return 2 // 财务处理中
+  if (data.initialApprovalResult === 1) return 1 // 测算通过，进入财务
+  if (data.initialApprovalResult === 0) return 1 // 测算处理中
+  return 0 // 刚提交
+})
+
+// 获取步骤状态
+const getStepStatus = (result, stepIndex, appStatus, prevResult) => {
+  if (appStatus === 3) return 'warning' // 已取消
+
+  // 如果前面的步骤未通过，当前步骤为未开始
+  if (stepIndex > 1 && prevResult !== 1) return 'wait'
+
+  if (result === 1) return 'success'
+  if (result === 2) return 'error'
+  if (result === 0) return stepIndex === currentStepIndex.value ? 'process' : 'wait'
+  return 'wait'
+}
+
+// 获取结果文本
+const getResultText = (result) => {
+  const map = { 0: '处理中', 1: '通过', 2: '驳回', 3: '取消' }
+  return map[result] || '未开始'
+}
+
+// 获取结果标签类型
+const getResultTagType = (result) => {
+  const map = { 0: 'info', 1: 'success', 2: 'danger', 3: 'warning' }
+  return map[result] || 'info'
+}
+
+// 获取整体状态类型
+const getOverallStatusType = (status) => {
+  const map = { 0: 'primary', 1: 'success', 2: 'danger', 3: 'warning' }
+  return map[status] || 'info'
+}
+
+// 获取状态描述
+const getStatusDescription = (data) => {
+  if (data.applicationStatus === 0) {
+    if (data.initialApprovalResult === 0) return '等待盈亏测算'
+    if (data.financeApprovalResult === 0) return '等待财务报批'
+    if (data.finalApprovalResult === 0) return '等待上会决议'
+  }
+  return getApplicationStatusName(data.applicationStatus)
+}
+
+// 日期格式化方法
+const formatDate = (date) => {
+  if (!date) return '-'
+  return new Date(date).toLocaleDateString('zh-CN')
+}
+
+const formatDateTime = (date) => {
+  if (!date) return '-'
+  return new Date(date).toLocaleString('zh-CN')
+}
+
+// 在 script 中添加计算属性
+const basicInfoItems = computed(() => [
+  { label: '项目名称', value: detailData.value.name || '-' },
+  { label: '项目编号', value: detailData.value.busNo || '-' },
+  { label: '项目分类', value: detailData.value.itemTypeName || '-' },
+  { label: '医保等级', value: detailData.value.chrgitmLvName || '-' },
+  { label: '自付比例', value: detailData.value.applicationRatio ? `${detailData.value.applicationRatio}%` : '-' },
+  { label: '原自付比例', value: detailData.value.oldRatio ? `${detailData.value.oldRatio}%` : '-' },
+  { label: '全价', value: detailData.value.totalPrice ? `${detailData.value.totalPrice}元` : '-' },
+  { label: '价格差', value: detailData.value.priceDiff ? `${detailData.value.priceDiff}元` : '-' },
+  { label: '二次比例', value: detailData.value.twiceRatio ? `${detailData.value.twiceRatio}%` : '-' },
+  { label: '原二次比例', value: detailData.value.oldTwiceRatio ? `${detailData.value.oldTwiceRatio}%` : '-' },
+  { label: '开始时间', value: formatDate(detailData.value.startDate) },
+  { label: '结束时间', value: formatDate(detailData.value.endDate) },
+  { label: '申请人', value: detailData.value.applicant || '-' },
+  { label: '申请时间', value: formatDateTime(detailData.value.applicationTime) }
+]);
+
+// 获取连接线样式
+const getConnectorClass = (connectorIndex) => {
+  const steps = approvalSteps.value;
+
+  // 连接线索引从1开始，对应步骤0到步骤1、步骤1到步骤2、步骤2到步骤3之间的连接线
+  const prevStepIndex = connectorIndex - 1;
+
+  if (prevStepIndex < 0 || prevStepIndex >= steps.length) {
+    return 'pending';
+  }
+
+  const prevStep = steps[prevStepIndex];
+  const currentStep = steps[connectorIndex];
+
+  // 如果前一步骤是成功状态
+  if (prevStep.status === 'success') {
+    // 如果当前步骤是处理中，连接线显示为进行中状态
+    if (currentStep.status === 'process') {
+      return 'process';
+    }
+    // 如果当前步骤是错误状态，连接线显示为错误状态
+    else if (currentStep.status === 'error') {
+      return 'error';
+    }
+    // 如果当前步骤是成功，连接线也显示成功
+    else if (currentStep.status === 'success') {
+      return 'success';
+    }
+    // 其他情况显示等待状态
+    else {
+      return 'pending';
+    }
+  }
+  // 如果前一步骤是处理中状态
+  else if (prevStep.status === 'process') {
+    return 'process';
+  }
+  // 如果前一步骤是错误状态
+  else if (prevStep.status === 'error') {
+    return 'error';
+  }
+  // 默认等待状态
+  else {
+    return 'pending';
+  }
+};
+
+// 暴露方法给父组件
+defineExpose({
+  openDialog
+})
+
+// 处理表格选择变化
+const handleSelectionChange = (selection) => {
+  selectedRows.value = selection
+}
+
+
+getList();
+</script>
+
+<style>
+.app-container {
+  padding: 20px;
+}
+
+.mb8 {
+  margin-bottom: 8px;
+}
+
+.progress-bar {
+  display: flex;
+  height: 24px;
+  border-radius: 4px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.progress-segment {
+  flex: 1;
+  transition: all 0.3s ease;
+  border-right: 2px solid #fff;
+}
+
+.progress-segment:hover {
+  transform: scale(1.05);
+  z-index: 1;
+}
+
+.first-segment {
+  border-radius: 4px 0 0 4px;
+}
+
+.last-segment {
+  border-radius: 0 4px 4px 0;
+  border-right: none;
+}
+
+.completed {
+  background: #67c23a;
+}
+
+.current {
+  background: #409eff;
+}
+
+.pending {
+  background: #c0c4cc;
+}
+
+.rejected {
+  background: #f56c6c;
+}
+
+.approval-detail-dialog :deep(.el-dialog__body) {
+  padding: 20px;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+.approval-detail-dialog :deep(.el-dialog__header) {
+  border-bottom: 1px solid #e8e8e8;
+  padding: 15px 20px;
+}
+
+.section-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.section-header i {
+  margin-right: 8px;
+  color: #409eff;
+}
+
+.basic-info-section {
+  margin-bottom: 20px;
+}
+
+.container-wrapper {
+  background-color: #f8f9fa;
+  border: 1px solid #e8e8e8;
+  border-radius: 6px;
+  padding: 16px;
+}
+
+.info-cards {
+  border: none;
+  padding: 0;
+}
+
+.compact-card {
+  margin-bottom: 8px;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+}
+
+.el-card__body {
+  padding: 0px 20px 0px 20px !important;
+}
+
+/* 申请原因卡片自适应 */
+.adaptive-card {
+  height: auto;
+}
+
+.horizontal-layout {
+  display: flex;
+  align-items: stretch;
+  min-height: inherit;
+}
+
+.label-column {
+  flex: 0 0 100px;
+  font-weight: 600;
+  color: #333;
+  padding: 12px;
+  border-right: 1px solid #e8e8e8;
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+}
+
+.value-column {
+  flex: 1;
+  padding: 12px;
+  display: flex;
+  align-items: center;
+  word-break: break-word;
+  min-height: 20px;
+  line-height: 1.4;
+  font-size: 13px;
+  color: #666;
+}
+
+.adaptive-content {
+  max-height: 400px;
+  overflow-y: auto;
+  align-items: flex-start;
+}
+
+.approval-flow-section {
+  padding: 20px;
+  background: #fafbfc;
+  border-radius: 8px;
+  border: 1px solid #eaeef2;
+}
+
+.status-summary {
+  margin-bottom: 25px;
+  padding: 15px;
+  background: white;
+  border-radius: 6px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.status-badge {
+  display: flex;
+  align-items: center;
+  gap: 15px;
+}
+
+.status-tag {
+  font-size: 14px;
+  padding: 6px 12px;
+}
+
+.status-desc {
+  color: #606266;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.horizontal-flow {
+  overflow-x: auto;
+  padding: 10px 0;
+}
+
+.flow-container {
+  display: flex;
+  min-width: 800px;
+  position: relative;
+  padding: 0 20px;
+}
+
+.flow-step {
+  flex: 1;
+  position: relative;
+  z-index: 2;
+  background: white;
+  border-radius: 8px;
+  padding: 15px;
+  margin: 0 5px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  transition: all 0.3s ease;
+  border: 1px solid #eaeef2;
+}
+
+.flow-step:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+}
+
+.flow-step.success {
+  border-top: 3px solid #67c23a;
+}
+
+.flow-step.process {
+  border-top: 3px solid #409eff;
+  animation: pulse 2s infinite;
+}
+
+.flow-step.wait {
+  border-top: 3px solid #c0c4cc;
+}
+
+.flow-step.error {
+  border-top: 3px solid #f56c6c;
+}
+
+.step-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.step-title {
+  font-weight: 600;
+  color: #303133;
+  font-size: 14px;
+}
+
+.step-content {
+  flex: 1;
+  /* 占据剩余空间 */
+  margin-bottom: 10px;
+  min-height: 100px;
+  /* 内容区域最小高度 */
+}
+
+/* 确保步骤内容不会与底部结果重叠 */
+.step-content:has(+ .step-result) {
+  padding-bottom: 40px;
+}
+
+.step-info-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+  font-size: 13px;
+  color: #606266;
+}
+
+.step-info-item i {
+  margin-right: 6px;
+  width: 16px;
+  text-align: center;
+}
+
+.step-info-item.full-width {
+  align-items: flex-start;
+  min-height: 40px;
+  max-height: 80px;
+  /* 根据需求调整最大高度 */
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 6px 8px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+  border: 1px solid #e8e8e8;
+  margin-top: 4px;
+}
+
+.step-info-item.full-width .opinion-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+  line-height: 1.4;
+  width: 100%;
+}
+
+/* 自定义滚动条样式 */
+.step-info-item.full-width::-webkit-scrollbar {
+  width: 4px;
+}
+
+.step-info-item.full-width::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 2px;
+}
+
+.step-info-item.full-width::-webkit-scrollbar-thumb {
+  background: #c1c1c1;
+  border-radius: 2px;
+}
+
+.step-info-item.full-width::-webkit-scrollbar-thumb:hover {
+  background: #a8a8a8;
+}
+
+.opinion-text {
+  line-height: 1.4;
+  word-break: break-word;
+}
+
+.step-result {
+  position: absolute;
+  bottom: 15px;
+  left: 50%;
+  transform: translateX(-50%);
+  width: calc(100% - 30px);
+  /* 减去左右padding */
+  text-align: center;
+  padding: 8px 0;
+  background-color: white;
+  z-index: 2;
+}
+
+.result-tag {
+  font-weight: 500;
+}
+
+.flow-connectors {
+  position: absolute;
+  top: 40px;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 80px;
+  z-index: 1;
+}
+
+.connector {
+  height: 2px;
+  flex: 1;
+  margin: 0 10px;
+  position: relative;
+}
+
+.connector::before {
+  content: '';
+  position: absolute;
+  top: -3px;
+  right: -4px;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: #c0c4cc;
+}
+
+.connector.success {
+  background: linear-gradient(to right, #67c23a, #67c23a);
+}
+
+.connector.success::before {
+  background: #67c23a;
+}
+
+.connector.process {
+  background: linear-gradient(to right, #67c23a, #409eff);
+}
+
+.connector.process::before {
+  background: #409eff;
+}
+
+.connector.pending {
+  background: #f0f0f0;
+}
+
+.connector.pending::before {
+  background: #c0c4cc;
+}
+
+.connector.error {
+  background: linear-gradient(to right, #67c23a, #f56c6c);
+}
+
+.connector.error::before {
+  background: #f56c6c;
+}
+
+@keyframes pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(64, 158, 255, 0.4);
+  }
+
+  70% {
+    box-shadow: 0 0 0 6px rgba(64, 158, 255, 0);
+  }
+
+  100% {
+    box-shadow: 0 0 0 0 rgba(64, 158, 255, 0);
+  }
+}
+
+.dialog-footer-1 {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding: 10px 20px 10px 0;
+  margin-top: 20px;
+}
+
+.dialog-footer-1 .el-button {
+  min-width: 100px;
+  height: 36px;
+  font-size: 14px;
+}
+
+/* 响应式调整 */
+@media (max-width: 768px) {
+  .approval-detail-dialog {
+    width: 95% !important;
+  }
+
+  .flow-container {
+    flex-direction: column;
+    min-width: auto;
+  }
+
+  .flow-step {
+    display: flex;
+    flex-direction: column;
+    min-height: 180px;
+    /* 确保有足够的最小高度 */
+    position: relative;
+    padding-bottom: 50px;
+    /* 为底部结果区域留出空间 */
+  }
+
+  .flow-connectors {
+    display: none;
+  }
+
+  .status-badge {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 10px;
+  }
+
+  .adaptive-content {
+    max-height: 300px;
+  }
+
+  .label-column {
+    flex: 0 0 80px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/gf/ratioManage/index.vue b/openhis-ui-vue3/src/views/gf/ratioManage/index.vue
new file mode 100644
index 00000000..9d84e970
--- /dev/null
+++ b/openhis-ui-vue3/src/views/gf/ratioManage/index.vue
@@ -0,0 +1,664 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-row class="section-title">公费医疗自付总体比例</el-row>
+        <el-form :inline="true" label-width="68px">
+          <el-form-item>
+            <el-button type="primary" icon="Edit" @click="handleEdit">修改</el-button>
+            <el-button icon="Refresh" @click="resetTypeQuery">刷新</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table v-loading="typeLoading" :data="typeRatioList" height="600" stripe>
+          <el-table-column label="医保分项编码" prop="ybClass" :show-overflow-tooltip="true" align="center" />
+          <el-table-column label="医保分项名称" prop="ybClassName" :show-overflow-tooltip="true" align="center" />
+          <el-table-column label="医保等级" prop="ybLvName" :show-overflow-tooltip="true" align="center" />
+          <!-- 自付比例列 -->
+          <el-table-column label="自付比例" align="center" width="150">
+            <template #default="scope">
+              <span
+                v-if="scope.row.selfRatio !== null && scope.row.selfRatio !== undefined && scope.row.selfRatio !== ''">
+                {{ scope.row.selfRatio }}%
+              </span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="18">
+        <el-row class="section-title">单个药品/诊疗现行自付比例</el-row>
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
+          <el-form-item label="项目" prop="searchKey">
+            <el-input v-model="queryParams.searchKey" placeholder="项目编号/项目名称/医保编码" clearable style="width: 240px"
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="项目分类" prop="itemType" label-width="100">
+            <el-select v-model="queryParams.itemType" clearable style="width: 200px;">
+              <el-option label="药品" value="1"></el-option>
+              <el-option label="诊疗" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetIndividualQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <!-- 表格数据 -->
+        <el-table v-loading="individualLoading" :data="individualRatioList">
+          <el-table-column label="项目编号" prop="busNo" :show-overflow-tooltip="true" />
+          <el-table-column label="项目名称" prop="name" :show-overflow-tooltip="true" />
+          <el-table-column label="医保编码" width="250">
+            <template #default="scope">
+              <span v-if="scope.row.ybNo !== null && scope.row.ybNo !== undefined && scope.row.ybNo !== ''">
+                {{ scope.row.ybNo }}
+              </span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目分类" prop="itemTypeName" :show-overflow-tooltip="true" width="110" align="center" />
+          <el-table-column label="医保等级" prop="chrgitmLvName" :show-overflow-tooltip="true" width="110" align="center" />
+          <!-- 自付比例列 -->
+          <el-table-column label="自付比例" align="center" width="150">
+            <template #default="scope">
+              <span
+                v-if="scope.row.selfRatio !== null && scope.row.selfRatio !== undefined && scope.row.selfRatio !== ''">
+                {{ scope.row.selfRatio }}%
+              </span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <!-- 二次自付比例列 -->
+          <el-table-column label="二次自付比例" align="center" width="150">
+            <template #default="scope">
+              <span
+                v-if="scope.row.twiceRatio !== null && scope.row.twiceRatio !== undefined && scope.row.twiceRatio !== ''">
+                {{ scope.row.twiceRatio }}%
+              </span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="开始时间" prop="startDate" :show-overflow-tooltip="true" align="center" />
+          <el-table-column label="结束时间" prop="endDate" :show-overflow-tooltip="true" align="center" />
+        </el-table>
+
+        <pagination v-show="individualTotal > 0" :total="individualTotal" v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize" @pagination="getIndividualList" />
+      </el-col>
+    </el-row>
+
+    <!-- 修改对话框 -->
+    <el-dialog title="修改总体自付比例" v-model="typeRatioOpen" width="1000px" append-to-body>
+      <el-form ref="typeRatioRef" :model="typeRatioForm" :rules="rules" label-width="180px">
+        <el-row :gutter="20">
+          <!-- 左侧列 -->
+          <el-col :span="12">
+            <el-form-item label="床位费比例（甲类）" prop="a01ratio">
+              <el-input v-model="typeRatioForm.a01ratio" placeholder="请输入床位费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="诊察费比例（甲类）" prop="a02ratio">
+              <el-input v-model="typeRatioForm.a02ratio" placeholder="请输入诊察费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="检查费比例（甲类）" prop="a03ratio">
+              <el-input v-model="typeRatioForm.a03ratio" placeholder="请输入检查费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="化验费比例（甲类）" prop="a04ratio">
+              <el-input v-model="typeRatioForm.a04ratio" placeholder="请输入化验费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="治疗费比例（甲类）" prop="a05ratio">
+              <el-input v-model="typeRatioForm.a05ratio" placeholder="请输入治疗费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="手术费比例（甲类）" prop="a06ratio">
+              <el-input v-model="typeRatioForm.a06ratio" placeholder="请输入手术费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="护理费比例（甲类）" prop="a07ratio">
+              <el-input v-model="typeRatioForm.a07ratio" placeholder="请输入护理费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="卫生材料费比例（甲类）" prop="a08ratio">
+              <el-input v-model="typeRatioForm.a08ratio" placeholder="请输入卫生材料费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="西药费比例（甲类）" prop="a09ratio">
+              <el-input v-model="typeRatioForm.a09ratio" placeholder="请输入西药费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="中药饮片费比例（甲类）" prop="a10ratio">
+              <el-input v-model="typeRatioForm.a10ratio" placeholder="请输入中药饮片费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="中成药费比例（甲类）" prop="a11ratio">
+              <el-input v-model="typeRatioForm.a11ratio" placeholder="请输入中成药费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="一般诊疗费比例（甲类）" prop="a12ratio">
+              <el-input v-model="typeRatioForm.a12ratio" placeholder="请输入一般诊疗费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="挂号费比例（甲类）" prop="a13ratio">
+              <el-input v-model="typeRatioForm.a13ratio" placeholder="请输入挂号费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="其他费比例（甲类）" prop="a14ratio">
+              <el-input v-model="typeRatioForm.a14ratio" placeholder="请输入其他费比例（甲类）" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 右侧列 -->
+          <el-col :span="12">
+            <el-form-item label="床位费比例（乙类）" prop="b01ratio">
+              <el-input v-model="typeRatioForm.b01ratio" placeholder="请输入床位费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="诊察费比例（乙类）" prop="b02ratio">
+              <el-input v-model="typeRatioForm.b02ratio" placeholder="请输入诊察费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="检查费比例（乙类）" prop="b03ratio">
+              <el-input v-model="typeRatioForm.b03ratio" placeholder="请输入检查费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="化验费比例（乙类）" prop="b04ratio">
+              <el-input v-model="typeRatioForm.b04ratio" placeholder="请输入化验费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="治疗费比例（乙类）" prop="b05ratio">
+              <el-input v-model="typeRatioForm.b05ratio" placeholder="请输入治疗费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="手术费比例（乙类）" prop="b06ratio">
+              <el-input v-model="typeRatioForm.b06ratio" placeholder="请输入手术费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="护理费比例（乙类）" prop="b07ratio">
+              <el-input v-model="typeRatioForm.b07ratio" placeholder="请输入护理费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="卫生材料费比例（乙类）" prop="b08ratio">
+              <el-input v-model="typeRatioForm.b08ratio" placeholder="请输入卫生材料费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="西药费比例（乙类）" prop="b09ratio">
+              <el-input v-model="typeRatioForm.b09ratio" placeholder="请输入西药费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="中药饮片费比例（乙类）" prop="b10ratio">
+              <el-input v-model="typeRatioForm.b10ratio" placeholder="请输入中药饮片费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="中成药费比例（乙类）" prop="b11ratio">
+              <el-input v-model="typeRatioForm.b11ratio" placeholder="请输入中成药费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="一般诊疗费比例（乙类）" prop="b12ratio">
+              <el-input v-model="typeRatioForm.b12ratio" placeholder="请输入一般诊疗费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="挂号费比例（乙类）" prop="b13ratio">
+              <el-input v-model="typeRatioForm.b13ratio" placeholder="请输入挂号费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="其他费比例（乙类）" prop="b14ratio">
+              <el-input v-model="typeRatioForm.b14ratio" placeholder="请输入其他费比例（乙类）" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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="GfRatioManage">
+import {
+  getTypeRatioList,
+  saveTypeRatioList,
+  getIndividualRatioPage
+} from "@/api/gf/ratioManage";
+
+const { proxy } = getCurrentInstance();
+
+const typeRatioOpen = ref(false);
+const showSearch = ref(true);
+const individualRatioList = ref([]);
+const individualLoading = ref(true);
+const individualTotal = ref(0);
+const individualDateRange = ref([]);
+const typeRatioList = ref([]);
+const typeLoading = ref(true);
+const typeDateRange = ref([]);
+
+// 验证规则
+const validateRatio = (rule, value, callback) => {
+  if (value === '' || value === null) {
+    return callback(new Error('自付比例不能为空'));
+  }
+  const numValue = parseFloat(value);
+  if (isNaN(numValue)) {
+    return callback(new Error('请输入有效数字'));
+  }
+  if (numValue < 0 || numValue > 100) {
+    return callback(new Error('自付比例必须在0~100之间'));
+  }
+  // 验证小数位（可选）
+  if (value.toString().includes('.') && value.toString().split('.')[1].length > 2) {
+    return callback(new Error('最多保留两位小数'));
+  }
+  callback();
+};
+
+const data = reactive({
+  typeRatioForm: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    itemType: undefined,
+  },
+  rules: {
+    a01ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b01ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a02ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b02ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a03ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b03ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a04ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b04ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a05ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b05ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a06ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b06ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a07ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b07ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a08ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b08ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a09ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b09ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a10ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b10ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a11ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b11ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a12ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b12ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a13ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b13ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    a14ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+    b14ratio: [
+      { pattern: /^\d*(\.\d{0,2})?$/, message: '请输入数字，最多保留两位小数', trigger: 'blur' },
+      { validator: validateRatio, trigger: 'blur' }
+    ],
+  }
+});
+
+const { queryParams, typeRatioForm, rules } = toRefs(data);
+
+/** 查询单项比例分页 */
+function getIndividualList() {
+  individualLoading.value = true;
+  getIndividualRatioPage(proxy.addDateRange(queryParams.value, individualDateRange.value)).then(response => {
+    individualRatioList.value = response.data.records;
+    individualTotal.value = response.data.total;
+    individualLoading.value = false;
+  });
+}
+
+/** 查询单项比例分页 */
+function getTypeList() {
+  typeLoading.value = true;
+  getTypeRatioList(proxy.addDateRange(queryParams.value, typeDateRange.value)).then(response => {
+    typeRatioList.value = response.data;
+    typeLoading.value = false;
+  });
+}
+
+/** 刷新按钮操作 */
+function resetTypeQuery() {
+  getTypeList();
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getIndividualList();
+}
+/** 重置按钮操作 */
+function resetIndividualQuery() {
+  individualDateRange.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+/** 修改总体比例 */
+function handleEdit() {
+  typeRatioOpen.value = true;
+  getTypeRatioList(proxy.addDateRange(queryParams.value, typeDateRange.value)).then(response => {
+    typeRatioList.value = response.data;
+    for (const r of typeRatioList.value) {
+      if (r.ybClass == '01' && r.ybLv == '1') {
+        typeRatioForm.value.a01ratio = r.selfRatio
+      }
+      if (r.ybClass == '01' && r.ybLv == '2') {
+        typeRatioForm.value.b01ratio = r.selfRatio
+      }
+      if (r.ybClass == '02' && r.ybLv == '1') {
+        typeRatioForm.value.a02ratio = r.selfRatio
+      }
+      if (r.ybClass == '02' && r.ybLv == '2') {
+        typeRatioForm.value.b02ratio = r.selfRatio
+      }
+      if (r.ybClass == '03' && r.ybLv == '1') {
+        typeRatioForm.value.a03ratio = r.selfRatio
+      }
+      if (r.ybClass == '03' && r.ybLv == '2') {
+        typeRatioForm.value.b03ratio = r.selfRatio
+      }
+      if (r.ybClass == '04' && r.ybLv == '1') {
+        typeRatioForm.value.a04ratio = r.selfRatio
+      }
+      if (r.ybClass == '04' && r.ybLv == '2') {
+        typeRatioForm.value.b04ratio = r.selfRatio
+      }
+      if (r.ybClass == '05' && r.ybLv == '1') {
+        typeRatioForm.value.a05ratio = r.selfRatio
+      }
+      if (r.ybClass == '05' && r.ybLv == '2') {
+        typeRatioForm.value.b05ratio = r.selfRatio
+      }
+      if (r.ybClass == '06' && r.ybLv == '1') {
+        typeRatioForm.value.a06ratio = r.selfRatio
+      }
+      if (r.ybClass == '06' && r.ybLv == '2') {
+        typeRatioForm.value.b06ratio = r.selfRatio
+      }
+      if (r.ybClass == '07' && r.ybLv == '1') {
+        typeRatioForm.value.a07ratio = r.selfRatio
+      }
+      if (r.ybClass == '07' && r.ybLv == '2') {
+        typeRatioForm.value.b07ratio = r.selfRatio
+      }
+      if (r.ybClass == '08' && r.ybLv == '1') {
+        typeRatioForm.value.a08ratio = r.selfRatio
+      }
+      if (r.ybClass == '08' && r.ybLv == '2') {
+        typeRatioForm.value.b08ratio = r.selfRatio
+      }
+      if (r.ybClass == '09' && r.ybLv == '1') {
+        typeRatioForm.value.a09ratio = r.selfRatio
+      }
+      if (r.ybClass == '09' && r.ybLv == '2') {
+        typeRatioForm.value.b09ratio = r.selfRatio
+      }
+      if (r.ybClass == '10' && r.ybLv == '1') {
+        typeRatioForm.value.a10ratio = r.selfRatio
+      }
+      if (r.ybClass == '10' && r.ybLv == '2') {
+        typeRatioForm.value.b10ratio = r.selfRatio
+      }
+      if (r.ybClass == '11' && r.ybLv == '1') {
+        typeRatioForm.value.a11ratio = r.selfRatio
+      }
+      if (r.ybClass == '11' && r.ybLv == '2') {
+        typeRatioForm.value.b11ratio = r.selfRatio
+      }
+      if (r.ybClass == '12' && r.ybLv == '1') {
+        typeRatioForm.value.a12ratio = r.selfRatio
+      }
+      if (r.ybClass == '12' && r.ybLv == '2') {
+        typeRatioForm.value.b12ratio = r.selfRatio
+      }
+      if (r.ybClass == '13' && r.ybLv == '1') {
+        typeRatioForm.value.a13ratio = r.selfRatio
+      }
+      if (r.ybClass == '13' && r.ybLv == '2') {
+        typeRatioForm.value.b13ratio = r.selfRatio
+      }
+      if (r.ybClass == '14' && r.ybLv == '1') {
+        typeRatioForm.value.a14ratio = r.selfRatio
+      }
+      if (r.ybClass == '14' && r.ybLv == '2') {
+        typeRatioForm.value.b14ratio = r.selfRatio
+      }
+    }
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  let form = {
+    typeRatioList: [{
+      ybClass: "01",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a01ratio
+    }, {
+      ybClass: "01",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b01ratio
+    }, {
+      ybClass: "02",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a02ratio
+    }, {
+      ybClass: "02",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b02ratio
+    }, {
+      ybClass: "03",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a03ratio
+    }, {
+      ybClass: "03",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b03ratio
+    }, {
+      ybClass: "04",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a04ratio
+    }, {
+      ybClass: "04",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b04ratio
+    }, {
+      ybClass: "05",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a05ratio
+    }, {
+      ybClass: "05",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b05ratio
+    }, {
+      ybClass: "06",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a06ratio
+    }, {
+      ybClass: "06",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b06ratio
+    }, {
+      ybClass: "07",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a07ratio
+    }, {
+      ybClass: "07",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b07ratio
+    }, {
+      ybClass: "08",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a08ratio
+    }, {
+      ybClass: "08",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b08ratio
+    }, {
+      ybClass: "09",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a09ratio
+    }, {
+      ybClass: "09",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b09ratio
+    }, {
+      ybClass: "10",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a10ratio
+    }, {
+      ybClass: "10",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b10ratio
+    }, {
+      ybClass: "11",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a11ratio
+    }, {
+      ybClass: "11",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b11ratio
+    }, {
+      ybClass: "12",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a12ratio
+    }, {
+      ybClass: "12",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b12ratio
+    }, {
+      ybClass: "13",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a13ratio
+    }, {
+      ybClass: "13",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b13ratio
+    }, {
+      ybClass: "14",
+      ybLv: "1",
+      selfRatio: typeRatioForm.value.a14ratio
+    }, {
+      ybClass: "14",
+      ybLv: "2",
+      selfRatio: typeRatioForm.value.b14ratio
+    }]
+  }
+  proxy.$refs["typeRatioRef"].validate(valid => {
+    if (valid) {
+      saveTypeRatioList(form).then(response => {
+        proxy.$modal.msgSuccess("修改成功");
+        typeRatioOpen.value = false;
+        getTypeList();
+      })
+    }
+  })
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+getIndividualList();
+getTypeList();
+</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;
+}
+
+.section-title {
+  margin-bottom: 20px;
+  font-weight: 550;
+  font-size: 18px;
+  color: #515A6E;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/gf/studentList/index.vue b/openhis-ui-vue3/src/views/gf/studentList/index.vue
new file mode 100644
index 00000000..033c271e
--- /dev/null
+++ b/openhis-ui-vue3/src/views/gf/studentList/index.vue
@@ -0,0 +1,459 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
+      <el-form-item label="学生" prop="searchKey">
+        <el-input v-model="queryParams.searchKey" placeholder="学号/姓名/身份证号" clearable style="width: 240px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="在校状态" prop="studentStatus" label-width="100">
+        <el-select v-model="queryParams.studentStatus" clearable style="width: 200px;">
+          <el-option v-for="dict in student_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="体检结果" prop="physicalExamResult" label-width="100">
+        <el-select v-model="queryParams.physicalExamResult" clearable style="width: 200px;">
+          <el-option v-for="dict in physical_exam_result" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </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="handleAdd">添加</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 表格数据 -->
+    <el-table v-loading="loading" :data="studentList">
+      <el-table-column label="学号" prop="studentId" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="姓名" prop="name" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="性别" prop="gender_dictText" :show-overflow-tooltip="true" width="70" align="center" />
+      <el-table-column label="年龄" prop="age" :show-overflow-tooltip="true" width="70" align="center" />
+      <el-table-column label="身份证号" prop="idNumber" :show-overflow-tooltip="true" width="200" />
+      <el-table-column label="电话" prop="phone" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="学院" prop="college" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="专业" prop="major" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="年级" prop="grade" :show-overflow-tooltip="true" width="100" />
+      <el-table-column label="学历层次" prop="educationLevel_dictText" :show-overflow-tooltip="true" width="120"
+        align="center" />
+      <el-table-column label="入校时间" prop="enrollmentDate" :show-overflow-tooltip="true" width="120" align="center" />
+      <el-table-column label="离校时间" prop="graduationDate" :show-overflow-tooltip="true" width="120" align="center" />
+      <el-table-column label="学习形式" prop="studyMode_dictText" :show-overflow-tooltip="true" width="120"
+        align="center" />
+      <el-table-column label="在校状态" prop="studentStatus_dictText" :show-overflow-tooltip="true" width="100"
+        align="center" />
+      <el-table-column label="体检结果" prop="physicalExamResult_dictText" :show-overflow-tooltip="true" width="120"
+        align="center" />
+      <el-table-column label="辅导员" width="120">
+        <template #default="scope">
+          <span v-if="scope.row.counselor !== null && scope.row.counselor !== undefined && scope.row.counselor !== ''">
+            {{ scope.row.counselor }}
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="辅导员电话" width="170">
+        <template #default="scope">
+          <span
+            v-if="scope.row.counselorPhone !== null && scope.row.counselorPhone !== undefined && scope.row.counselorPhone !== ''">
+            {{ scope.row.counselorPhone }}
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template #default="scope">
+          <el-tooltip content="编辑" placement="top">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">编辑</el-button>
+          </el-tooltip>
+        </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" />
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" v-model="open" width="700px" append-to-body>
+      <el-form ref="studentListRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <!-- 左侧列 -->
+          <el-col :span="12">
+            <el-form-item label="学号" prop="studentId">
+              <el-input v-model="form.studentId" placeholder="请输入学号" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="性别" prop="gender">
+              <el-radio-group v-model="form.gender">
+                <el-radio v-for="dict in sys_user_sex" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="年龄" prop="age">
+              <el-input :disabled="true" v-model="form.age" placeholder="根据身份证自动计算，无需填写" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="身份证号" prop="idNumber">
+              <el-input v-model="form.idNumber" placeholder="请输入身份证号" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入电话" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="学院" prop="college">
+              <el-input v-model="form.college" placeholder="请输入学院" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="专业" prop="major">
+              <el-input v-model="form.major" placeholder="请输入专业" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 右侧列 -->
+          <el-col :span="12">
+            <el-form-item label="年级" prop="grade">
+              <el-input v-model="form.grade" placeholder="请输入年级" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="学历层次" prop="educationLevel">
+              <el-select v-model="form.educationLevel" clearable style="width: 100%">
+                <el-option v-for="dict in education_level" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="入校时间" prop="enrollmentDate">
+              <el-date-picker v-model="form.enrollmentDate" type="date" placeholder="请选择入校时间" value-format="YYYY-MM-DD"
+                style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="离校时间" prop="graduationDate">
+              <el-date-picker v-model="form.graduationDate" type="date" placeholder="请选择离校时间" value-format="YYYY-MM-DD"
+                style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="学习形式" prop="studyMode">
+              <el-select v-model="form.studyMode" clearable style="width: 100%">
+                <el-option v-for="dict in study_mode" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="在校状态" prop="studentStatus">
+              <el-select v-model="form.studentStatus" clearable style="width: 100%">
+                <el-option v-for="dict in student_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="体检结果" prop="physicalExamResult">
+              <el-select v-model="form.physicalExamResult" clearable style="width: 100%">
+                <el-option v-for="dict in physical_exam_result" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="辅导员" prop="counselor">
+              <el-input v-model="form.counselor" placeholder="请输入辅导员" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="辅导员电话" prop="counselorPhone">
+              <el-input v-model="form.counselorPhone" placeholder="请输入辅导员电话" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+
+    <!-- 导入对话框 -->
+    <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="GfStudentList">
+import { getToken } from "@/utils/auth";
+import {
+  getPage,
+  getDetail,
+  add,
+  edit,
+  remove
+} from "@/api/gf/studentList";
+
+const { proxy } = getCurrentInstance();
+const {
+  sys_user_sex,
+  education_level,
+  study_mode,
+  student_status,
+  physical_exam_result
+} = proxy.useDict(
+  "sys_user_sex",
+  "education_level",
+  "study_mode",
+  "student_status",
+  "physical_exam_result",
+);
+
+const studentList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+
+/*** 器材目录导入参数 */
+const upload = reactive({
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/nenu/gf-student-list/import-data"
+});
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    studentStatus: undefined,
+    physicalExamResult: undefined,
+  },
+  rules: {
+    studentId: [
+      { required: true, message: "学号不能为空", trigger: "blur" }
+    ],
+    name: [
+      { required: true, message: "姓名不能为空", trigger: "blur" }
+    ],
+    gender: [
+      { required: true, message: "性别不能为空", trigger: "blur" }
+    ],
+    idNumber: [
+      { required: true, message: "身份证号不能为空", trigger: "blur" }
+    ],
+    phone: [
+      { required: true, message: "电话不能为空", trigger: "blur" }
+    ],
+    college: [
+      { required: true, message: "学院不能为空", trigger: "blur" }
+    ],
+    major: [
+      { required: true, message: "专业不能为空", trigger: "blur" }
+    ],
+    grade: [
+      { required: true, message: "年级不能为空", trigger: "blur" }
+    ],
+    educationLevel: [
+      { required: true, message: "学历层次不能为空", trigger: "blur" }
+    ],
+    enrollmentDate: [
+      { required: true, message: "入校时间不能为空", trigger: "blur" }
+    ],
+    graduationDate: [
+      { required: true, message: "离校时间不能为空", trigger: "blur" }
+    ],
+    studyMode: [
+      { required: true, message: "学习形式不能为空", trigger: "blur" }
+    ],
+    studentStatus: [
+      { required: true, message: "在校状态不能为空", trigger: "blur" }
+    ],
+    physicalExamResult: [
+      { required: true, message: "体检结果不能为空", trigger: "blur" }
+    ],
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询学生名单 */
+function getList() {
+  loading.value = true;
+  getPage(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+    studentList.value = response.data.records;
+    total.value = response.data.total;
+    loading.value = false;
+  });
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 重置新增的表单以及其他数据  */
+function reset() {
+  form.value = {
+    id: undefined,
+    name: undefined,
+    gender: undefined,
+    age: undefined,
+    studentId: undefined,
+    idNumber: undefined,
+    phone: undefined,
+    college: undefined,
+    major: undefined,
+    educationLevel: undefined,
+    enrollmentDate: undefined,
+    graduationDate: undefined,
+    grade: undefined,
+    studyMode: undefined,
+    studentStatus: undefined,
+    physicalExamResult: undefined,
+    counselor: undefined,
+    counselorPhone: undefined,
+    patientId: undefined,
+  };
+  proxy.resetForm("studentListRef");
+}
+/** 添加学生 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加学生信息";
+}
+/** 修改学生 */
+function handleUpdate(row) {
+  reset();
+  getDetail(row.id).then(response => {
+    form.value = response.data;
+    //字典str与实际值num不匹配导致无法回显加了这个
+    form.value.gender = response.data.gender.toString()
+    form.value.educationLevel = response.data.educationLevel.toString()
+    form.value.studyMode = response.data.studyMode.toString()
+    form.value.studentStatus = response.data.studentStatus.toString()
+    form.value.physicalExamResult = response.data.physicalExamResult.toString()
+    open.value = true;
+    title.value = "修改学生信息";
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["studentListRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != undefined) {
+        edit(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        add(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = '学生名单导入';
+  upload.open = true;
+}
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('/nenu/gf-student-list/import-template', {}, `student_template_${new Date().getTime()}.xlsx`);
+}
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false;
+  upload.isUploading = false;
+  proxy.$refs['uploadRef'].handleRemove(file);
+  proxy.$alert(
+    "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+    response.msg +
+    '</div>',
+    '导入结果',
+    { dangerouslyUseHTMLString: true }
+  );
+  getList();
+};
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs['uploadRef'].submit();
+}
+
+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/hospitalRecord/components/medicalRecordFirst.vue b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue
index b5b4e91c..ef393cfa 100644
--- a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordFirst.vue
@@ -302,6 +302,149 @@ import { ref, reactive } from 'vue';
 
 // 表单数据
 const formData = reactive({
+  //组织机构代码
+  medins_orgcode: '',
+
+  //医疗付费方式
+
+
+  //健康卡号
+
+
+  //姓名--患者姓名
+  patient_name: '',
+
+  //性别--患者性别
+  gend: '',
+
+  //出生日期
+  brdy: '',
+
+  //年龄
+  age: '',
+
+  //国籍
+  ntly: '',
+
+  //籍贯
+  napl: '',
+
+  //民族
+  naty: '',
+
+  //身份证号
+  certNo: '',
+
+  //户口地址
+  resd_addr:'',
+
+  //工作单位及地址
+  empr_addr: '',
+
+  //联系人姓名
+  coner_name: '',
+
+  //关系
+  patn_rlts: '',
+
+  //地址
+  addr: '',
+
+  //电话
+  tel: '',
+
+  //第几次住院
+  patn_ipt_cnt: '',
+
+  //住院号  mdtrtsn
+  ipt_no: '',
+
+  //病案号
+  medcasno: '',
+
+  //入院途径
+  adm_way: '',
+
+  //入院时间
+  adm_time: '',
+
+  //入院科室  adm_dept_codg
+  adm_dept_name: '',
+
+  //病房 入院病房
+  adm_ward: '',
+
+  //实际住院天数
+  act_ipt_days: '',
+
+  //主要诊断----不确定
+  diag_code: '',
+
+  //其他诊断
+
+
+  //是否输血
+
+
+  //血型
+
+
+  //Rh
+
+
+  //药物过敏史
+
+
+  //科主任    科主任姓名--deptort_name:
+  deptort: '',
+
+  //主任(副主任)医师
+  chfdr_name: '',
+
+  //主治医师 主诊医师姓名--chfpdr_name
+  atddr_no: '',
+
+  //住院医师   住院医师姓名--ipdr_name
+  ipdr_code: '',
+
+  //责任护士  责任护士姓名--resp_nurs_name
+  resp_nurs_code: '',
+
+  //住院总医师
+
+
+  //实习医师
+  intn_dr_name: '',
+
+  //病案质量  病案质量名称--medcas_qlt_name
+  medcas_qlt_code: '',
+
+  //编码员
+  codr_name: '',
+
+  //质控日期
+  qltctrl_date: '',
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   hospital: {
     orgCode: '41275054-7',
     paymentMethod: '城乡居民基本医疗保险'
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue
index 0a46e0c6..ffed12b3 100644
--- a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue
@@ -1,279 +1,866 @@
 <template>
-  <div style="width: 100%">
-    <div style="margin-bottom: 5px">
-      <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
+  <div style="width: 100%" class="medicalSec">
+    <div style="margin-bottom: 5px;margin-top: 20px;">
+      <el-button type="primary" @click="addItem" :disabled="false">
         新增
       </el-button>
-      <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
+      <el-button type="danger" plain @click="handleDelete" :disabled="false"> 删除 </el-button>
     </div>
-    <el-table
-      max-height="650"
-      ref="prescriptionRef"
-      :data="prescriptionList"
-      row-key="uniqueKey"
-      border
-      @row-dblclick="clickRowDb"
-      :expand-row-keys="expandOrder"
-    >
-      <el-table-column label="手术操作日期" align="center" prop="productName" width="400">
-        <template #default="scope">
-          <el-date-picker
-            v-model="scope.row.occurrenceTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="手术操作日期"
-            :default-time="defaultTime"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="手术级别" align="center" prop="" width="90">
-        <template #default="scope">
-          <el-select v-model="scope.row.operationLevel" placeholder="请选择手术级别">
-            <el-option
-              v-for="item in operationLevelList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column label="手术及操作名称" align="center" prop="">
-        <template #default="scope">
-          <el-select
-            v-model="scope.row.operationName"
-            placeholder="请选择手术及操作名称"
-            clearable
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in operationNameList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column label="手术及操作医师">
-        <el-table-column
-          prop="name"
-          label="术者">
-          <template #default="scope">
-            <el-select
-              v-model="scope.row.operationDoctor"
-              clearable
-              style="width: 100%"
-            >
+    <div class="tableBox">
+      <div class="tableBoxInner">
+        <div :class="{'borderBottom':!tableData_top.length}" class="tableBoxItemHeader">
+          <div class="item itemIndex">
+            <div :class="{'itemCheckBox':!isChooseAll,'itemCheckBoxAct':isChooseAll}" @click="chooseAll">
+              <span v-show="isChooseAll">✓</span>
+            </div>
+          </div>
+          <div class="item itemDate">手术操作日期</div>
+          <div class="item itemSurgeryLevel">手术级别</div>
+          <div class="item itemSurgeryName">手术及操作名称</div>
+          <div class="itemSpec">
+            <div class="spec" style="width: 100%;border-bottom: 1px solid #ebeef5;">手术及操作医师</div>
+            <div class="spec">
+              <div class="specItem">术者</div>
+              <div class="specItem" style="border-left: 1px solid #ebeef5;">Ⅰ助</div>
+              <div class="specItem" style="border-left: 1px solid #ebeef5;">Ⅱ助</div>
+            </div>
+          </div>
+          <div class="item itemCutLevel">切口愈合等级</div>
+          <div class="item itemCutLevel">麻醉方式</div>
+          <div class="item itemCutLevel">麻醉分级</div>
+          <div class="item itemTime borderRight">手术时长(H)</div>
+        </div>
+        <div
+            class="tableBoxItem"
+            :class="{'borderBottom':index+1===tableData_top.length}"
+            v-for="(item,index) in tableData_top"
+            :key="index">
+          <div class="item itemIndex">
+            <div :class="{'itemCheckBox':!item['isChoose'],'itemCheckBoxAct':item['isChoose']}" @click="checkItem(item)">
+              <span v-show="item['isChoose']">✓</span>
+            </div>
+          </div>
+          <div class="item itemDate">
+            <el-date-picker
+                v-model="item.ctrlDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="手术操作日期"
+                :default-time="item.ctrlDate"
+            />
+          </div>
+          <div class="item itemSurgeryLevel">
+            <el-select v-model="item.surgeryLevel" placeholder="请选择手术级别">
               <el-option
-                v-for="item in operationDoctorList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                  v-for="item in item['surgeryLevelArr']"
+                  :key="item.value"
+                  :label="item.title"
+                  :value="item.value"
               ></el-option>
             </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="nameFirst"
-          label="Ⅰ助">
-          <template v-slot="scope">
-            <el-select
-              v-model="scope.row.nameFirst"
-              style="width: 100%"
-            >
+          </div>
+          <div class="item itemSurgeryName">
+            <el-input v-model="item.surgeryName"></el-input>
+          </div>
+          <div class="itemSpec">
+            <div class="spec_">
+              <div class="specItem" style="padding: 10px;">
+                <el-input v-model="item.surgeryMasterName"></el-input>
+              </div>
+              <div class="specItem" style="padding: 10px;border-left: 1px solid #ebeef5;">
+                <el-input v-model="item.surgeryMasterName_1"></el-input>
+              </div>
+              <div class="specItem" style="padding: 10px;border-left: 1px solid #ebeef5;">
+                <el-input v-model="item.surgeryMasterName_2"></el-input>
+              </div>
+            </div>
+          </div>
+          <div class="item itemCutLevel">
+            <el-select v-model="item.cutLevel">
               <el-option
-                v-for="item in operationDoctorList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                  v-for="item in item['cutLevelArr']"
+                  :key="item.value"
+                  :label="item.title"
+                  :value="item.value"
               ></el-option>
             </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="nameFirst"
-          label="Ⅱ助">
-          <template v-slot="scope">
-            <el-select
-              v-model="scope.row.nameSecond"
-              style="width: 100%"
-            >
+          </div>
+          <div class="item itemCutLevel">
+            <el-select v-model="item.anesthesiaType" placeholder="请选择手术级别">
               <el-option
-                v-for="item in operationDoctorList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                  v-for="item in operationLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
               ></el-option>
             </el-select>
-          </template>
-        </el-table-column>
-      </el-table-column>
-    </el-table>
+          </div>
+          <div class="item itemCutLevel">
+            <el-select v-model="item.anesthesiaLevel" placeholder="请选择手术级别">
+              <el-option
+                  v-for="item in item.anesthesiaLevelArr"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="item itemTime borderRight">
+            <el-input v-model="item.surgeryTime"></el-input>
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="form-row">
       <div class="form-item">
         <label>手术方式:</label>
-        <el-select v-model="formData.surgeryType">
-          <el-option value="" label="请选择"></el-option>
-          <el-option value="1" label="择期手术"></el-option>
-          <el-option value="2" label="限期手术"></el-option>
-          <el-option value="3" label="急诊手术"></el-option>
-        </el-select>
+          <el-select v-model="formData['surgeryType']">
+            <el-option v-for="(item,index) in formData['surgeryTypeArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+          </el-select>
       </div>
       <div class="form-item">
         <label>离院方式:</label>
-        <el-select v-model="formData.surgeryType">
-          <el-option value="" label="请选择"></el-option>
-          <el-option value="1" label="医嘱离院"></el-option>
-          <el-option value="2" label="医嘱转院"></el-option>
-          <el-option value="3" label="医嘱转社区卫生服务机构"></el-option>
-          <el-option value="4" label="非医嘱离院"></el-option>
-          <el-option value="5" label="死亡"></el-option>
-          <el-option value="9" label="其他"></el-option>
+        <el-select v-model="formData['leaveType']">
+          <el-option v-for="(item,index) in formData['leaveTypeArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
         </el-select>
       </div>
     </div>
     <div class="form-row">
       <div class="form-item">
         <label>是否有出院31天内再住院计划:</label>
-        <el-select v-model="formData.hospitalizationPlan">
-          <el-option value="" label="请选择"></el-option>
-          <el-option value="1" label="无"></el-option>
-          <el-option value="2" label="有"></el-option>
+        <el-select v-model="formData['isPlan']">
+          <el-option v-for="(item,index) in formData['isPlanArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
         </el-select>
       </div>
       <div class="form-item">
         <label>目的:</label>
-        <el-input v-model="formData.purpose"></el-input>
+        <el-input v-model="formData['purpose']"></el-input>
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="form-item">
+        <label>颅脑损伤患者昏迷时间-入院前:</label>
+        <el-input type="date" v-model="formData['comaDurationTime_before']" />
+      </div>
+      <div class="form-item">
+        <label>入院后:</label>
+        <el-input type="date" v-model="formData['comaDurationTime_after']" />
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="form-item">
+        <label>肿瘤分期:</label>
+        <el-select v-model="formData['tumorStaging']">
+          <el-option v-for="(item,index) in formData['tumorStagingArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+        </el-select>
+      </div>
+      <div class="form-item" style="flex: 0">
+        <label>T:</label>
+        <label class="form-item-specLabel"><div class="specLabelInner" style="width: 80px;margin: 0 8px 0 0;"><el-input v-model="formData['tumor_T']"></el-input></div> </label>
+      </div>
+      <div class="form-item" style="flex: 0">
+        <label>N:</label>
+        <label class="form-item-specLabel"><div class="specLabelInner" style="width: 80px;margin: 0 8px 0 0;"><el-input v-model="formData['tumor_N']"></el-input></div> </label>
+      </div>
+      <div class="form-item" style="flex: 0">
+        <label>M:</label>
+        <label class="form-item-specLabel"><div class="specLabelInner" style="width: 80px;margin: 0 8px 0 0;"><el-input v-model="formData['tumor_M']"></el-input></div> </label>
+      </div>
+    </div>
+
+    <div class="form-row">
+      <div class="form-item">
+        <label>判断依据:</label>
+        <el-select v-model="formData['judgmentBase']">
+          <el-option v-for="(item,index) in formData['judgmentBaseArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+        </el-select>
+      </div>
+      <div class="form-item">
+        <label>分化程度:</label>
+        <el-input type="date" v-model="formData['degreeDifferentiation']" />
+      </div>
+    </div>
+
+    <div class="form-row">
+      <div class="form-item">
+        <label>临床路径-进入路径：</label>
+        <el-select v-model="formData['enterPath']">
+          <el-option v-for="(item,index) in formData['enterPathArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+        </el-select>
+      </div>
+      <div class="form-item">
+        <label>变异:</label>
+        <el-select v-model="formData['mutation']">
+          <el-option v-for="(item,index) in formData['mutationArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+        </el-select>
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="form-item">
+        <label>退出路径：</label>
+        <el-select v-model="formData['outPath']">
+          <el-option v-for="(item,index) in formData['outPathArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+        </el-select>
+      </div>
+      <div class="form-item">
+      </div>
+    </div>
+    <div class="form-row" styLe="margin: 0;">
+      <div class="form-item" styLe="margin: 0;">
+        <label>护理级别：</label>
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="form-item" style="flex: 0">
+        <label class="form-item-specLabel">特级护理 <div class="specLabelInner"><el-input v-model="formData['nursingLevel_spec']"></el-input></div> 小时</label>
+      </div>
+      <div class="form-item" style="flex: 0">
+        <label class="form-item-specLabel">1级护理 <div class="specLabelInner"><el-input v-model="formData['nursingLevel_1']"></el-input></div> 小时</label>
+
+      </div>
+      <div class="form-item" style="flex: 0">
+        <label class="form-item-specLabel">2级护理 <div class="specLabelInner"><el-input v-model="formData['nursingLevel_2']"></el-input></div> 小时</label>
+      </div>
+      <div class="form-item" style="flex: 0">
+        <label class="form-item-specLabel">3级护理 <div class="specLabelInner"><el-input v-model="formData['nursingLevel_3']"></el-input></div> 小时</label>
+      </div>
+    </div>
+    <div class="form-row">
+      <div class="form-item">
+        <label>呼吸机使用:</label>
+        <el-select v-model="formData['ventilatorUse']">
+          <el-option v-for="(item,index) in formData['ventilatorUseArr']" :key="index" :value="item['value']" :label="item['title']"></el-option>
+        </el-select>
+      </div>
+      <div class="form-item">
+        <label>有创呼吸机使用时间（小时）:</label>
+        <el-input v-model="formData['ventilatorUseTime']"></el-input>
       </div>
     </div>
   </div>
 </template>
-      
-<script setup>
-import { getCurrentInstance, nextTick, ref, watch } from 'vue';
 
-const emit = defineEmits(['selectDiagnosis']);
-const prescriptionList = ref([]);
-const form = ref({
-  prescriptionList: prescriptionList.value,
+<script setup>
+import {nextTick, reactive, ref, watch} from 'vue';
+import { ElMessage } from 'element-plus'
+
+let chooseData = reactive([])//表格中选中的数据 TODO
+const tableData_top = reactive([])
+const tableData_sub = ref([
+  {
+
+  },
+  {
+
+  }
+])
+let isChooseAll = ref(false);
+const formData = ref({
+  surgeryDate: '2025-10-10',
+  surgeryType: '',
+  surgeryTypeArr: [
+    {
+      title: '择期手术',
+      value: 1,
+    },
+    {
+      title: '限期手术',
+      value: 2,
+    },
+    {
+      title: '急诊手术',
+      value: 3,
+    }
+  ],
+  leaveType: '',
+  leaveTypeArr: [
+    {
+      title: '医嘱离院',
+      value: 1,
+    },
+    {
+      title: '医嘱转院',
+      value: 2,
+    },
+    {
+      title: '医嘱转社区卫生服务机构',
+      value: 3,
+    },
+    {
+      title: '非医嘱离院',
+      value: 4,
+    },
+    {
+      title: '死亡',
+      value: 5,
+    },
+    {
+      title: '其他',
+      value: 6,
+    }
+  ],
+  isPlan: '',
+  isPlanArr: [
+    {
+      title: '是',
+      value: 1,
+    },
+    {
+      title: '否',
+      value: 1,
+    }
+  ],
+  purpose: '',
+  comaDurationTime_before: '',//昏迷时间---入院前
+  comaDurationTime_after: '',//昏迷时间---入院后
+
+  tumorStaging: '',
+  tumorStagingArr: [
+    {
+      title: 'C',
+      value: 1,
+    },
+    {
+      title: 'P',
+      value: 2,
+    }
+  ],
+  judgmentBase: '',
+  judgmentBaseArr: [
+    {
+      title: '0期',
+      value: 0,
+    },
+    {
+      title: '1期',
+      value: 1,
+    },
+    {
+      title: '2期',
+      value: 2,
+    },
+    {
+      title: '3期',
+      value: 3,
+    },
+    {
+      title: '4期',
+      value: 4,
+    },
+    {
+      title: '不详',
+      value: 5,
+    }
+  ],
+  tumor_T: '',
+  tumor_N: '',
+  tumor_M: '',
+  degreeDifferentiation: '',
+
+  enterPath: '',
+  enterPathArr: [
+    {
+      title: '是',
+      value: 1,
+    },
+    {
+      title: '否',
+      value: 1,
+    }
+  ],
+  outPath: '',
+  outPathArr: [
+    {
+      title: '是',
+      value: 1,
+    },
+    {
+      title: '否',
+      value: 1,
+    }
+  ],
+  mutation: '',
+  mutationArr: [
+    {
+      title: '有',
+      value: 1,
+    },
+    {
+      title: '无',
+      value: 1,
+    }
+  ],
+
+  nursingLevel_spec: '',
+  nursingLevel_1: '',
+  nursingLevel_2: '',
+  nursingLevel_3: '',
+
+  ventilatorUse: '',
+  ventilatorUseArr: [
+    {
+      title: '未使用',
+      value: 1,
+    },
+    {
+      title: '无创',
+      value: 2,
+    },
+    {
+      title: '有创',
+      value: 3,
+    },
+    {
+      title: '无创+有创',
+      value: 4,
+    }
+  ],
+
+  ventilatorUseTime: '',
 });
-const adviceQueryParams = ref({});
-const rowIndex = ref(-1);
-const nextId = ref(1);
+
 const operationLevelList = [
   { name: '一级', id: 1 },
   { name: '二级', id: 2 },
   { name: '三级', id: 3 },
 ];
-const operationDoctorList = ref([]);
-const formData = ref({});
-const props = defineProps({
-  
-});
-const isAdding = ref(false);
-const prescriptionRef = ref();
-const expandOrder = ref([]); //目前的展开行
-const { proxy } = getCurrentInstance();
-const requiredProps = ref([]); // 存储必填项 prop 顺序
-const handleSaveDisabled = ref(false)  //签发状态
-watch(
-  () => expandOrder.value,
-  (newValue) => {
-     console.log(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);
-      });
-    } else {
-      requiredProps.value = {};
-    }
-  }
-);
-watch(
-  () => prescriptionList.value,
-  (newValue) => {
-    console.log(prescriptionList.value,"prescriptionList.value")
-    if(newValue&&newValue.length>0){
-      let saveList = prescriptionList.value.filter((item) => {
-        return item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
-      })
-      prescriptionList.value.map(k=>{
-        k.check = false
-      })
-       console.log(saveList,"prescriptionList.value")
-      if (saveList.length == 0) {
-        handleSaveDisabled.value = true
-      }else{
-        handleSaveDisabled.value = false
-      }
-    }
-  },
-  { immediate: true }
-);
 
 // 新增
-function handleAddPrescription() {
-  if (isAdding.value) {
-    proxy.$modal.msgWarning('请先保存');
-    return;
+const addItem = () => {
+  let data = {
+    //手术操作日期   oprn_oprt_date
+    oprn_date: '',
+
+    //手术级别 手术级别名称--oprn_lv_code
+    oprn_lv_code: '',
+
+    //手术及操作名称  oprn_oprt_code
+    oprn_oprt_name: '',
+
+    //手术及操作医师
+    //术者
+    oper_name: '',
+    //Ⅰ助
+    asit_1_name: '',
+    //Ⅱ助
+    asit_name2: '',
+
+    //切口愈合等级 sinc_heal_lv_code
+    sinc_heal_lv: '',
+
+    //麻醉方式
+    anst_way: '',
+
+    //麻醉分级  anst_lv_code
+    anst_lv_name: '',
+
+    //手术时长
+
+
+    //手术方式
+
+
+    //离院方式
+    dscg_way: '',
+
+    //是否有出院31天内再住院计划-----不确定
+    days_rinp_flag_31: '',
+
+    //目的
+    days_rinp_pup_31: '',
+
+    //颅脑损伤患者昏迷时间 入院前
+    brn_damg_bfadm_coma_dura: '',
+    //颅脑损伤患者昏迷时间 入院后
+    brn_damg_afadm_coma_dura: '',
+
+    //肿瘤分期
+    //T
+    //N
+    //M
+    //判断依据
+    //分化程度  bkup_deg_code
+    bkup_deg: '',
+
+    //临床路径-进入路径
+    //变异
+    //退出路径
+
+    //护理级别
+    //特级护理
+    spga_nurscare_days: '',
+    //1级护理
+    lv1_nurscare_days: '',
+    //2级护理
+    scd_nurscare_days: '',
+    //3级护理
+    lv3_nurscare_days: '',
+
+    //呼吸机使用  vent_used_days  vent_used_h_cnt  vent_used_m_cnt
+    vent_used_dura: '',
+    //有创呼吸机使用时间
+
+
+
+
+
+
+
+
+
+
+
+
+
+    isChoose: false,
+    ctrlDate: '2025-10-10',
+    surgeryLevel: '',
+    surgeryLevelArr: [
+      {
+        title: '1级',
+        value: 1,
+      },
+      {
+        title: '2级',
+        value: 2,
+      },
+      {
+        title: '3级',
+        value: 3,
+      },
+      {
+        title: '4级',
+        value: 4,
+      }
+    ],
+    surgeryName: '',
+    surgeryMasterName: '',
+    surgeryMasterName_1: '',
+    surgeryMasterName_2: '',
+    cutLevel: '',
+    cutLevelArr: [
+      {
+        title: '1/甲',
+        value: 1,
+      },
+      {
+        title: '2/乙',
+        value: 2,
+      }
+    ],
+    anesthesiaType: '',
+    anesthesiaTypeArr: [],
+    anesthesiaEr: '',
+    anesthesiaLevel: '',
+    anesthesiaLevelArr: [
+      {
+        title: '1',
+        value: 1,
+      },
+      {
+        title: '2',
+        value: 2,
+      },
+    ],
+    surgeryTime: ''
   }
-  isAdding.value = true;
-  // 在数组最前方添加一行，让新增行显示在最上边
-  prescriptionList.value.unshift({
-    uniqueKey: nextId.value++,
-    showPopover: false,
-    check: false,
-    isEdit: true,
-    statusEnum: 1,
-  });
-  nextTick(() => {
-    proxy.$refs['adviceRef0'].focus();
-  });
+  //push
+  tableData_top.unshift(
+      data
+  )
+  tableData_top.map((d,i) => {
+    d.currentIndex = i
+  })
+
+}
+const checkItem = (e) => {
+  chooseData = []
+  e['isChoose'] = !e['isChoose']
+  tableData_top.map((d) => {
+    if (d['isChoose']) {
+      chooseData.push(d)
+    }
+  })
 }
 
-// 行双击打开编辑块，仅待发送的可编辑
-function clickRowDb(row) {
-  if (row.statusEnum == 1) {
-    row = { ...row, ...JSON.parse(row.contentJson) };
-    row.isEdit = true;
-    const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
-    prescriptionList.value[index] = row;
-    console.log(prescriptionList.value,"prescriptionList.value")
-    expandOrder.value = [row.uniqueKey];
-  }
-}
+const chooseAll = () => {
+  isChooseAll.value = !isChooseAll.value
 
-function handleDelete() {
-  let deleteList = prescriptionList.value
-    .filter((item) => {
-      return item.check && item.statusEnum == 1;
+  if (tableData_top.length) {
+    tableData_top.map((d) => {
+      d['isChoose'] = !isChooseAll.value
+
+      checkItem(d)
     })
-    .map((item) => {
-      return {
-        requestId: item.requestId,
-        dbOpType: '3',
-        adviceType: item.adviceType,
-      };
-    });
-  if (deleteList.length == 0) {
-    proxy.$modal.msgWarning('请选择要删除的项目');
-    return;
   }
-  expandOrder.value = [];
-  isAdding.value = false;
-  adviceQueryParams.value.adviceType = undefined;
+
+}
+//删除方法
+const handleDelete = () => {
+  if (!tableData_top.length) { return }
+  let deleteId = []
+  chooseData.map((d) => {
+    deleteId.push(d['currentIndex'])
+  })
+
+  for (let i = tableData_top.length - 1; i >= 0; i--) {
+    if (deleteId.includes(tableData_top[i].currentIndex)) {
+      tableData_top.splice(i, 1);
+    }
+  }
+
+  isChooseAll.value = false
+  msgSuccess('删除成功')
+}
+
+const msgSuccess = (msg) => {
+  ElMessage({
+    message: msg,
+    type: 'success',
+  })
 }
 
 </script>
-    
+
+<style lang="scss">
+.medicalSec {
+  .el-date-editor.el-input, .el-date-editor.el-input__wrapper {
+    width: 100%;
+  }
+  .el-table td.el-table__cell div {
+    width: 100%;
+  }
+}
+
+</style>
 <style lang="scss" scoped>
 :deep(.el-table__expand-icon) {
   display: none !important;
 }
+.tableItemCheck {
+  margin: 0 auto;
+  width: 18px !important;
+  height: 18px !important;
+  box-sizing: border-box;
+  cursor: pointer;
+  border: 1px solid #ccc;
+}
+.tableBox {
+  margin: 10px 0;
+  .tableBoxInner {
+    .borderRight {
+      border-right: 1px solid #ebeef5;
+    }
+    .borderBottom {
+      border-bottom: 1px solid #ebeef5;
+    }
+    .tableBoxItemHeader {
+      background: #f8f8f9;
+      color: #515a6e;
+      font-weight: bold;
+      font-size: 13px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 80px;
+      .item {
+        white-space: wrap;
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        //line-height: 65px;
+        box-sizing: border-box;
+        padding: 10px;
+        height: 100%;
+        text-align: center;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+      }
+      .itemIndex {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        width: 3.5%;
+      }
+      .chooseAllBtn {
+        width: 18px;
+        height: 18px;
+      }
+      .itemDate {
+        width: 12%;
+      }
+      .itemSurgeryLevel {
+        width: 14%;
+      }
+      .itemSurgeryName {
+        width: 20%;
+      }
+      .itemCutLevel {
+        width: 8%;
+      }
+      .itemTime {
+        width: 7%;
+      }
+      .itemSpec {
+        width: 20%;
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        height: 80px;
+        .spec {
+          width: 100%;
+          text-align: center;
+          height: 50%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 39px;
+          }
+        }
+        .spec_ {
+          width: 100%;
+          text-align: center;
+          height: 100%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+      .itemCheckBox {
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+      }
+      .itemCheckBoxAct {
+        line-height: 16px;
+        text-align: center;
+        font-size: 12px;
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+        background: #409eff;
+        color: #fff;
+      }
+      .itemCheckBox:hover {
+        border: 1px solid #409eff;
+      }
+    }
+    .tableBoxItem {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 50px;
+      .item {
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        //line-height: 40px;
+        box-sizing: border-box;
+        padding: 10px;
+        height: 100%;
+        text-align: center;
+      }
+      .itemIndex {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        width: 3.5%;
+      }
+      .itemDate {
+        width: 12%;
+      }
+      .itemSurgeryLevel {
+        width: 14%;
+      }
+      .itemSurgeryName {
+        width: 20%;
+      }
+      .itemCutLevel {
+        width: 8%;
+      }
+      .itemTime {
+        width: 7%;
+      }
+      .itemSpec {
+        width: 20%;
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        height: 50px;
+        .spec {
+          width: 100%;
+          text-align: center;
+          height: 50%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 39px;
+          }
+        }
+        .spec_ {
+          width: 100%;
+          text-align: center;
+          height: 100%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+      .itemCheckBox {
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+      }
+      .itemCheckBoxAct {
+        line-height: 16px;
+        text-align: center;
+        font-size: 12px;
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+        background: #409eff;
+        color: #fff;
+      }
+      .itemCheckBox:hover {
+        border: 1px solid #409eff;
+      }
+    }
+  }
+}
 .medicine-title {
   font-size: 16px;
   font-weight: 600;
@@ -335,6 +922,15 @@ function handleDelete() {
   flex: 0 0 100%;
   min-width: 100%;
 }
+.form-item-specLabel {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.specLabelInner {
+  margin: 0 8px;
+  width: 60px;
+}
 
 label {
   display: block;
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecondPrint.json b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecondPrint.json
new file mode 100644
index 00000000..e1eea1db
--- /dev/null
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecondPrint.json
@@ -0,0 +1,3 @@
+{
+  "printContent": "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n    <meta charset=\"UTF-8\">\n    <title>Title</title>\n    <style>\n        * {\n            margin: 0;\n            padding: 0;\n        }\n        .hisSec {\n            padding: 10px 0;\n            width: 100vw;\n            min-height: 100vh;\n            display: flex;\n            flex-direction: row;\n            justify-content: center;\n        }\n        .font_1 {\n            font-size: 14px;\n            font-weight: bold;\n        }\n        .font_2 {\n            font-size: 14px;\n        }\n        .font_3 {\n            font-size: 13px;\n        }\n        .font_4 {\n            font-size: 12px;\n        }\n        .hisSecInner {\n            width: 1000px;\n            height: 100%;\n        }\n        .tableBox {\n            margin: 10px 0;\n        }\n        .tableBoxInner {\n\n        }\n        .borderRight {\n            border-right: 1px solid #333333;\n        }\n        .borderBottom {\n            border-bottom: 1px solid #333333;\n        }\n        .tableBoxItemHeader {\n            font-weight: bold;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            height: 50px;\n\n        }\n        .tableBoxItemHeader .item {\n            white-space: wrap;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            box-sizing: border-box;\n            padding: 10px 2px;\n            height: 100%;\n            text-align: center;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItemHeader .itemIndex {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            width: 3.5%;\n        }\n        .tableBoxItemHeader .chooseAllBtn {\n            width: 18px;\n            height: 18px;\n        }\n        .tableBoxItemHeader .itemDate {\n            width: 10%;\n        }\n        .tableBoxItemHeader .itemSurgeryLevel {\n            width: 7%;\n        }\n        .tableBoxItemHeader .itemSurgeryName {\n            width: 23%;\n        }\n        .tableBoxItemHeader .itemCutLevel {\n            width: 9%;\n        }\n        .tableBoxItemHeader .itemCutLevel1 {\n            width: 12%;\n        }\n        .tableBoxItemHeader .itemCutLevel2 {\n            width: 7%;\n        }\n        .tableBoxItemHeader .itemTime {\n            width: 9%;\n        }\n        .tableBoxItemHeader .itemSpec {\n            width: 20%;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            height: 50px;\n        }\n        .tableBoxItemHeader .itemSpec .spec {\n            width: 100%;\n            text-align: center;\n            height: 50%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItemHeader .itemSpec .spec .specItem {\n            width: 33.33%;\n            height: 100%;\n            line-height: 25px;\n        }\n        .tableBoxItemHeader .itemSpec .spec_ {\n            width: 100%;\n            text-align: center;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n\n        }\n        .tableBoxItemHeader .itemSpec .spec_ .specItem {\n            width: 33.33%;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItemHeader .itemCheckBox {\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n        }\n        .tableBoxItemHeader .itemCheckBoxAct {\n            line-height: 16px;\n            text-align: center;\n            font-size: 12px;\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n            background: #333333;\n            color: #fff;\n        }\n        .tableBoxItemHeader .itemCheckBox:hover {\n            border: 1px solid #333333;\n        }\n        .tableBoxItem {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            height: 55px;\n        }\n        .tableBoxItem .item {\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            //line-height: 40px;\n            box-sizing: border-box;\n            padding: 10px 2px;\n            height: 100%;\n            text-align: center;\n        }\n        .tableBoxItem .itemIndex {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            width: 3.5%;\n        }\n        .tableBoxItem .itemDate {\n            width: 10%;\n        }\n        .tableBoxItem .itemSurgeryLevel {\n            width: 7%;\n        }\n        .tableBoxItem .itemSurgeryName {\n            width: 23%;\n        }\n        .tableBoxItem .itemCutLevel {\n            width: 9%;\n        }\n        .tableBoxItem .itemCutLevel1 {\n            width: 12%;\n        }\n        .tableBoxItem .itemCutLevel2 {\n            width: 7%;\n        }\n        .tableBoxItem .itemTime {\n            width: 9%;\n        }\n        .tableBoxItem .itemSpec {\n            width: 20%;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            height: 55px;\n        }\n        .tableBoxItem .itemSpec .spec {\n            width: 100%;\n            text-align: center;\n            height: 50%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItem .itemSpec .spec .specItem {\n            width: 33.33%;\n            height: 100%;\n            line-height: 25px;\n        }\n        .tableBoxItem .itemSpec .spec_ {\n            width: 100%;\n            text-align: center;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItem .itemSpec .spec_ .specItem {\n            width: 33.33%;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItem .itemCheckBox {\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n        }\n        .tableBoxItem .itemCheckBoxAct {\n            line-height: 16px;\n            text-align: center;\n            font-size: 12px;\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n            background: #409eff;\n            color: #fff;\n        }\n        .tableBoxItem .itemCheckBox:hover {\n            border: 1px solid #409eff;\n        }\n\n\n\n        .topBar {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: space-between;\n        }\n        .secItem {\n            width: 100%;\n            display: flex;\n            flex-direction: row;\n            //align-items: center;\n            justify-content: left;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 5px;\n            margin-bottom: 10px;\n        }\n        .secItem1 {\n            width: 100%;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 5px;\n            margin-bottom: 10px;\n        }\n        .chooseBox {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            width: 15px;\n            height: 15px;\n            border: 1px solid #333;\n            font-size: 12px;\n            margin: 0 5px;\n        }\n        .rowBox {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n        }\n        .writeArea {\n            display: inline-block;\n            width: 150px;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 2px;\n        }\n        .writeAreaCenter {\n            display: inline-block;\n            width: 150px;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 2px;\n            text-align: center;\n        }\n        .writeAreaSort {\n            display: inline-block;\n            width: 35px;\n            border-bottom: 1px solid #333333;\n            //padding-bottom: 2px;\n            text-align: center;\n        }\n        .marginSmall {\n            margin: 0 5px;\n        }\n        .marginNor {\n            margin: 0 10px;\n        }\n        .marginBig {\n            margin: 0 20px;\n        }\n        .marginB {\n            margin-bottom: 10px;\n        }\n        .marginR_B {\n            margin-right: 40px;\n        }\n        .subTable {\n\n        }\n        .tableBar {\n            width: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: left;\n            height: 35px;\n        }\n        .barItem {\n            height: 100%;\n            width: 33.33%;\n            box-sizing: border-box;\n            padding: 10px;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n        }\n        .borderR {\n            border-right: 1px solid #333333;\n        }\n        .borderB {\n            border-bottom: 1px solid #333333;\n        }\n    </style>\n</head>\n<body>\n<div class=\"hisSec\">\n    <div class=\"hisSecInner\">\n        <div class=\"topBar\">\n            <div class=\"font_2\">姓名：金长存</div>\n            <div class=\"font_2\">病案号：12345678</div>\n        </div>\n\n<!--        <div class=\"tableBox\">\n            <div class=\"tableBoxInner\">\n                <div class=\"tableBoxItemHeader font_1\">\n                    <div class=\"item itemDate\">手术操作日期</div>\n                    <div class=\"item itemSurgeryLevel\">手术级别</div>\n                    <div class=\"item itemSurgeryName\">手术及操作名称</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec\" style=\"width: 100%;border-bottom: 1px solid #333333;\">手术及操作医师</div>\n                        <div class=\"spec\">\n                            <div class=\"specItem\">术者</div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">Ⅰ助</div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">Ⅱ助</div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">切口愈合等级</div>\n                    <div class=\"item itemCutLevel\">麻醉方式</div>\n                    <div class=\"item itemCutLevel\">麻醉医师</div>\n                    <div class=\"item itemCutLevel\">麻醉分级</div>\n                    <div class=\"item itemTime borderRight\">手术时长(H)</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">5</div>\n                    <div class=\"item itemSurgeryName\">腰椎间盘切除，椎管减压，植骨融合内固定术</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                牛粪\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                渣渣辉\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                长存\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">1</div>\n                    <div class=\"item itemSurgeryName\">PICC管去除</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                牛粪\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                渣渣辉\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                长存\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">1</div>\n                    <div class=\"item itemSurgeryName\">经外周静脉穿刺中心静脉置管技术</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                王丽丽\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_2\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_2 borderBottom\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n            </div>\n        </div>-->\n        <div class=\"tableBox\">\n            <div class=\"tableBoxInner\">\n                <div class=\"tableBoxItemHeader font_4\">\n                    <div class=\"item itemDate\">手术操作日期</div>\n                    <div class=\"item itemSurgeryLevel\">手术级别</div>\n                    <div class=\"item itemSurgeryName\">手术及操作名称</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec\" style=\"width: 100%;border-bottom: 1px solid #333333;\">手术及操作医师</div>\n                        <div class=\"spec\">\n                            <div class=\"specItem\">术者</div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">Ⅰ助</div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">Ⅱ助</div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">切口愈合等级</div>\n                    <div class=\"item itemCutLevel1\">麻醉方式</div>\n                    <div class=\"item itemCutLevel\">麻醉医师</div>\n                    <div class=\"item itemCutLevel2\">麻醉分级</div>\n                    <div class=\"item itemTime borderRight\">手术时长(H)</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">5</div>\n                    <div class=\"item itemSurgeryName\">腰椎间盘切除，椎管减压，植骨融合内固定术</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                牛粪\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                渣渣辉\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                长存\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel1\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel2\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">1</div>\n                    <div class=\"item itemSurgeryName\">PICC管去除</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                牛粪\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                渣渣辉\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                长存\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel1\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel2\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">1</div>\n                    <div class=\"item itemSurgeryName\">经外周静脉穿刺中心静脉置管技术</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                王丽丽\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel1\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel2\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4 borderBottom\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n            </div>\n        </div>\n        <div class=\"secItem\">\n            <div class=\"font_1\">手术方式</div>\n            <div class=\"chooseBox font_2\">1</div>\n            <div class=\"rowBox\">\n                <div style=\"margin: 0 5px;\" class=\"font_2\">1.择期手术</div>\n                <div style=\"margin: 0 5px;\" class=\"font_2\">2.限期手术</div>\n                <div style=\"margin: 0 5px;\" class=\"font_2\">3.急诊手术</div>\n            </div>\n        </div>\n        <div class=\"secItem\">\n            <div class=\"font_1\">离院方式</div>\n            <div class=\"chooseBox font_2\">1</div>\n            <div>\n                <div class=\"marginB rowBox\">\n                    <div class=\"marginSmall font_2\">1.医嘱离院</div>\n                    <div class=\"marginSmall font_2\">2.医嘱转院，拟接受医疗结构名称 <span class=\"writeArea\">—</span> </div>\n                </div>\n                <div class=\"marginB rowBox\">\n                    <div class=\"marginSmall font_2\">3.医嘱转让社区卫生服务机构、乡镇卫生院，拟接受医疗结构名称<span class=\"writeAreaCenter\">—</span></div>\n                </div>\n                <div class=\"marginB rowBox\">\n                    <div class=\"marginSmall font_2\">4.非医嘱离院</div>\n                    <div class=\"marginSmall font_2\">5.死亡</div>\n                    <div class=\"marginSmall font_2\">6.其他</div>\n                </div>\n            </div>\n\n        </div>\n        <div class=\"secItem\">\n            <div class=\"font_1\">是否有出院31天内再住院计划</div>\n            <div class=\"chooseBox font_2\">1</div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_2\">1.无</div>\n                <div class=\"marginSmall font_2\">2.有</div>\n                <div style=\"margin: 0 5px 0 15px;\" class=\"font_2\">目的：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem\">\n            <div class=\"font_1\">颅脑损伤患者昏迷时间：</div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_2\">入院前：<span class=\"writeAreaSort\">—</span> 天 <span class=\"writeAreaSort\">—</span>小时<span class=\"writeAreaSort\">—</span>分钟</div>\n                <div style=\"margin: 0 5px 0 60px\" class=\"font_2\">入院后：<span class=\"writeAreaSort\">—</span> 天 <span class=\"writeAreaSort\">—</span>小时<span class=\"writeAreaSort\">—</span>分钟</div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">肿瘤分期:</div>\n                <div class=\"marginSmall font_2\">C</div><div class=\"chooseBox font_2\"></div>\n                <div class=\"marginSmall font_2\">P</div><div class=\"chooseBox font_2\"></div>\n\n                <div class=\"marginSmall font_2\">T</div><span class=\"writeAreaSort\">—</span>\n                <div class=\"marginSmall font_2\">N</div><span class=\"writeAreaSort\">—</span>\n                <div class=\"marginSmall font_2\">M</div><span class=\"writeAreaSort marginR_B\">—</span>\n                <div class=\"marginSmall font_2\">判断依据：</div><span class=\"writeAreaCenter\">—</span>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"chooseBox font_2\">-</div>\n                <div class=\"marginSmall font_3\">0. 0期</div>\n                <div class=\"marginSmall font_3\">1. 1期</div>\n                <div class=\"marginSmall font_3\">2. 2期</div>\n                <div class=\"marginSmall font_3\">3. 3期</div>\n                <div class=\"marginSmall font_3\">4. 4期</div>\n                <div class=\"marginSmall font_3 marginR_B\">9. 不详</div>\n                <div class=\"marginSmall font_3\">分化程度：<span class=\"writeAreaCenter\">—</span></div>\n\n            </div>\n        </div>\n        <div class=\"secItem\">\n            <div class=\"font_1\">临床路径：进入路径</div>\n            <div class=\"chooseBox font_2\">1</div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_2\">1.是</div>\n                <div class=\"marginSmall font_2\">2.否</div>\n                <div style=\"margin: 0 5px 0 15px;\" class=\"font_1\">变异：</div>\n                <div class=\"chooseBox font_2\">1</div>\n                <div class=\"marginSmall font_2\">1.有</div>\n                <div class=\"marginSmall font_2\">2.无</div>\n                <div style=\"margin: 0 5px 0 15px;\" class=\"font_1\">退出路径：</div>\n                <div class=\"chooseBox font_2\">1</div>\n                <div class=\"marginSmall font_2\">1.是</div>\n                <div class=\"marginSmall font_2\">2.否</div>\n            </div>\n        </div>\n\n        <div class=\"secItem\">\n            <div class=\"font_1\">护理级别</div>\n            <div>\n                <div class=\"marginB rowBox\">\n                    <div class=\"marginSmall font_2\">\n                        <div class=\"rowBox\">\n                            <div class=\"marginSmall font_2 marginR_B\">\n                                特级护理：<span class=\"writeAreaSort\">—</span> 小时\n                            </div>\n                            <div class=\"marginSmall font_2 marginR_B\">\n                                一级护理：<span class=\"writeAreaSort\">—</span> 小时\n                            </div>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"marginB rowBox\">\n                    <div class=\"marginSmall font_2\">\n                        <div class=\"rowBox\">\n                            <div class=\"marginSmall font_2 marginR_B\">\n                                二级护理：<span class=\"writeAreaSort\">—</span> 小时\n                            </div>\n                            <div class=\"marginSmall font_2 marginR_B\">\n                                三级护理：<span class=\"writeAreaSort\">—</span> 小时\n                            </div>\n                        </div>\n                    </div>\n                </div>\n            </div>\n        </div>\n        <div class=\"secItem\">\n            <div class=\"font_1\">呼吸机使用：</div>\n            <div class=\"chooseBox font_2\">0</div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_2\">0.未使用</div>\n                <div class=\"marginSmall font_2\">1.无创</div>\n                <div class=\"marginSmall font_2\">2.有创</div>\n                <div class=\"marginSmall font_2 marginR_B\">3.无创+有创</div>\n                <div class=\"marginSmall font_1 \">\n                    有创呼吸机使用时间（术中除外）：<span class=\"writeAreaSort\">—</span> 小时\n                </div>\n            </div>\n        </div>\n\n        <div class=\"subTable\">\n            <div class=\"tableBar\">\n                <div class=\"font_1 barItem\">重症监护室名称</div>\n                <div class=\"font_1 barItem\">进重症监护室时间（年月日时分）</div>\n                <div class=\"font_1 barItem borderR\">出重症监护室时间（年月日时分）</div>\n            </div>\n            <div class=\"tableBar\">\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem borderR\">—</div>\n            </div>\n            <div class=\"tableBar\">\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem borderR\">—</div>\n            </div>\n            <div class=\"tableBar\">\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem borderR\">—</div>\n            </div>\n            <div class=\"tableBar\">\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem borderR\">—</div>\n            </div>\n            <div class=\"tableBar\">\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem borderR\">—</div>\n            </div>\n            <div class=\"tableBar borderB\">\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem\">—</div>\n                <div class=\"font_3 barItem borderR\">—</div>\n            </div>\n        </div>\n\n    </div>\n</div><script>\n    window.onload = function() {\n      window.print();\n      window.onafterprint = function() {\n        window.close();\n      }\n    }\n  </script>\n</body>\n</html>"
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThird.vue b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThird.vue
index 813f16fa..ea5cdff3 100644
--- a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThird.vue
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThird.vue
@@ -1,10 +1,2314 @@
-<!--
- * @Author: X_bo v-hss@tbpartners.local
- * @Date: 2025-10-11 16:47:22
- * @LastEditTime: 2025-10-11 16:47:28
- * @LastEditors: X_bo v-hss@tbpartners.local
- * @Description: 
- * @FilePath: \openhis-ui-vue3\src\views\hospitalRecord\components\medicalRecordThird.vue
--->
-<template></template>
-<script></script>
\ No newline at end of file
+<template>
+  <div style="width: 100%" class="medicalSec">
+    <div class="thirdItem" style="margin-top: 20px;">
+      <div class="thirdItemTitle">住院费用</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>总费用:</label>
+          <el-input v-model="thirdFormData['hosCharges']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>自付金额:</label>
+          <el-input v-model="thirdFormData['hosCharges_self']"></el-input>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">1.综合医疗服务类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（1）一般医疗服务费:</label>
+          <el-input v-model="thirdFormData['medicalServices_1']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（2）一般治疗操作费:</label>
+          <el-input v-model="thirdFormData['medicalServices_2']"></el-input>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（3）护理费:</label>
+          <el-input v-model="thirdFormData['medicalServices_3']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（4）其他费用:</label>
+          <el-input v-model="thirdFormData['medicalServices_4']"></el-input>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">2.诊断类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（5）病理诊断费:</label>
+          <el-input v-model="thirdFormData['diagnosis_5']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（6）实验室诊断费:</label>
+          <el-input v-model="thirdFormData['diagnosis_6']"></el-input>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（7）影像学诊断费:</label>
+          <el-input v-model="thirdFormData['diagnosis_7']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（8）临床诊断项目费:</label>
+          <el-input v-model="thirdFormData['diagnosis_8']"></el-input>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">3.治疗类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（9）非手术治疗项目费:</label>
+          <el-input v-model="thirdFormData['treatment_9']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（临床物理治疗费）:</label>
+          <el-input v-model="thirdFormData['treatment_9_1']"></el-input>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（10）手术治疗费:</label>
+          <el-input v-model="thirdFormData['treatment_10']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label></label>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（麻醉费）:</label>
+          <el-input v-model="thirdFormData['treatment_10_1']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（手术费）:</label>
+          <el-input v-model="thirdFormData['treatment_10_2']"></el-input>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">4.康复类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（11）康复费:</label>
+          <el-input v-model="thirdFormData['recovery_11']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label></label>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">5.中医类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（12）中医治疗费:</label>
+          <el-input v-model="thirdFormData['TCM_12']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label></label>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">6.西药类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（13）西药费:</label>
+          <el-input v-model="thirdFormData['Western_13']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（抗菌药物费用）</label>
+          <el-input v-model="thirdFormData['Western_13_1']"></el-input>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">7.中药类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（14）中成药费:</label>
+          <el-input v-model="thirdFormData['chinese_14']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（15）中草药费:</label>
+          <el-input v-model="thirdFormData['chinese_15']"></el-input>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">8.血液和血液制品类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（16）血费:</label>
+          <el-input v-model="thirdFormData['blood_16']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（17）白蛋白类制品费:</label>
+          <el-input v-model="thirdFormData['blood_17']"></el-input>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（18）球蛋白类制品费:</label>
+          <el-input v-model="thirdFormData['blood_18']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（19）凝血因子类制品费:</label>
+          <el-input v-model="thirdFormData['blood_19']"></el-input>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（20）细胞因子类制品费:</label>
+          <el-input v-model="thirdFormData['blood_20']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label></label>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">9.耗材类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（21）检查用一次性医用材料费:</label>
+          <el-input v-model="thirdFormData['consumables_21']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label>（22）治疗用一次性医用材料费:</label>
+          <el-input v-model="thirdFormData['consumables_22']"></el-input>
+        </div>
+      </div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（23）手术用一次性医用材料费:</label>
+          <el-input v-model="thirdFormData['consumables_23']"></el-input>
+        </div>
+        <div class="form-item subTitle">
+          <label></label>
+        </div>
+      </div>
+    </div>
+    <div class="thirdItem">
+      <div class="thirdItemTitle">10.其他类</div>
+      <div class="form-row">
+        <div class="form-item subTitle">
+          <label>（24）其他费:</label>
+          <el-input v-model="thirdFormData['other_24']"></el-input>
+        </div>
+        <div class="form-item">
+          <label></label>
+        </div>
+      </div>
+    </div>
+
+    <div style="margin-bottom: 5px">
+      <el-button type="primary" @click="addSubItem" :disabled="false">
+        新增
+      </el-button>
+      <el-button type="danger" plain @click="handleSubDelete" :disabled="false"> 删除 </el-button>
+    </div>
+    <div class="subTable">
+      <div class="subTableHeader">
+        其他诊断及手术附加页
+      </div>
+      <div class="subTableItem1" :class="{'borderBottom':!tableData_sub.length}">
+        <div class="subItemCheckbox">
+          <div class="" :class="{'subItemCheckboxAct':isChooseAllSub,'subChooseAll':!isChooseAllSub}" @click="chooseAll(2)"><span v-show="isChooseAllSub">✓</span></div>
+        </div>
+        <div class="subItem1">出院诊断</div>
+        <div class="subItem2">疾病编码</div>
+        <div class="subItem2">入院病情</div>
+        <div class="subItem2">转归情况</div>
+      </div>
+      <div class="subTableItem"
+           :class="{'borderBottom':index+1===tableData_sub.length}"
+           v-for="(item,index) in tableData_sub" :key="index">
+        <div class="subItemCheckbox" @click="checkItem(item,2)">
+          <div class="" :class="{'subItemCheckboxAct':item['isChoose'],'subChooseAll':!item['isChoose']}"><span v-show="item['isChoose']">✓</span></div>
+        </div>
+        <div class="subItem1">
+          <el-input v-model="item.outPut"></el-input>
+        </div>
+        <div class="subItem2">
+          <el-input v-model="item.code"></el-input>
+        </div>
+        <div class="subItem2">
+          <el-input v-model="item.inPut"></el-input>
+        </div>
+        <div class="subItem2">
+          <el-input v-model="item.back"></el-input>
+        </div>
+      </div>
+    </div>
+
+    <div style="margin-bottom: 5px">
+      <el-button type="primary" @click="addItem" :disabled="false">
+        新增
+      </el-button>
+      <el-button type="danger" plain @click="handleDelete" :disabled="false"> 删除 </el-button>
+    </div>
+    <div class="tableBox">
+      <div class="tableBoxInner">
+        <div :class="{'borderBottom':!tableData_top.length}" class="tableBoxItemHeader">
+          <div class="item itemIndex">
+            <div :class="{'itemCheckBox':!isChooseAll,'itemCheckBoxAct':isChooseAll}" @click="chooseAll(1)">
+              <span v-show="isChooseAll">✓</span>
+            </div>
+          </div>
+          <div class="item itemDate">手术操作日期</div>
+          <div class="item itemSurgeryLevel">手术级别</div>
+          <div class="item itemSurgeryName">手术及操作名称</div>
+          <div class="itemSpec">
+            <div class="spec" style="width: 100%;border-bottom: 1px solid #ebeef5;">手术及操作医师</div>
+            <div class="spec">
+              <div class="specItem">术者</div>
+              <div class="specItem" style="border-left: 1px solid #ebeef5;">Ⅰ助</div>
+              <div class="specItem" style="border-left: 1px solid #ebeef5;">Ⅱ助</div>
+            </div>
+          </div>
+          <div class="item itemCutLevel">切口愈合等级</div>
+          <div class="item itemCutLevel">麻醉方式</div>
+          <div class="item itemCutLevel">麻醉分级</div>
+          <div class="item itemTime borderRight">手术时长(H)</div>
+        </div>
+        <div
+            class="tableBoxItem"
+            :class="{'borderBottom':index+1===tableData_top.length}"
+            v-for="(item,index) in tableData_top"
+            :key="index">
+          <div class="item itemIndex">
+            <div :class="{'itemCheckBox':!item['isChoose'],'itemCheckBoxAct':item['isChoose']}" @click="checkItem(item,1)">
+              <span v-show="item['isChoose']">✓</span>
+            </div>
+          </div>
+          <div class="item itemDate">
+            <el-date-picker
+                v-model="item.ctrlDate"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="手术操作日期"
+                :default-time="item.ctrlDate"
+            />
+          </div>
+          <div class="item itemSurgeryLevel">
+            <el-select v-model="item.surgeryLevel" placeholder="请选择手术级别">
+              <el-option
+                  v-for="item in item['surgeryLevelArr']"
+                  :key="item.value"
+                  :label="item.title"
+                  :value="item.value"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="item itemSurgeryName">
+            <el-input v-model="item.surgeryName"></el-input>
+          </div>
+          <div class="itemSpec">
+            <div class="spec_">
+              <div class="specItem" style="padding: 10px;">
+                <el-input v-model="item.surgeryMasterName"></el-input>
+              </div>
+              <div class="specItem" style="padding: 10px;border-left: 1px solid #ebeef5;">
+                <el-input v-model="item.surgeryMasterName_1"></el-input>
+              </div>
+              <div class="specItem" style="padding: 10px;border-left: 1px solid #ebeef5;">
+                <el-input v-model="item.surgeryMasterName_2"></el-input>
+              </div>
+            </div>
+          </div>
+          <div class="item itemCutLevel">
+            <el-select v-model="item.cutLevel">
+              <el-option
+                  v-for="item in item['cutLevelArr']"
+                  :key="item.value"
+                  :label="item.title"
+                  :value="item.value"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="item itemCutLevel">
+            <el-select v-model="item.anesthesiaType" placeholder="请选择手术级别">
+              <el-option
+                  v-for="item in operationLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="item itemCutLevel">
+            <el-select v-model="item.anesthesiaLevel" placeholder="请选择手术级别">
+              <el-option
+                  v-for="item in item.anesthesiaLevelArr"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="item itemTime borderRight">
+            <el-input v-model="item.surgeryTime"></el-input>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {nextTick, reactive, ref, watch} from 'vue';
+import { ElMessage } from 'element-plus'
+
+interface form {
+  //总费用  sumamt  medfeeSumamt
+  medfee_sumamt: '',
+  //自付金额
+  fulamt_ownpay_amt: '',
+
+  //一般医疗服务费
+  ordn_med_servfee: '',
+  //一般治疗操作费
+  ordn_trt_oprt_fee: '',
+  //护理费
+  nurs_fee: '',
+  //其他费用
+  com_med_serv_oth_fee: '',
+
+  //病理诊断费
+  palg_diag_fee: '',
+  //实验室诊断费
+  lab_diag_fee: '',
+  //影像学诊断费
+  rdhy_diag_fee: '',
+  //临床诊断项目费
+  clnc_dise_fee: '',
+
+  //非手术治疗项目费
+  nsrgtrt_item_fee: '',
+  //临床物理治疗费
+  clnc_phys_trt_fee: '',
+  //手术治疗费
+  rgtrt_trt_fee: '',
+  //麻醉费
+  anst_fee: '',
+  //手术费
+  rgtrt_fee: '',
+
+  //康复费
+  rhab_fee: '',
+
+  //中医治疗费
+  tcm_trt_fee: '',
+
+  //西药费
+  wm_fee: '',
+  //抗菌药物费用
+  abtl_medn_fee: '',
+
+  //中成药费
+  tcmpat_fee: '',
+  //中草药费---不确定
+  tcmherb_fee: '',
+
+  //血费
+  blo_fee: '',
+  //白蛋白类制品费
+  albu_fee: '',
+  //球蛋白类制品费
+  glon_fee: '',
+  //凝血因子类制品费
+  clotfac_fee: '',
+  //细胞因子类制品费
+  cyki_fee: '',
+
+  //检查用一次性医用材料费
+  exam_dspo_matl_fee: '',
+  //治疗用一次性医用材料费
+  trt_dspo_matl_fee: '',
+  //手术用一次性医用材料费
+  oprn_dspo_matl_fee: '',
+
+  //其他费
+  oth_fee: '',
+
+  //出院诊断
+  dscg_diag: '',
+  //疾病编码--不确定
+  damg_intx_ext_rea_disecode: '',
+  //入院病情  admCond
+  adm_cond: '',
+  //转归情况
+
+
+
+  //手术操作日期   oprn_oprt_date
+  oprn_date: '',
+
+  //手术级别 手术级别名称--oprn_lv_code
+  oprn_lv_code: '',
+
+  //手术及操作名称  oprn_oprt_code
+  oprn_oprt_name: '',
+
+  //手术及操作医师
+  //术者
+  oper_name: '',
+  //Ⅰ助
+  asit_1_name: '',
+  //Ⅱ助
+  asit_name2: '',
+
+  //切口愈合等级 sinc_heal_lv_code
+  sinc_heal_lv: '',
+
+  //麻醉方式
+  anst_way: '',
+
+  //麻醉分级  anst_lv_code
+  anst_lv_name: '',
+
+  //手术时长
+
+
+  //住院费用
+  hosCharges: string,
+  hosCharges_self: string,
+  //1.综合医疗服务类
+  medicalServices_1: string,
+  medicalServices_2: string,
+  medicalServices_3: string,
+  medicalServices_4: string,
+  //2.诊断类
+  diagnosis_5: string,
+  diagnosis_6: string,
+  diagnosis_7: string,
+  diagnosis_8: string,
+  //3.治疗类
+  treatment_9: string,
+  treatment_9_1: string,
+  treatment_10: string,
+  treatment_10_1: string,
+  treatment_10_2: string,
+  //4.康复类
+  recovery_11: string,
+  //5.中医类
+  TCM_12: string,
+  //6.西药类
+  Western_13: string,
+  Western_13_1: string,
+  //7.中药类
+  chinese_14: string,
+  chinese_15: string,
+  //8.血液和血液制品类
+  blood_16: string,
+  blood_17: string,
+  blood_18: string,
+  blood_19: string,
+  blood_20: string,
+  //9.耗材类
+  consumables_21: string,
+  consumables_22: string,
+  consumables_23: string,
+  //10.其他类:
+  other_24: string,
+}
+
+let chooseData = reactive([])//表格中选中的数据 TODO
+let chooseSubData = reactive([])//表格中选中的数据 TODO
+const tableData_top = reactive([])
+const tableData_sub = reactive([])
+const thirdFormData = ref<form[]>({});
+/*const thirdFormData = reactive({
+
+})*/
+let isChooseAll = ref<boolean>(false);
+let isChooseAllSub = ref<boolean>(false);
+const formData = reactive({
+  surgeryDate: '2025-10-10',
+  surgeryType: '',
+  surgeryTypeArr: [
+    {
+      title: '择期手术',
+      value: 1,
+    },
+    {
+      title: '限期手术',
+      value: 2,
+    },
+    {
+      title: '急诊手术',
+      value: 3,
+    }
+  ],
+  leaveType: '',
+  leaveTypeArr: [
+    {
+      title: '医嘱离院',
+      value: 1,
+    },
+    {
+      title: '医嘱转院',
+      value: 2,
+    },
+    {
+      title: '医嘱转社区卫生服务机构',
+      value: 3,
+    },
+    {
+      title: '非医嘱离院',
+      value: 4,
+    },
+    {
+      title: '死亡',
+      value: 5,
+    },
+    {
+      title: '其他',
+      value: 6,
+    }
+  ],
+  isPlan: '',
+  isPlanArr: [
+    {
+      title: '是',
+      value: 1,
+    },
+    {
+      title: '否',
+      value: 1,
+    }
+  ],
+  purpose: '',
+  comaDurationTime_before: '',//昏迷时间---入院前
+  comaDurationTime_after: '',//昏迷时间---入院后
+
+  tumorStaging: '',
+  tumorStagingArr: [
+    {
+      title: 'C',
+      value: 1,
+    },
+    {
+      title: 'P',
+      value: 2,
+    }
+  ],
+  judgmentBase: '',
+  judgmentBaseArr: [
+    {
+      title: '0期',
+      value: 0,
+    },
+    {
+      title: '1期',
+      value: 1,
+    },
+    {
+      title: '2期',
+      value: 2,
+    },
+    {
+      title: '3期',
+      value: 3,
+    },
+    {
+      title: '4期',
+      value: 4,
+    },
+    {
+      title: '不详',
+      value: 5,
+    }
+  ],
+  tumor_T: '',
+  tumor_N: '',
+  tumor_M: '',
+  degreeDifferentiation: '',
+
+  enterPath: '',
+  enterPathArr: [
+    {
+      title: '是',
+      value: 1,
+    },
+    {
+      title: '否',
+      value: 1,
+    }
+  ],
+  outPath: '',
+  outPathArr: [
+    {
+      title: '是',
+      value: 1,
+    },
+    {
+      title: '否',
+      value: 1,
+    }
+  ],
+  mutation: '',
+  mutationArr: [
+    {
+      title: '有',
+      value: 1,
+    },
+    {
+      title: '无',
+      value: 1,
+    }
+  ],
+
+  nursingLevel_spec: '',
+  nursingLevel_1: '',
+  nursingLevel_2: '',
+  nursingLevel_3: '',
+
+  ventilatorUse: '',
+  ventilatorUseArr: [
+    {
+      title: '未使用',
+      value: 1,
+    },
+    {
+      title: '无创',
+      value: 2,
+    },
+    {
+      title: '有创',
+      value: 3,
+    },
+    {
+      title: '无创+有创',
+      value: 4,
+    }
+  ],
+
+  ventilatorUseTime: '',
+});
+
+const operationLevelList = [
+  { name: '一级', id: 1 },
+  { name: '二级', id: 2 },
+  { name: '三级', id: 3 },
+];
+
+//最下table--新增
+const addItem = () => {
+  let data = {
+    isChoose: false,
+    ctrlDate: '2025-10-10',
+    surgeryLevel: '',
+    surgeryLevelArr: [
+      {
+        title: '1级',
+        value: 1,
+      },
+      {
+        title: '2级',
+        value: 2,
+      },
+      {
+        title: '3级',
+        value: 3,
+      },
+      {
+        title: '4级',
+        value: 4,
+      }
+    ],
+    surgeryName: '',
+    surgeryMasterName: '',
+    surgeryMasterName_1: '',
+    surgeryMasterName_2: '',
+    cutLevel: '',
+    cutLevelArr: [
+      {
+        title: '1/甲',
+        value: 1,
+      },
+      {
+        title: '2/乙',
+        value: 2,
+      }
+    ],
+    anesthesiaType: '',
+    anesthesiaTypeArr: [],
+    anesthesiaEr: '',
+    anesthesiaLevel: '',
+    anesthesiaLevelArr: [
+      {
+        title: '1',
+        value: 1,
+      },
+      {
+        title: '2',
+        value: 2,
+      },
+    ],
+    surgeryTime: ''
+  }
+  //push
+  tableData_top.unshift(
+      data
+  )
+  tableData_top.map((d,i) => {
+    d.currentIndex = i
+  })
+
+}
+//最下table--删除
+const handleDelete = () => {
+  if (!tableData_top.length) { return }
+  let deleteId = []
+  chooseData.map((d) => {
+    deleteId.push(d['currentIndex'])
+  })
+
+  for (let i = tableData_top.length - 1; i >= 0; i--) {
+    if (deleteId.includes(tableData_top[i].currentIndex)) {
+      tableData_top.splice(i, 1);
+    }
+  }
+
+  isChooseAll.value = false
+
+  msgSuccess('删除成功')
+}
+
+//其他诊断及手术附加页 添加方法
+const addSubItem = () => {
+  const data =   {
+    isChoose: false,
+    outPut: '',
+    code: '',
+    inPut: '',
+    back: '',
+  }
+  //tableData_sub  unshift
+  tableData_sub.unshift(data)
+  tableData_sub.map((d,i) => {
+    d.currentIndex = i
+  })
+
+}
+//其他诊断及手术附加页 删除方法
+const handleSubDelete = () => {
+  if (!tableData_sub.length) { return }
+  let deleteId = []
+  chooseSubData.map((d) => {
+    deleteId.push(d['currentIndex'])
+  })
+
+  for (let i = tableData_sub.length - 1; i >= 0; i--) {
+    if (deleteId.includes(tableData_sub[i].currentIndex)) {
+      tableData_sub.splice(i, 1);
+    }
+  }
+
+  isChooseAllSub.value = false
+
+  msgSuccess('删除成功')
+}
+
+
+//公共全选
+const checkItem = (e,type) => {
+  if (type===1) {
+    chooseData = []
+    e['isChoose'] = !e['isChoose']
+    tableData_top.map((d) => {
+      if (d['isChoose']) {
+        chooseData.push(d)
+      }
+    })
+  } else {
+    chooseSubData = []
+    e['isChoose'] = !e['isChoose']
+    tableData_sub.map((d) => {
+      if (d['isChoose']) {
+        chooseSubData.push(d)
+      }
+    })
+  }
+
+}
+const chooseAll = (type) => {
+  // logHtml()
+  if (type===1) {
+    if (tableData_top.length) {
+      isChooseAll.value = !isChooseAll.value
+
+      tableData_top.map((d) => {
+        d['isChoose'] = !isChooseAll.value
+
+        checkItem(d,type)
+      })
+    }
+  } else {
+    if (tableData_sub.length) {
+      isChooseAllSub.value = !isChooseAllSub.value
+
+      tableData_sub.map((d) => {
+        d['isChoose'] = !isChooseAllSub.value
+
+        checkItem(d,type)
+      })
+    }
+  }
+
+
+}
+
+const msgSuccess = (msg) => {
+  ElMessage({
+    message: msg,
+    type: 'success',
+  })
+}
+
+const logHtml = () => {
+  let html = `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        .hisSec {
+            padding: 10px 0;
+            width: 100vw;
+            min-height: 100vh;
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+        }
+        .font_1 {
+            font-size: 14px;
+            font-weight: bold;
+        }
+        .font_2 {
+            font-size: 14px;
+        }
+        .font_3 {
+            font-size: 13px;
+        }
+        .font_4 {
+            font-size: 12px;
+        }
+        .hisSecInner {
+            width: 1000px;
+            height: 100%;
+        }
+        .tableBox {
+            margin: 10px 0;
+        }
+        .tableBoxInner {
+
+        }
+        .borderRight {
+            border-right: 1px solid #333333;
+        }
+        .borderBottom {
+            border-bottom: 1px solid #333333;
+        }
+        .tableBoxItemHeader {
+            font-weight: bold;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            height: 50px;
+
+        }
+        .tableBoxItemHeader .item {
+            white-space: wrap;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            box-sizing: border-box;
+            padding: 10px 2px;
+            height: 100%;
+            text-align: center;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemIndex {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 3.5%;
+        }
+        .tableBoxItemHeader .chooseAllBtn {
+            width: 18px;
+            height: 18px;
+        }
+        .tableBoxItemHeader .itemDate {
+            width: 10%;
+        }
+        .tableBoxItemHeader .itemSurgeryLevel {
+            width: 7%;
+        }
+        .tableBoxItemHeader .itemSurgeryName {
+            width: 23%;
+        }
+        .tableBoxItemHeader .itemCutLevel {
+            width: 9%;
+        }
+        .tableBoxItemHeader .itemCutLevel1 {
+            width: 12%;
+        }
+        .tableBoxItemHeader .itemCutLevel2 {
+            width: 7%;
+        }
+        .tableBoxItemHeader .itemTime {
+            width: 9%;
+        }
+        .tableBoxItemHeader .itemSpec {
+            width: 20%;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            height: 50px;
+        }
+        .tableBoxItemHeader .itemSpec .spec {
+            width: 100%;
+            text-align: center;
+            height: 50%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemSpec .spec .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 25px;
+        }
+        .tableBoxItemHeader .itemSpec .spec_ {
+            width: 100%;
+            text-align: center;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+
+        }
+        .tableBoxItemHeader .itemSpec .spec_ .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemCheckBox {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+        }
+        .tableBoxItemHeader .itemCheckBoxAct {
+            line-height: 16px;
+            text-align: center;
+            font-size: 12px;
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+            background: #333333;
+            color: #fff;
+        }
+        .tableBoxItemHeader .itemCheckBox:hover {
+            border: 1px solid #333333;
+        }
+        .tableBoxItem {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            height: 55px;
+        }
+        .tableBoxItem .item {
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            //line-height: 40px;
+            box-sizing: border-box;
+            padding: 10px 2px;
+            height: 100%;
+            text-align: center;
+        }
+        .tableBoxItem .itemIndex {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 3.5%;
+        }
+        .tableBoxItem .itemDate {
+            width: 10%;
+        }
+        .tableBoxItem .itemSurgeryLevel {
+            width: 7%;
+        }
+        .tableBoxItem .itemSurgeryName {
+            width: 23%;
+        }
+        .tableBoxItem .itemCutLevel {
+            width: 9%;
+        }
+        .tableBoxItem .itemCutLevel1 {
+            width: 12%;
+        }
+        .tableBoxItem .itemCutLevel2 {
+            width: 7%;
+        }
+        .tableBoxItem .itemTime {
+            width: 9%;
+        }
+        .tableBoxItem .itemSpec {
+            width: 20%;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            height: 55px;
+        }
+        .tableBoxItem .itemSpec .spec {
+            width: 100%;
+            text-align: center;
+            height: 50%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemSpec .spec .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 25px;
+        }
+        .tableBoxItem .itemSpec .spec_ {
+            width: 100%;
+            text-align: center;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemSpec .spec_ .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemCheckBox {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+        }
+        .tableBoxItem .itemCheckBoxAct {
+            line-height: 16px;
+            text-align: center;
+            font-size: 12px;
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+            background: #409eff;
+            color: #fff;
+        }
+        .tableBoxItem .itemCheckBox:hover {
+            border: 1px solid #409eff;
+        }
+
+
+
+        .topBar {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .secItem {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            //align-items: center;
+            justify-content: left;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .secItem1 {
+            width: 100%;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .chooseBox {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 15px;
+            height: 15px;
+            border: 1px solid #333;
+            font-size: 12px;
+            margin: 0 5px;
+        }
+        .rowBox {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+        }
+        .writeArea {
+            display: inline-block;
+            width: 150px;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 2px;
+        }
+        .writeAreaCenter {
+            display: inline-block;
+            width: 150px;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 2px;
+            text-align: center;
+        }
+        .writeAreaSort {
+            display: inline-block;
+            width: 35px;
+            border-bottom: 1px solid #333333;
+            //padding-bottom: 2px;
+            text-align: center;
+        }
+        .marginSmall {
+            margin: 0 5px;
+        }
+        .marginNor {
+            margin: 0 10px;
+        }
+        .marginBig {
+            margin: 0 20px;
+        }
+        .marginB {
+            margin-bottom: 10px;
+        }
+        .marginR_B {
+            margin-right: 40px;
+        }
+        .subTable {
+
+        }
+        .tableBar {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: left;
+            height: 35px;
+        }
+        .barItem {
+            height: 100%;
+            width: 33.33%;
+            box-sizing: border-box;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+        }
+        .borderR {
+            border-right: 1px solid #333333;
+        }
+        .borderB {
+            border-bottom: 1px solid #333333;
+        }
+    </style>
+</head>
+<body>
+<div class="hisSec">
+    <div class="hisSecInner">
+        <div class="topBar">
+            <div class="font_2">姓名：金长存</div>
+            <div class="font_2">病案号：12345678</div>
+        </div>
+
+<!--        <div class="tableBox">
+            <div class="tableBoxInner">
+                <div class="tableBoxItemHeader font_1">
+                    <div class="item itemDate">手术操作日期</div>
+                    <div class="item itemSurgeryLevel">手术级别</div>
+                    <div class="item itemSurgeryName">手术及操作名称</div>
+                    <div class="itemSpec">
+                        <div class="spec" style="width: 100%;border-bottom: 1px solid #333333;">手术及操作医师</div>
+                        <div class="spec">
+                            <div class="specItem">术者</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅰ助</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅱ助</div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">切口愈合等级</div>
+                    <div class="item itemCutLevel">麻醉方式</div>
+                    <div class="item itemCutLevel">麻醉医师</div>
+                    <div class="item itemCutLevel">麻醉分级</div>
+                    <div class="item itemTime borderRight">手术时长(H)</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">5</div>
+                    <div class="item itemSurgeryName">腰椎间盘切除，椎管减压，植骨融合内固定术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">PICC管去除</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">经外周静脉穿刺中心静脉置管技术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                王丽丽
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2 borderBottom">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+            </div>
+        </div>-->
+        <div class="tableBox">
+            <div class="tableBoxInner">
+                <div class="tableBoxItemHeader font_4">
+                    <div class="item itemDate">手术操作日期</div>
+                    <div class="item itemSurgeryLevel">手术级别</div>
+                    <div class="item itemSurgeryName">手术及操作名称</div>
+                    <div class="itemSpec">
+                        <div class="spec" style="width: 100%;border-bottom: 1px solid #333333;">手术及操作医师</div>
+                        <div class="spec">
+                            <div class="specItem">术者</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅰ助</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅱ助</div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">切口愈合等级</div>
+                    <div class="item itemCutLevel1">麻醉方式</div>
+                    <div class="item itemCutLevel">麻醉医师</div>
+                    <div class="item itemCutLevel2">麻醉分级</div>
+                    <div class="item itemTime borderRight">手术时长(H)</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">5</div>
+                    <div class="item itemSurgeryName">腰椎间盘切除，椎管减压，植骨融合内固定术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">PICC管去除</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">经外周静脉穿刺中心静脉置管技术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                王丽丽
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4 borderBottom">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">手术方式</div>
+            <div class="chooseBox font_2">1</div>
+            <div class="rowBox">
+                <div style="margin: 0 5px;" class="font_2">1.择期手术</div>
+                <div style="margin: 0 5px;" class="font_2">2.限期手术</div>
+                <div style="margin: 0 5px;" class="font_2">3.急诊手术</div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">离院方式</div>
+            <div class="chooseBox font_2">1</div>
+            <div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">1.医嘱离院</div>
+                    <div class="marginSmall font_2">2.医嘱转院，拟接受医疗结构名称 <span class="writeArea">—</span> </div>
+                </div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">3.医嘱转让社区卫生服务机构、乡镇卫生院，拟接受医疗结构名称<span class="writeAreaCenter">—</span></div>
+                </div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">4.非医嘱离院</div>
+                    <div class="marginSmall font_2">5.死亡</div>
+                    <div class="marginSmall font_2">6.其他</div>
+                </div>
+            </div>
+
+        </div>
+        <div class="secItem">
+            <div class="font_1">是否有出院31天内再住院计划</div>
+            <div class="chooseBox font_2">1</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">1.无</div>
+                <div class="marginSmall font_2">2.有</div>
+                <div style="margin: 0 5px 0 15px;" class="font_2">目的：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">颅脑损伤患者昏迷时间：</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">入院前：<span class="writeAreaSort">—</span> 天 <span class="writeAreaSort">—</span>小时<span class="writeAreaSort">—</span>分钟</div>
+                <div style="margin: 0 5px 0 60px" class="font_2">入院后：<span class="writeAreaSort">—</span> 天 <span class="writeAreaSort">—</span>小时<span class="writeAreaSort">—</span>分钟</div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">肿瘤分期:</div>
+                <div class="marginSmall font_2">C</div><div class="chooseBox font_2"></div>
+                <div class="marginSmall font_2">P</div><div class="chooseBox font_2"></div>
+
+                <div class="marginSmall font_2">T</div><span class="writeAreaSort">—</span>
+                <div class="marginSmall font_2">N</div><span class="writeAreaSort">—</span>
+                <div class="marginSmall font_2">M</div><span class="writeAreaSort marginR_B">—</span>
+                <div class="marginSmall font_2">判断依据：</div><span class="writeAreaCenter">—</span>
+            </div>
+            <div class="rowBox">
+                <div class="chooseBox font_2">-</div>
+                <div class="marginSmall font_3">0. 0期</div>
+                <div class="marginSmall font_3">1. 1期</div>
+                <div class="marginSmall font_3">2. 2期</div>
+                <div class="marginSmall font_3">3. 3期</div>
+                <div class="marginSmall font_3">4. 4期</div>
+                <div class="marginSmall font_3 marginR_B">9. 不详</div>
+                <div class="marginSmall font_3">分化程度：<span class="writeAreaCenter">—</span></div>
+
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">临床路径：进入路径</div>
+            <div class="chooseBox font_2">1</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">1.是</div>
+                <div class="marginSmall font_2">2.否</div>
+                <div style="margin: 0 5px 0 15px;" class="font_1">变异：</div>
+                <div class="chooseBox font_2">1</div>
+                <div class="marginSmall font_2">1.有</div>
+                <div class="marginSmall font_2">2.无</div>
+                <div style="margin: 0 5px 0 15px;" class="font_1">退出路径：</div>
+                <div class="chooseBox font_2">1</div>
+                <div class="marginSmall font_2">1.是</div>
+                <div class="marginSmall font_2">2.否</div>
+            </div>
+        </div>
+
+        <div class="secItem">
+            <div class="font_1">护理级别</div>
+            <div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">
+                        <div class="rowBox">
+                            <div class="marginSmall font_2 marginR_B">
+                                特级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                            <div class="marginSmall font_2 marginR_B">
+                                一级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">
+                        <div class="rowBox">
+                            <div class="marginSmall font_2 marginR_B">
+                                二级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                            <div class="marginSmall font_2 marginR_B">
+                                三级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">呼吸机使用：</div>
+            <div class="chooseBox font_2">0</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">0.未使用</div>
+                <div class="marginSmall font_2">1.无创</div>
+                <div class="marginSmall font_2">2.有创</div>
+                <div class="marginSmall font_2 marginR_B">3.无创+有创</div>
+                <div class="marginSmall font_1 ">
+                    有创呼吸机使用时间（术中除外）：<span class="writeAreaSort">—</span> 小时
+                </div>
+            </div>
+        </div>
+
+        <div class="subTable">
+            <div class="tableBar">
+                <div class="font_1 barItem">重症监护室名称</div>
+                <div class="font_1 barItem">进重症监护室时间（年月日时分）</div>
+                <div class="font_1 barItem borderR">出重症监护室时间（年月日时分）</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar borderB">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+        </div>
+
+    </div>
+</div>
+</body>
+</html>`
+
+  console.log(JSON.stringify(html))
+}
+
+
+</script>
+
+<style lang="scss">
+.medicalSec {
+  .el-date-editor.el-input, .el-date-editor.el-input__wrapper {
+    width: 100%;
+  }
+  .el-table td.el-table__cell div {
+    width: 100%;
+  }
+}
+
+</style>
+<style lang="scss" scoped>
+:deep(.el-table__expand-icon) {
+  display: none !important;
+}
+.borderBottom {
+  border-bottom: 1px solid #ebeef5;
+}
+
+.subTitle {
+  color: #000410;
+}
+
+.thirdItem {
+  border-radius: 5px;
+  box-sizing: border-box;
+  border: 1px solid #ccc;
+  padding: 10px 10px 5px 10px;
+  margin-bottom: 20px;
+  .thirdItemTitle {
+    font-weight: bold;
+    width: 100%;
+    border-bottom: 1px solid #ccc;
+    padding-bottom: 5px;
+    margin-bottom: 10px;
+  }
+}
+.tableItemCheck {
+  margin: 0 auto;
+  width: 18px !important;
+  height: 18px !important;
+  box-sizing: border-box;
+  cursor: pointer;
+  border: 1px solid #ccc;
+}
+.tableBox {
+  margin: 10px 0;
+  .tableBoxInner {
+    .borderRight {
+      border-right: 1px solid #ebeef5;
+    }
+
+    .tableBoxItemHeader {
+      background: #f8f8f9;
+      color: #515a6e;
+      font-weight: bold;
+      font-size: 13px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 80px;
+      .item {
+        white-space: wrap;
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        line-height: 65px;
+        box-sizing: border-box;
+        padding: 10px;
+        height: 100%;
+        text-align: center;
+      }
+      .itemIndex {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        width: 3.5%;
+      }
+      .chooseAllBtn {
+        width: 18px;
+        height: 18px;
+      }
+      .itemDate {
+        width: 12%;
+      }
+      .itemSurgeryLevel {
+        width: 14%;
+      }
+      .itemSurgeryName {
+        width: 20%;
+      }
+      .itemCutLevel {
+        width: 8%;
+      }
+      .itemTime {
+        width: 7%;
+      }
+      .itemSpec {
+        width: 20%;
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        height: 80px;
+        .spec {
+          width: 100%;
+          text-align: center;
+          height: 50%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 39px;
+          }
+        }
+        .spec_ {
+          width: 100%;
+          text-align: center;
+          height: 100%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+      .itemCheckBox {
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+      }
+      .itemCheckBoxAct {
+        line-height: 16px;
+        text-align: center;
+        font-size: 12px;
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+        background: #409eff;
+        color: #fff;
+      }
+      .itemCheckBox:hover {
+        border: 1px solid #409eff;
+      }
+    }
+    .tableBoxItem {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      height: 50px;
+      .item {
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        //line-height: 40px;
+        box-sizing: border-box;
+        padding: 10px;
+        height: 100%;
+        text-align: center;
+      }
+      .itemIndex {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        width: 3.5%;
+      }
+      .itemDate {
+        width: 12%;
+      }
+      .itemSurgeryLevel {
+        width: 14%;
+      }
+      .itemSurgeryName {
+        width: 20%;
+      }
+      .itemCutLevel {
+        width: 8%;
+      }
+      .itemTime {
+        width: 7%;
+      }
+      .itemSpec {
+        width: 20%;
+        border-top: 1px solid #ebeef5;
+        border-left: 1px solid #ebeef5;
+        height: 50px;
+        .spec {
+          width: 100%;
+          text-align: center;
+          height: 50%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 39px;
+          }
+        }
+        .spec_ {
+          width: 100%;
+          text-align: center;
+          height: 100%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+          }
+        }
+      }
+      .itemCheckBox {
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+      }
+      .itemCheckBoxAct {
+        line-height: 16px;
+        text-align: center;
+        font-size: 12px;
+        width: 18px;
+        height: 18px;
+        cursor: pointer;
+        border: 1px solid #ccc;
+        border-radius: 2px;
+        background: #409eff;
+        color: #fff;
+      }
+      .itemCheckBox:hover {
+        border: 1px solid #409eff;
+      }
+    }
+  }
+}
+.subTable {
+  width: 100%;
+  margin-bottom: 20px;
+  .subTableHeader {
+    height: 50px;
+    text-align: center;
+    line-height: 50px;
+    font-weight: bold;
+    border-top: 1px solid #ebeef5;
+    border-left: 1px solid #ebeef5;
+    border-right: 1px solid #ebeef5;
+    font-size: 16px;
+    color: #515a6e;
+    background: #f8f8f9;
+  }
+  .subTableItem1 {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    text-align: center;
+    height: 60px;
+    box-sizing: border-box;
+    background: #f8f8f9;
+    font-weight: bold;
+    color: #515a6e;
+    font-size: 13px;
+  }
+  .subTableItem {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    text-align: center;
+    height: 60px;
+    box-sizing: border-box;
+  }
+  .subItemCheckbox {
+    width: 4%;
+    border-top: 1px solid #ebeef5;
+    border-left: 1px solid #ebeef5;
+    padding: 5px 10px;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+  }
+  .subItemCheckboxAct {
+    background: #409eff;
+    width: 18px;
+    height: 18px;
+    cursor: pointer;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    font-size: 12px;
+    color: #fff;
+  }
+  .subChooseAll {
+    width: 18px;
+    height: 18px;
+    cursor: pointer;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    font-size: 12px;
+    color: #fff;
+  }
+  .subChooseAll:hover {
+    border: 1px solid #409eff;
+  }
+  .subItem1 {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    box-sizing: border-box;
+    padding: 5px 10px;
+    width: 51%;
+    border-top: 1px solid #ebeef5;
+    border-left: 1px solid #ebeef5;
+  }
+  .subItem2 {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    box-sizing: border-box;
+    padding: 5px 10px;
+    width: 15%;
+    border-top: 1px solid #ebeef5;
+    border-left: 1px solid #ebeef5;
+  }
+}
+.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;
+}
+.form-row {
+  display: flex;
+  flex-wrap: wrap;
+  //margin-bottom: 15px;
+}
+
+.form-item {
+  flex: 1;
+  min-width: 200px;
+  margin-right: 15px;
+  margin-bottom: 8px;
+}
+
+.form-item.full-width {
+  flex: 0 0 100%;
+  min-width: 100%;
+}
+.form-item-specLabel {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.specLabelInner {
+  margin: 0 8px;
+  width: 60px;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+  font-size: 14px;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThirdPrint.json b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThirdPrint.json
new file mode 100644
index 00000000..0326f6c7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThirdPrint.json
@@ -0,0 +1,3 @@
+{
+  "printContent": "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n    <meta charset=\"UTF-8\">\n    <title>Title</title>\n    <style>\n        * {\n            margin: 0;\n            padding: 0;\n        }\n        .hisSec {\n            padding: 10px 0;\n            width: 100vw;\n            min-height: 100vh;\n            display: flex;\n            flex-direction: row;\n            justify-content: center;\n        }\n        .font_1 {\n            font-size: 14px;\n            font-weight: bold;\n        }\n        .font_2 {\n            font-size: 14px;\n        }\n        .font_3 {\n            font-size: 13px;\n        }\n        .font_4 {\n            font-size: 12px;\n        }\n\n        .hisSecInner {\n            width: 1000px;\n            height: 100%;\n        }\n        .tableBox {\n            margin: 10px 0;\n        }\n        .tableBoxInner {\n\n        }\n        .borderRight {\n            border-right: 1px solid #333333;\n        }\n        .borderBottom {\n            border-bottom: 1px solid #333333;\n        }\n        .tableBoxItemHeader {\n            font-weight: bold;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            height: 50px;\n\n        }\n        .tableBoxItemHeader .item {\n            white-space: wrap;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            box-sizing: border-box;\n            padding: 10px 2px;\n            height: 100%;\n            text-align: center;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItemHeader .itemIndex {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            width: 3.5%;\n        }\n        .tableBoxItemHeader .chooseAllBtn {\n            width: 18px;\n            height: 18px;\n        }\n        .tableBoxItemHeader .itemDate {\n            width: 10%;\n        }\n        .tableBoxItemHeader .itemSurgeryLevel {\n            width: 7%;\n        }\n        .tableBoxItemHeader .itemSurgeryName {\n            width: 23%;\n        }\n        .tableBoxItemHeader .itemCutLevel {\n            width: 9%;\n        }\n        .tableBoxItemHeader .itemCutLevel1 {\n            width: 12%;\n        }\n        .tableBoxItemHeader .itemCutLevel2 {\n            width: 7%;\n        }\n        .tableBoxItemHeader .itemTime {\n            width: 9%;\n        }\n        .tableBoxItemHeader .itemSpec {\n            width: 20%;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            height: 50px;\n        }\n        .tableBoxItemHeader .itemSpec .spec {\n            width: 100%;\n            text-align: center;\n            height: 50%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItemHeader .itemSpec .spec .specItem {\n            width: 33.33%;\n            height: 100%;\n            line-height: 25px;\n        }\n        .tableBoxItemHeader .itemSpec .spec_ {\n            width: 100%;\n            text-align: center;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n\n        }\n        .tableBoxItemHeader .itemSpec .spec_ .specItem {\n            width: 33.33%;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItemHeader .itemCheckBox {\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n        }\n        .tableBoxItemHeader .itemCheckBoxAct {\n            line-height: 16px;\n            text-align: center;\n            font-size: 12px;\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n            background: #333333;\n            color: #fff;\n        }\n        .tableBoxItemHeader .itemCheckBox:hover {\n            border: 1px solid #333333;\n        }\n        .tableBoxItem {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            height: 55px;\n        }\n        .tableBoxItem .item {\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            //line-height: 40px;\n            box-sizing: border-box;\n            padding: 10px 2px;\n            height: 100%;\n            text-align: center;\n        }\n        .tableBoxItem .itemIndex {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            width: 3.5%;\n        }\n        .tableBoxItem .itemDate {\n            width: 10%;\n        }\n        .tableBoxItem .itemSurgeryLevel {\n            width: 7%;\n        }\n        .tableBoxItem .itemSurgeryName {\n            width: 23%;\n        }\n        .tableBoxItem .itemCutLevel {\n            width: 9%;\n        }\n        .tableBoxItem .itemCutLevel1 {\n            width: 12%;\n        }\n        .tableBoxItem .itemCutLevel2 {\n            width: 7%;\n        }\n        .tableBoxItem .itemTime {\n            width: 9%;\n        }\n        .tableBoxItem .itemSpec {\n            width: 20%;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            height: 55px;\n        }\n        .tableBoxItem .itemSpec .spec {\n            width: 100%;\n            text-align: center;\n            height: 50%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItem .itemSpec .spec .specItem {\n            width: 33.33%;\n            height: 100%;\n            line-height: 25px;\n        }\n        .tableBoxItem .itemSpec .spec_ {\n            width: 100%;\n            text-align: center;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItem .itemSpec .spec_ .specItem {\n            width: 33.33%;\n            height: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n        }\n        .tableBoxItem .itemCheckBox {\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n        }\n        .tableBoxItem .itemCheckBoxAct {\n            line-height: 16px;\n            text-align: center;\n            font-size: 12px;\n            width: 18px;\n            height: 18px;\n            cursor: pointer;\n            border: 1px solid #ccc;\n            border-radius: 2px;\n            background: #409eff;\n            color: #fff;\n        }\n        .tableBoxItem .itemCheckBox:hover {\n            border: 1px solid #409eff;\n        }\n        .topBar {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: space-between;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 5px;\n            margin-bottom: 10px;\n        }\n        .secItem {\n            width: 100%;\n            display: flex;\n            flex-direction: row;\n            //align-items: center;\n            justify-content: left;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 5px;\n            margin-bottom: 10px;\n        }\n        .secItem1 {\n            width: 100%;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 5px;\n            margin-bottom: 10px;\n        }\n        .chooseBox {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            width: 15px;\n            height: 15px;\n            border: 1px solid #333;\n            font-size: 12px;\n            margin: 0 5px;\n        }\n        .rowBox {\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n        }\n        .writeArea {\n            display: inline-block;\n            width: 150px;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 2px;\n        }\n        .writeAreaCenter {\n            display: inline-block;\n            width: 100px;\n            border-bottom: 1px solid #333333;\n            padding-bottom: 2px;\n            text-align: center;\n        }\n        .writeAreaSort {\n            display: inline-block;\n            width: 35px;\n            border-bottom: 1px solid #333333;\n            //padding-bottom: 2px;\n            text-align: center;\n        }\n        .marginSmall {\n            margin: 0 5px;\n        }\n        .marginNor {\n            margin: 0 10px;\n        }\n        .marginBig {\n            margin: 0 20px;\n        }\n        .marginB {\n            margin-bottom: 10px;\n        }\n        .marginR_B {\n            margin-right: 40px;\n        }\n        .marginR_S {\n            margin-right: 20px;\n        }\n        .subTable {\n\n        }\n        .tableBarHeader {\n            text-align: center;\n            height: 35px;line-height: 35px;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n            border-right: 1px solid #333333;\n            font-size: 15px;\n        }\n        .tableBar {\n            width: 100%;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: left;\n            height: 35px;\n        }\n        .barItem {\n            height: 100%;\n            width: 33.33%;\n            box-sizing: border-box;\n            padding: 10px;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n        }\n        .barItem1 {\n            height: 100%;\n            width: 120%;\n            box-sizing: border-box;\n            padding: 10px;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n        }\n        .barItem2 {\n            height: 100%;\n            width: 30%;\n            box-sizing: border-box;\n            padding: 10px;\n            display: flex;\n            flex-direction: row;\n            align-items: center;\n            justify-content: center;\n            border-top: 1px solid #333333;\n            border-left: 1px solid #333333;\n        }\n\n        .borderR {\n            border-right: 1px solid #333333;\n        }\n        .borderB {\n            border-bottom: 1px solid #333333;\n        }\n    </style>\n</head>\n<body>\n<div class=\"hisSec\">\n    <div class=\"hisSecInner\">\n        <div class=\"topBar\">\n            <div class=\"font_2\">姓名：金长存</div>\n            <div class=\"font_2\">病案号：12345678</div>\n        </div>\n\n        <div class=\"secItem\">\n            <div class=\"font_1\">住院费用（元）：</div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_3\">总费用：<span class=\"writeAreaCenter\">—</span> （自付金额：<span class=\"writeAreaCenter\">—</span>）</div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">1.综合医疗服务类:</div>\n                <div class=\"marginSmall font_3\">（1）一般医疗服务费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_3\">（2）一般治疗操作费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（3）护理费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（4）其他费用：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">2.诊断类:</div>\n                <div class=\"marginSmall font_3\">（5）病理诊断费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（6）实验室诊断费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_3\">（7）影像学诊断费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（8）临床诊断项目费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">3.医疗类:</div>\n                <div class=\"marginSmall font_3\">（9）非手术治疗项目费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（临床物理治疗费：<span class=\"writeAreaCenter\">—</span>）</div>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"marginSmall font_3\">（10）手术治疗费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（麻醉费：<span class=\"writeAreaCenter\">—</span>手术费：<span class=\"writeAreaCenter\">—</span>）</div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">4.康复类:</div>\n                <div class=\"marginSmall font_3\">（11）康复费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">5.中医类:</div>\n                <div class=\"marginSmall font_3\">（12）中医治疗费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">6.西药类:</div>\n                <div class=\"marginSmall font_3\">（13）西药费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（抗菌药物费用：<span class=\"writeAreaCenter\">—</span>）</div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">7.中药类:</div>\n                <div class=\"marginSmall font_3\">（14）中成药费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"marginSmall font_3\">（15）中草药费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">8.血液和血液制品类:</div>\n                <div class=\"font_3\">（16）血费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"font_3\">（17）白蛋白类制品费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"font_3\">（18）球蛋白类制品费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"font_3\">（19）凝血因子类制品费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"font_3\">（20）细胞因子类制品费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">9.耗材类:</div>\n                <div class=\"font_3\">（21）检查用一次性医用材料费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n            <div class=\"rowBox\">\n                <div class=\"font_3\">（22）治疗用一次性医用材料费：<span class=\"writeAreaCenter\">—</span></div>\n                <div class=\"font_3\">（23）手术用用一次性医用材料费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">10.其他类:</div>\n                <div class=\"font_3\">（24）其他费：<span class=\"writeAreaCenter\">—</span></div>\n            </div>\n        </div>\n        <div class=\"secItem1\">\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_1\">说明:</div>\n                <div class=\"font_3 marginNor\">（一）医疗付费方式 </div>\n                <div class=\"font_3 marginNor\">1.城镇职工基本医疗保险 </div>\n                <div class=\"font_3 marginNor\">2.城镇居民基本医疗保险 </div>\n            </div>\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_3 marginNor\">3.新型农村合作医疗 </div>\n                <div class=\"font_3 marginNor\">4.贫困救助 </div>\n                <div class=\"font_3 marginNor\">5.商业医疗保险 </div>\n            </div>\n            <div class=\"rowBox\" style=\"margin-bottom: 10px;\">\n                <div class=\"font_3 marginNor\">6.全公费 </div>\n                <div class=\"font_3 marginNor\">7.全自费 </div>\n                <div class=\"font_3 marginNor\">8.其他社会保险 </div>\n                <div class=\"font_3 marginNor\">9.其他 </div>\n            </div>\n        </div>\n\n        <div class=\"subTable\">\n            <div class=\"tableBarHeader font_1\">其他诊断及手术附加页</div>\n            <div class=\"tableBar\">\n                <div class=\"font_1 barItem1\">出院诊断</div>\n                <div class=\"font_1 barItem2\">疾病编码</div>\n                <div class=\"font_1 barItem2\">入院病情</div>\n                <div class=\"font_1 barItem2 borderR\">转归情况</div>\n            </div>\n            <div class=\"tableBar\">\n                <div class=\"font_3 barItem1\">—</div>\n                <div class=\"font_3 barItem2\">—</div>\n                <div class=\"font_3 barItem2\">—</div>\n                <div class=\"font_3 barItem2 borderR\">—</div>\n            </div>\n            <div class=\"tableBar borderB\">\n                <div class=\"font_3 barItem1\">—</div>\n                <div class=\"font_3 barItem2\">—</div>\n                <div class=\"font_3 barItem2\">—</div>\n                <div class=\"font_3 barItem2 borderR\">—</div>\n            </div>\n        </div>\n        <div class=\"secItem1\" style=\"padding: 0;\">\n            <div class=\"rowBox\" style=\"margin: 10px 0 5px;\">\n                <div class=\"font_2 marginR_S\">入院病情:</div>\n                <div class=\"font_2 marginR_S\">1.有 </div>\n                <div class=\"font_2 marginR_S\">2.临床未确定</div>\n                <div class=\"font_2 marginR_S\">3.情况不明</div>\n                <div class=\"font_2 marginR_B\">4.无 </div>\n            </div>\n            <div class=\"rowBox\" style=\"margin: 10px 0 5px;\">\n                <div class=\"font_2 marginR_S\">转归:</div>\n                <div class=\"font_2 marginR_S\">1.治愈 </div>\n                <div class=\"font_2 marginR_S\">2.好转</div>\n                <div class=\"font_2 marginR_S\">3.未愈</div>\n                <div class=\"font_2 marginR_S\">4.死亡</div>\n                <div class=\"font_2 marginR_S\">5.其他</div>\n            </div>\n        </div>\n\n        <div class=\"tableBox\">\n            <div class=\"tableBoxInner\">\n                <div class=\"tableBoxItemHeader font_4\">\n                    <div class=\"item itemDate\">手术操作日期</div>\n                    <div class=\"item itemSurgeryLevel\">手术级别</div>\n                    <div class=\"item itemSurgeryName\">手术及操作名称</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec\" style=\"width: 100%;border-bottom: 1px solid #333333;\">手术及操作医师</div>\n                        <div class=\"spec\">\n                            <div class=\"specItem\">术者</div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">Ⅰ助</div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">Ⅱ助</div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">切口愈合等级</div>\n                    <div class=\"item itemCutLevel1\">麻醉方式</div>\n                    <div class=\"item itemCutLevel\">麻醉医师</div>\n                    <div class=\"item itemCutLevel2\">麻醉分级</div>\n                    <div class=\"item itemTime borderRight\">手术时长(H)</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">5</div>\n                    <div class=\"item itemSurgeryName\">腰椎间盘切除，椎管减压，植骨融合内固定术</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                牛粪\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                渣渣辉\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                长存\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel1\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel2\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">1</div>\n                    <div class=\"item itemSurgeryName\">PICC管去除</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                牛粪\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                渣渣辉\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                长存\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel1\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel2\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">2023-11-6</div>\n                    <div class=\"item itemSurgeryLevel\">1</div>\n                    <div class=\"item itemSurgeryName\">经外周静脉穿刺中心静脉置管技术</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                王丽丽\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">1/甲</div>\n                    <div class=\"item itemCutLevel1\">静吸复合麻醉</div>\n                    <div class=\"item itemCutLevel\">马本慧</div>\n                    <div class=\"item itemCutLevel2\">2</div>\n                    <div class=\"item itemTime borderRight\">2.35</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n                <div class=\"tableBoxItem font_4 borderBottom\">\n                    <div class=\"item itemDate\">—</div>\n                    <div class=\"item itemSurgeryLevel\">—</div>\n                    <div class=\"item itemSurgeryName\">—</div>\n                    <div class=\"itemSpec\">\n                        <div class=\"spec_\">\n                            <div class=\"specItem\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                            <div class=\"specItem\" style=\"border-left: 1px solid #333333;\">\n                                —\n                            </div>\n                        </div>\n                    </div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel1\">—</div>\n                    <div class=\"item itemCutLevel\">—</div>\n                    <div class=\"item itemCutLevel2\">—</div>\n                    <div class=\"item itemTime borderRight\">—</div>\n                </div>\n            </div>\n        </div>\n    </div>\n</div><script>\n    window.onload = function() {\n      window.print();\n      window.onafterprint = function() {\n        window.close();\n      }\n    }\n  </script>\n</body>\n</html>"
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/testHtmlSec.html b/openhis-ui-vue3/src/views/hospitalRecord/components/testHtmlSec.html
new file mode 100644
index 00000000..557cdb2e
--- /dev/null
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/testHtmlSec.html
@@ -0,0 +1,1004 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        .hisSec {
+            padding: 10px 0;
+            width: 100vw;
+            min-height: 100vh;
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+        }
+        .font_1 {
+            font-size: 14px;
+            font-weight: bold;
+        }
+        .font_2 {
+            font-size: 14px;
+        }
+        .font_3 {
+            font-size: 13px;
+        }
+        .font_4 {
+            font-size: 12px;
+        }
+        .hisSecInner {
+            width: 1000px;
+            height: 100%;
+        }
+        .tableBox {
+            margin: 10px 0;
+        }
+        .tableBoxInner {
+
+        }
+        .borderRight {
+            border-right: 1px solid #333333;
+        }
+        .borderBottom {
+            border-bottom: 1px solid #333333;
+        }
+        .tableBoxItemHeader {
+            font-weight: bold;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            height: 50px;
+
+        }
+        .tableBoxItemHeader .item {
+            white-space: wrap;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            box-sizing: border-box;
+            padding: 10px 2px;
+            height: 100%;
+            text-align: center;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemIndex {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 3.5%;
+        }
+        .tableBoxItemHeader .chooseAllBtn {
+            width: 18px;
+            height: 18px;
+        }
+        .tableBoxItemHeader .itemDate {
+            width: 10%;
+        }
+        .tableBoxItemHeader .itemSurgeryLevel {
+            width: 7%;
+        }
+        .tableBoxItemHeader .itemSurgeryName {
+            width: 23%;
+        }
+        .tableBoxItemHeader .itemCutLevel {
+            width: 9%;
+        }
+        .tableBoxItemHeader .itemCutLevel1 {
+            width: 12%;
+        }
+        .tableBoxItemHeader .itemCutLevel2 {
+            width: 7%;
+        }
+        .tableBoxItemHeader .itemTime {
+            width: 9%;
+        }
+        .tableBoxItemHeader .itemSpec {
+            width: 20%;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            height: 50px;
+        }
+        .tableBoxItemHeader .itemSpec .spec {
+            width: 100%;
+            text-align: center;
+            height: 50%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemSpec .spec .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 25px;
+        }
+        .tableBoxItemHeader .itemSpec .spec_ {
+            width: 100%;
+            text-align: center;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+
+        }
+        .tableBoxItemHeader .itemSpec .spec_ .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemCheckBox {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+        }
+        .tableBoxItemHeader .itemCheckBoxAct {
+            line-height: 16px;
+            text-align: center;
+            font-size: 12px;
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+            background: #333333;
+            color: #fff;
+        }
+        .tableBoxItemHeader .itemCheckBox:hover {
+            border: 1px solid #333333;
+        }
+        .tableBoxItem {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            height: 55px;
+        }
+        .tableBoxItem .item {
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            //line-height: 40px;
+            box-sizing: border-box;
+            padding: 10px 2px;
+            height: 100%;
+            text-align: center;
+        }
+        .tableBoxItem .itemIndex {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 3.5%;
+        }
+        .tableBoxItem .itemDate {
+            width: 10%;
+        }
+        .tableBoxItem .itemSurgeryLevel {
+            width: 7%;
+        }
+        .tableBoxItem .itemSurgeryName {
+            width: 23%;
+        }
+        .tableBoxItem .itemCutLevel {
+            width: 9%;
+        }
+        .tableBoxItem .itemCutLevel1 {
+            width: 12%;
+        }
+        .tableBoxItem .itemCutLevel2 {
+            width: 7%;
+        }
+        .tableBoxItem .itemTime {
+            width: 9%;
+        }
+        .tableBoxItem .itemSpec {
+            width: 20%;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            height: 55px;
+        }
+        .tableBoxItem .itemSpec .spec {
+            width: 100%;
+            text-align: center;
+            height: 50%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemSpec .spec .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 25px;
+        }
+        .tableBoxItem .itemSpec .spec_ {
+            width: 100%;
+            text-align: center;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemSpec .spec_ .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemCheckBox {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+        }
+        .tableBoxItem .itemCheckBoxAct {
+            line-height: 16px;
+            text-align: center;
+            font-size: 12px;
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+            background: #409eff;
+            color: #fff;
+        }
+        .tableBoxItem .itemCheckBox:hover {
+            border: 1px solid #409eff;
+        }
+
+
+
+        .topBar {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+        }
+        .secItem {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            //align-items: center;
+            justify-content: left;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .secItem1 {
+            width: 100%;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .chooseBox {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 15px;
+            height: 15px;
+            border: 1px solid #333;
+            font-size: 12px;
+            margin: 0 5px;
+        }
+        .rowBox {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+        }
+        .writeArea {
+            display: inline-block;
+            width: 150px;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 2px;
+        }
+        .writeAreaCenter {
+            display: inline-block;
+            width: 150px;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 2px;
+            text-align: center;
+        }
+        .writeAreaSort {
+            display: inline-block;
+            width: 35px;
+            border-bottom: 1px solid #333333;
+            //padding-bottom: 2px;
+            text-align: center;
+        }
+        .marginSmall {
+            margin: 0 5px;
+        }
+        .marginNor {
+            margin: 0 10px;
+        }
+        .marginBig {
+            margin: 0 20px;
+        }
+        .marginB {
+            margin-bottom: 10px;
+        }
+        .marginR_B {
+            margin-right: 40px;
+        }
+        .subTable {
+
+        }
+        .tableBar {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: left;
+            height: 35px;
+        }
+        .barItem {
+            height: 100%;
+            width: 33.33%;
+            box-sizing: border-box;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+        }
+        .borderR {
+            border-right: 1px solid #333333;
+        }
+        .borderB {
+            border-bottom: 1px solid #333333;
+        }
+    </style>
+</head>
+<body>
+<div class="hisSec">
+    <div class="hisSecInner">
+        <div class="topBar">
+            <div class="font_2">姓名：金长存</div>
+            <div class="font_2">病案号：12345678</div>
+        </div>
+
+<!--        <div class="tableBox">
+            <div class="tableBoxInner">
+                <div class="tableBoxItemHeader font_1">
+                    <div class="item itemDate">手术操作日期</div>
+                    <div class="item itemSurgeryLevel">手术级别</div>
+                    <div class="item itemSurgeryName">手术及操作名称</div>
+                    <div class="itemSpec">
+                        <div class="spec" style="width: 100%;border-bottom: 1px solid #333333;">手术及操作医师</div>
+                        <div class="spec">
+                            <div class="specItem">术者</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅰ助</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅱ助</div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">切口愈合等级</div>
+                    <div class="item itemCutLevel">麻醉方式</div>
+                    <div class="item itemCutLevel">麻醉医师</div>
+                    <div class="item itemCutLevel">麻醉分级</div>
+                    <div class="item itemTime borderRight">手术时长(H)</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">5</div>
+                    <div class="item itemSurgeryName">腰椎间盘切除，椎管减压，植骨融合内固定术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">PICC管去除</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">经外周静脉穿刺中心静脉置管技术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                王丽丽
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_2 borderBottom">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+            </div>
+        </div>-->
+        <div class="tableBox">
+            <div class="tableBoxInner">
+                <div class="tableBoxItemHeader font_4">
+                    <div class="item itemDate">手术操作日期</div>
+                    <div class="item itemSurgeryLevel">手术级别</div>
+                    <div class="item itemSurgeryName">手术及操作名称</div>
+                    <div class="itemSpec">
+                        <div class="spec" style="width: 100%;border-bottom: 1px solid #333333;">手术及操作医师</div>
+                        <div class="spec">
+                            <div class="specItem">术者</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅰ助</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅱ助</div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">切口愈合等级</div>
+                    <div class="item itemCutLevel1">麻醉方式</div>
+                    <div class="item itemCutLevel">麻醉医师</div>
+                    <div class="item itemCutLevel2">麻醉分级</div>
+                    <div class="item itemTime borderRight">手术时长(H)</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">5</div>
+                    <div class="item itemSurgeryName">腰椎间盘切除，椎管减压，植骨融合内固定术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">PICC管去除</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">经外周静脉穿刺中心静脉置管技术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                王丽丽
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4 borderBottom">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">手术方式</div>
+            <div class="chooseBox font_2">1</div>
+            <div class="rowBox">
+                <div style="margin: 0 5px;" class="font_2">1.择期手术</div>
+                <div style="margin: 0 5px;" class="font_2">2.限期手术</div>
+                <div style="margin: 0 5px;" class="font_2">3.急诊手术</div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">离院方式</div>
+            <div class="chooseBox font_2">1</div>
+            <div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">1.医嘱离院</div>
+                    <div class="marginSmall font_2">2.医嘱转院，拟接受医疗结构名称 <span class="writeArea">—</span> </div>
+                </div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">3.医嘱转让社区卫生服务机构、乡镇卫生院，拟接受医疗结构名称<span class="writeAreaCenter">—</span></div>
+                </div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">4.非医嘱离院</div>
+                    <div class="marginSmall font_2">5.死亡</div>
+                    <div class="marginSmall font_2">6.其他</div>
+                </div>
+            </div>
+
+        </div>
+        <div class="secItem">
+            <div class="font_1">是否有出院31天内再住院计划</div>
+            <div class="chooseBox font_2">1</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">1.无</div>
+                <div class="marginSmall font_2">2.有</div>
+                <div style="margin: 0 5px 0 15px;" class="font_2">目的：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">颅脑损伤患者昏迷时间：</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">入院前：<span class="writeAreaSort">—</span> 天 <span class="writeAreaSort">—</span>小时<span class="writeAreaSort">—</span>分钟</div>
+                <div style="margin: 0 5px 0 60px" class="font_2">入院后：<span class="writeAreaSort">—</span> 天 <span class="writeAreaSort">—</span>小时<span class="writeAreaSort">—</span>分钟</div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">肿瘤分期:</div>
+                <div class="marginSmall font_2">C</div><div class="chooseBox font_2"></div>
+                <div class="marginSmall font_2">P</div><div class="chooseBox font_2"></div>
+
+                <div class="marginSmall font_2">T</div><span class="writeAreaSort">—</span>
+                <div class="marginSmall font_2">N</div><span class="writeAreaSort">—</span>
+                <div class="marginSmall font_2">M</div><span class="writeAreaSort marginR_B">—</span>
+                <div class="marginSmall font_2">判断依据：</div><span class="writeAreaCenter">—</span>
+            </div>
+            <div class="rowBox">
+                <div class="chooseBox font_2">-</div>
+                <div class="marginSmall font_3">0. 0期</div>
+                <div class="marginSmall font_3">1. 1期</div>
+                <div class="marginSmall font_3">2. 2期</div>
+                <div class="marginSmall font_3">3. 3期</div>
+                <div class="marginSmall font_3">4. 4期</div>
+                <div class="marginSmall font_3 marginR_B">9. 不详</div>
+                <div class="marginSmall font_3">分化程度：<span class="writeAreaCenter">—</span></div>
+
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">临床路径：进入路径</div>
+            <div class="chooseBox font_2">1</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">1.是</div>
+                <div class="marginSmall font_2">2.否</div>
+                <div style="margin: 0 5px 0 15px;" class="font_1">变异：</div>
+                <div class="chooseBox font_2">1</div>
+                <div class="marginSmall font_2">1.有</div>
+                <div class="marginSmall font_2">2.无</div>
+                <div style="margin: 0 5px 0 15px;" class="font_1">退出路径：</div>
+                <div class="chooseBox font_2">1</div>
+                <div class="marginSmall font_2">1.是</div>
+                <div class="marginSmall font_2">2.否</div>
+            </div>
+        </div>
+
+        <div class="secItem">
+            <div class="font_1">护理级别</div>
+            <div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">
+                        <div class="rowBox">
+                            <div class="marginSmall font_2 marginR_B">
+                                特级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                            <div class="marginSmall font_2 marginR_B">
+                                一级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="marginB rowBox">
+                    <div class="marginSmall font_2">
+                        <div class="rowBox">
+                            <div class="marginSmall font_2 marginR_B">
+                                二级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                            <div class="marginSmall font_2 marginR_B">
+                                三级护理：<span class="writeAreaSort">—</span> 小时
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="secItem">
+            <div class="font_1">呼吸机使用：</div>
+            <div class="chooseBox font_2">0</div>
+            <div class="rowBox">
+                <div class="marginSmall font_2">0.未使用</div>
+                <div class="marginSmall font_2">1.无创</div>
+                <div class="marginSmall font_2">2.有创</div>
+                <div class="marginSmall font_2 marginR_B">3.无创+有创</div>
+                <div class="marginSmall font_1 ">
+                    有创呼吸机使用时间（术中除外）：<span class="writeAreaSort">—</span> 小时
+                </div>
+            </div>
+        </div>
+
+        <div class="subTable">
+            <div class="tableBar">
+                <div class="font_1 barItem">重症监护室名称</div>
+                <div class="font_1 barItem">进重症监护室时间（年月日时分）</div>
+                <div class="font_1 barItem borderR">出重症监护室时间（年月日时分）</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+            <div class="tableBar borderB">
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem">—</div>
+                <div class="font_3 barItem borderR">—</div>
+            </div>
+        </div>
+
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/hospitalRecord/components/testHtmlThr.html b/openhis-ui-vue3/src/views/hospitalRecord/components/testHtmlThr.html
new file mode 100644
index 00000000..591899f4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/hospitalRecord/components/testHtmlThr.html
@@ -0,0 +1,804 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        .hisSec {
+            padding: 10px 0;
+            width: 100vw;
+            min-height: 100vh;
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+        }
+        .font_1 {
+            font-size: 14px;
+            font-weight: bold;
+        }
+        .font_2 {
+            font-size: 14px;
+        }
+        .font_3 {
+            font-size: 13px;
+        }
+        .font_4 {
+            font-size: 12px;
+        }
+
+        .hisSecInner {
+            width: 1000px;
+            height: 100%;
+        }
+        .tableBox {
+            margin: 10px 0;
+        }
+        .tableBoxInner {
+
+        }
+        .borderRight {
+            border-right: 1px solid #333333;
+        }
+        .borderBottom {
+            border-bottom: 1px solid #333333;
+        }
+        .tableBoxItemHeader {
+            font-weight: bold;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            height: 50px;
+
+        }
+        .tableBoxItemHeader .item {
+            white-space: wrap;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            box-sizing: border-box;
+            padding: 10px 2px;
+            height: 100%;
+            text-align: center;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemIndex {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 3.5%;
+        }
+        .tableBoxItemHeader .chooseAllBtn {
+            width: 18px;
+            height: 18px;
+        }
+        .tableBoxItemHeader .itemDate {
+            width: 10%;
+        }
+        .tableBoxItemHeader .itemSurgeryLevel {
+            width: 7%;
+        }
+        .tableBoxItemHeader .itemSurgeryName {
+            width: 23%;
+        }
+        .tableBoxItemHeader .itemCutLevel {
+            width: 9%;
+        }
+        .tableBoxItemHeader .itemCutLevel1 {
+            width: 12%;
+        }
+        .tableBoxItemHeader .itemCutLevel2 {
+            width: 7%;
+        }
+        .tableBoxItemHeader .itemTime {
+            width: 9%;
+        }
+        .tableBoxItemHeader .itemSpec {
+            width: 20%;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            height: 50px;
+        }
+        .tableBoxItemHeader .itemSpec .spec {
+            width: 100%;
+            text-align: center;
+            height: 50%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemSpec .spec .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 25px;
+        }
+        .tableBoxItemHeader .itemSpec .spec_ {
+            width: 100%;
+            text-align: center;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+
+        }
+        .tableBoxItemHeader .itemSpec .spec_ .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItemHeader .itemCheckBox {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+        }
+        .tableBoxItemHeader .itemCheckBoxAct {
+            line-height: 16px;
+            text-align: center;
+            font-size: 12px;
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+            background: #333333;
+            color: #fff;
+        }
+        .tableBoxItemHeader .itemCheckBox:hover {
+            border: 1px solid #333333;
+        }
+        .tableBoxItem {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            height: 55px;
+        }
+        .tableBoxItem .item {
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            //line-height: 40px;
+            box-sizing: border-box;
+            padding: 10px 2px;
+            height: 100%;
+            text-align: center;
+        }
+        .tableBoxItem .itemIndex {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 3.5%;
+        }
+        .tableBoxItem .itemDate {
+            width: 10%;
+        }
+        .tableBoxItem .itemSurgeryLevel {
+            width: 7%;
+        }
+        .tableBoxItem .itemSurgeryName {
+            width: 23%;
+        }
+        .tableBoxItem .itemCutLevel {
+            width: 9%;
+        }
+        .tableBoxItem .itemCutLevel1 {
+            width: 12%;
+        }
+        .tableBoxItem .itemCutLevel2 {
+            width: 7%;
+        }
+        .tableBoxItem .itemTime {
+            width: 9%;
+        }
+        .tableBoxItem .itemSpec {
+            width: 20%;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            height: 55px;
+        }
+        .tableBoxItem .itemSpec .spec {
+            width: 100%;
+            text-align: center;
+            height: 50%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemSpec .spec .specItem {
+            width: 33.33%;
+            height: 100%;
+            line-height: 25px;
+        }
+        .tableBoxItem .itemSpec .spec_ {
+            width: 100%;
+            text-align: center;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemSpec .spec_ .specItem {
+            width: 33.33%;
+            height: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+        }
+        .tableBoxItem .itemCheckBox {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+        }
+        .tableBoxItem .itemCheckBoxAct {
+            line-height: 16px;
+            text-align: center;
+            font-size: 12px;
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+            border: 1px solid #ccc;
+            border-radius: 2px;
+            background: #409eff;
+            color: #fff;
+        }
+        .tableBoxItem .itemCheckBox:hover {
+            border: 1px solid #409eff;
+        }
+
+
+
+        .topBar {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .secItem {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            //align-items: center;
+            justify-content: left;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .secItem1 {
+            width: 100%;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 5px;
+            margin-bottom: 10px;
+        }
+        .chooseBox {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            width: 15px;
+            height: 15px;
+            border: 1px solid #333;
+            font-size: 12px;
+            margin: 0 5px;
+        }
+        .rowBox {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+        }
+        .writeArea {
+            display: inline-block;
+            width: 150px;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 2px;
+        }
+        .writeAreaCenter {
+            display: inline-block;
+            width: 100px;
+            border-bottom: 1px solid #333333;
+            padding-bottom: 2px;
+            text-align: center;
+        }
+        .writeAreaSort {
+            display: inline-block;
+            width: 35px;
+            border-bottom: 1px solid #333333;
+            //padding-bottom: 2px;
+            text-align: center;
+        }
+        .marginSmall {
+            margin: 0 5px;
+        }
+        .marginNor {
+            margin: 0 10px;
+        }
+        .marginBig {
+            margin: 0 20px;
+        }
+        .marginB {
+            margin-bottom: 10px;
+        }
+        .marginR_B {
+            margin-right: 40px;
+        }
+        .marginR_S {
+            margin-right: 20px;
+        }
+        .subTable {
+
+        }
+        .tableBarHeader {
+            text-align: center;
+            height: 35px;line-height: 35px;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+            border-right: 1px solid #333333;
+            font-size: 15px;
+        }
+        .tableBar {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: left;
+            height: 35px;
+        }
+        .barItem {
+            height: 100%;
+            width: 33.33%;
+            box-sizing: border-box;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+        }
+        .barItem1 {
+            height: 100%;
+            width: 120%;
+            box-sizing: border-box;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+        }
+        .barItem2 {
+            height: 100%;
+            width: 30%;
+            box-sizing: border-box;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            border-top: 1px solid #333333;
+            border-left: 1px solid #333333;
+        }
+
+        .borderR {
+            border-right: 1px solid #333333;
+        }
+        .borderB {
+            border-bottom: 1px solid #333333;
+        }
+    </style>
+</head>
+<body>
+<div class="hisSec">
+    <div class="hisSecInner">
+        <div class="topBar">
+            <div class="font_2">姓名：金长存</div>
+            <div class="font_2">病案号：12345678</div>
+        </div>
+
+        <div class="secItem">
+            <div class="font_1">住院费用（元）：</div>
+            <div class="rowBox">
+                <div class="marginSmall font_3">总费用：<span class="writeAreaCenter">—</span> （自付金额：<span class="writeAreaCenter">—</span>）</div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">1.综合医疗服务类:</div>
+                <div class="marginSmall font_3">（1）一般医疗服务费：<span class="writeAreaCenter">—</span></div>
+            </div>
+            <div class="rowBox">
+                <div class="marginSmall font_3">（2）一般治疗操作费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（3）护理费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（4）其他费用：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">2.诊断类:</div>
+                <div class="marginSmall font_3">（5）病理诊断费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（6）实验室诊断费：<span class="writeAreaCenter">—</span></div>
+            </div>
+            <div class="rowBox">
+                <div class="marginSmall font_3">（7）影像学诊断费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（8）临床诊断项目费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">3.医疗类:</div>
+                <div class="marginSmall font_3">（9）非手术治疗项目费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（临床物理治疗费：<span class="writeAreaCenter">—</span>）</div>
+            </div>
+            <div class="rowBox">
+                <div class="marginSmall font_3">（10）手术治疗费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（麻醉费：<span class="writeAreaCenter">—</span>手术费：<span class="writeAreaCenter">—</span>）</div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">4.康复类:</div>
+                <div class="marginSmall font_3">（11）康复费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">5.中医类:</div>
+                <div class="marginSmall font_3">（12）中医治疗费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">6.西药类:</div>
+                <div class="marginSmall font_3">（13）西药费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（抗菌药物费用：<span class="writeAreaCenter">—</span>）</div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">7.中药类:</div>
+                <div class="marginSmall font_3">（14）中成药费：<span class="writeAreaCenter">—</span></div>
+                <div class="marginSmall font_3">（15）中草药费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">8.血液和血液制品类:</div>
+                <div class="font_3">（16）血费：<span class="writeAreaCenter">—</span></div>
+                <div class="font_3">（17）白蛋白类制品费：<span class="writeAreaCenter">—</span></div>
+            </div>
+            <div class="rowBox">
+                <div class="font_3">（18）球蛋白类制品费：<span class="writeAreaCenter">—</span></div>
+                <div class="font_3">（19）凝血因子类制品费：<span class="writeAreaCenter">—</span></div>
+            </div>
+            <div class="rowBox">
+                <div class="font_3">（20）细胞因子类制品费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">9.耗材类:</div>
+                <div class="font_3">（21）检查用一次性医用材料费：<span class="writeAreaCenter">—</span></div>
+            </div>
+            <div class="rowBox">
+                <div class="font_3">（22）治疗用一次性医用材料费：<span class="writeAreaCenter">—</span></div>
+                <div class="font_3">（23）手术用用一次性医用材料费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">10.其他类:</div>
+                <div class="font_3">（24）其他费：<span class="writeAreaCenter">—</span></div>
+            </div>
+        </div>
+        <div class="secItem1">
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_1">说明:</div>
+                <div class="font_3 marginNor">（一）医疗付费方式 </div>
+                <div class="font_3 marginNor">1.城镇职工基本医疗保险 </div>
+                <div class="font_3 marginNor">2.城镇居民基本医疗保险 </div>
+            </div>
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_3 marginNor">3.新型农村合作医疗 </div>
+                <div class="font_3 marginNor">4.贫困救助 </div>
+                <div class="font_3 marginNor">5.商业医疗保险 </div>
+            </div>
+            <div class="rowBox" style="margin-bottom: 10px;">
+                <div class="font_3 marginNor">6.全公费 </div>
+                <div class="font_3 marginNor">7.全自费 </div>
+                <div class="font_3 marginNor">8.其他社会保险 </div>
+                <div class="font_3 marginNor">9.其他 </div>
+            </div>
+        </div>
+
+        <div class="subTable">
+            <div class="tableBarHeader font_1">其他诊断及手术附加页</div>
+            <div class="tableBar">
+                <div class="font_1 barItem1">出院诊断</div>
+                <div class="font_1 barItem2">疾病编码</div>
+                <div class="font_1 barItem2">入院病情</div>
+                <div class="font_1 barItem2 borderR">转归情况</div>
+            </div>
+            <div class="tableBar">
+                <div class="font_3 barItem1">—</div>
+                <div class="font_3 barItem2">—</div>
+                <div class="font_3 barItem2">—</div>
+                <div class="font_3 barItem2 borderR">—</div>
+            </div>
+            <div class="tableBar borderB">
+                <div class="font_3 barItem1">—</div>
+                <div class="font_3 barItem2">—</div>
+                <div class="font_3 barItem2">—</div>
+                <div class="font_3 barItem2 borderR">—</div>
+            </div>
+        </div>
+        <div class="secItem1" style="padding: 0;">
+            <div class="rowBox" style="margin: 10px 0 5px;">
+                <div class="font_2 marginR_S">入院病情:</div>
+                <div class="font_2 marginR_S">1.有 </div>
+                <div class="font_2 marginR_S">2.临床未确定</div>
+                <div class="font_2 marginR_S">3.情况不明</div>
+                <div class="font_2 marginR_B">4.无 </div>
+            </div>
+            <div class="rowBox" style="margin: 10px 0 5px;">
+                <div class="font_2 marginR_S">转归:</div>
+                <div class="font_2 marginR_S">1.治愈 </div>
+                <div class="font_2 marginR_S">2.好转</div>
+                <div class="font_2 marginR_S">3.未愈</div>
+                <div class="font_2 marginR_S">4.死亡</div>
+                <div class="font_2 marginR_S">5.其他</div>
+            </div>
+        </div>
+
+        <div class="tableBox">
+            <div class="tableBoxInner">
+                <div class="tableBoxItemHeader font_4">
+                    <div class="item itemDate">手术操作日期</div>
+                    <div class="item itemSurgeryLevel">手术级别</div>
+                    <div class="item itemSurgeryName">手术及操作名称</div>
+                    <div class="itemSpec">
+                        <div class="spec" style="width: 100%;border-bottom: 1px solid #333333;">手术及操作医师</div>
+                        <div class="spec">
+                            <div class="specItem">术者</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅰ助</div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">Ⅱ助</div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">切口愈合等级</div>
+                    <div class="item itemCutLevel1">麻醉方式</div>
+                    <div class="item itemCutLevel">麻醉医师</div>
+                    <div class="item itemCutLevel2">麻醉分级</div>
+                    <div class="item itemTime borderRight">手术时长(H)</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">5</div>
+                    <div class="item itemSurgeryName">腰椎间盘切除，椎管减压，植骨融合内固定术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">PICC管去除</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                牛粪
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                渣渣辉
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                长存
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">2023-11-6</div>
+                    <div class="item itemSurgeryLevel">1</div>
+                    <div class="item itemSurgeryName">经外周静脉穿刺中心静脉置管技术</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                王丽丽
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">1/甲</div>
+                    <div class="item itemCutLevel1">静吸复合麻醉</div>
+                    <div class="item itemCutLevel">马本慧</div>
+                    <div class="item itemCutLevel2">2</div>
+                    <div class="item itemTime borderRight">2.35</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+                <div class="tableBoxItem font_4 borderBottom">
+                    <div class="item itemDate">—</div>
+                    <div class="item itemSurgeryLevel">—</div>
+                    <div class="item itemSurgeryName">—</div>
+                    <div class="itemSpec">
+                        <div class="spec_">
+                            <div class="specItem">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                            <div class="specItem" style="border-left: 1px solid #333333;">
+                                —
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel1">—</div>
+                    <div class="item itemCutLevel">—</div>
+                    <div class="item itemCutLevel2">—</div>
+                    <div class="item itemTime borderRight">—</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
index 49e659a7..e348e63a 100644
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/feeTypeConversion/components/TopForm.vue
@@ -25,7 +25,6 @@
 
 <script setup >
 import { ref, inject } from 'vue';
-import { FormInstance } from 'element-plus';
 
 // const form = inject('formState') as any;
 // const formRef = ref<FormInstance>();
@@ -49,7 +48,6 @@ const handleUpload = () => {
   border-radius: 4px;
   padding-left: 16px;
 
-
   :deep(.el-form) {
     display: flex;
     align-items: center;
@@ -83,9 +81,6 @@ const handleUpload = () => {
 
   .operate-btns {
     .main-btn {
-      // margin-left: 16px;
-      // width: 100px;
-
       &:first-child {
         margin-left: 0;
       }
diff --git a/openhis-ui-vue3/src/views/index.vue b/openhis-ui-vue3/src/views/index.vue
index ad433ccf..5896539f 100644
--- a/openhis-ui-vue3/src/views/index.vue
+++ b/openhis-ui-vue3/src/views/index.vue
@@ -462,7 +462,7 @@ onMounted(() => {
   
   .el-button{
     border: 1px #166773 solid;
-    span{
+    span {
       color: red;
       margin-left: 5px;
     }
@@ -471,7 +471,7 @@ onMounted(() => {
   .el-button:hover{
     border: 1px #166773 solid;
     color: #166773;
-    span{
+    span {
       color: red;
       margin-left: 5px;
     }
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
index 24449bdc..1d682d52 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
@@ -1,8 +1,4 @@
-/*
- * @Author: sjjh
- * @Date: 2025-09-07 12:09:26
- * @Description: 
- */
+
 import request from '@/utils/request'
 // 申请单相关接口
 
@@ -48,6 +44,46 @@ export function getSurgery(queryParams) {
 }
 
 
-
+/**
+ * 查询护理医嘱信息
+ */
+export function getNursingOrdersInfos() {
+  return request({
+    url: '/reg-doctorstation/special-advice/nursing-orders',
+    method: 'get'
+  })
+}
+
+/**
+ * 保存护理医嘱信息
+ * @param {Object} data - 护理医嘱数据
+ * @param {number} data.encounterId - 就诊id
+ * @param {number} data.patientId - 患者id
+ * @param {number} data.conditionId - 诊断ID
+ * @param {number} data.encounterDiagnosisId - 就诊诊断id
+ * @param {string} data.startTime - 医嘱开始时间 (yyyy-MM-dd HH:mm:ss)
+ * @param {Array} data.nursingOrdersSaveDetailDtoList - 护理医嘱详情保存集合
+ * @param {number} data.nursingOrdersSaveDetailDtoList[].definitionId - 护理项目定义ID
+ * @param {number} data.nursingOrdersSaveDetailDtoList[].categoryEnum - 护理项目类别编码：
+ *   26(护理级别)、38(病情)、39(护理常规)、27(膳食)、40(体位)、41(陪护)、42(隔离等级)
+ */
+export function saveNursingOrders(data) {
+  return request({
+    url: '/reg-doctorstation/special-advice/nursing-orders',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取患者护理状态信息（用于回显）
+ */
+export function getEncounterNursingOrders(params) {
+  return request({
+    url: '/reg-doctorstation/special-advice/encounter-nursing-orders',
+    method: 'get',
+    params: params
+  })
+}
 
 
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/nursingStatus.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/nursingStatus.vue
new file mode 100644
index 00000000..da0dc2e0
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/nursingStatus.vue
@@ -0,0 +1,1063 @@
+<template>
+  <div class="nursing-status-container">
+    <div class="nursing-status-header">
+      <h3>护理状态</h3>
+    </div>
+
+    <div v-if="loading" class="loading-container">
+      <el-row justify="center">
+        <el-col :span="6">
+          <el-empty description="正在加载数据..." image-size="100" />
+        </el-col>
+      </el-row>
+    </div>
+
+    <template v-else>
+      <!-- 护理状态表格 -->
+      <el-table
+        :data="nursingItems"
+        border
+        style="width: 100%"
+        class="nursing-table"
+        :header-cell-style="{ backgroundColor: '#f5f7fa' }"
+      >
+        <el-table-column prop="item" label="项目" width="180" align="center" />
+        <el-table-column prop="currentStatus" label="当前状态" width="260" align="center">
+          <template #default="scope">
+            <el-tag :type="getStatusType(scope.row.currentStatus)" size="small" class="status-tag">
+              {{ scope.row.currentStatus }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="operation" label="操作" align="center">
+          <template #default="scope">
+            <div class="operation-content">
+              <!-- 护理级别选项 - 水平排列 -->
+              <div v-if="scope.row.item === '护理级别'" class="options-horizontal">
+                <div
+                  v-for="option in nursingLevelList"
+                  :key="option.definitionId"
+                  :class="[
+                    'option-item',
+                    { selected: option.nursingOrderName === currentNursingLevel },
+                  ]"
+                  @click="selectNursingLevel(option.nursingOrderName)"
+                >
+                  {{ option.nursingOrderName }}
+                </div>
+              </div>
+
+              <!-- 病情选项 - 水平排列 -->
+              <div v-else-if="scope.row.item === '病情'" class="options-horizontal">
+                <div
+                  v-for="option in conditionList"
+                  :key="option.definitionId"
+                  :class="[
+                    'option-item',
+                    { selected: option.nursingOrderName === currentCondition },
+                  ]"
+                  @click="selectCondition(option.nursingOrderName)"
+                >
+                  {{ option.nursingOrderName }}
+                </div>
+              </div>
+
+              <!-- 护理常规选项 - 水平排列 -->
+              <div v-else-if="scope.row.item === '护理常规'" class="options-horizontal">
+                <div
+                  v-for="option in nursingRoutineList"
+                  :key="option.definitionId"
+                  :class="[
+                    'option-item',
+                    { selected: option.nursingOrderName === currentNursingRoutine },
+                  ]"
+                  @click="selectNursingRoutine(option.nursingOrderName)"
+                >
+                  {{ getShortName(option.nursingOrderName, 10) }}
+                </div>
+              </div>
+
+              <!-- 饮食选项 - 水平排列 -->
+              <div v-else-if="scope.row.item === '饮食'" class="options-horizontal">
+                <div
+                  v-for="option in dietList"
+                  :key="option.definitionId"
+                  :class="['option-item', { selected: option.nursingOrderName === currentDiet }]"
+                  @click="selectDiet(option.nursingOrderName)"
+                >
+                  {{ option.nursingOrderName }}
+                </div>
+              </div>
+
+              <!-- 体位选项 - 水平排列 -->
+              <div v-else-if="scope.row.item === '体位'" class="options-horizontal">
+                <div
+                  v-for="option in positionList"
+                  :key="option.definitionId"
+                  :class="[
+                    'option-item',
+                    { selected: option.nursingOrderName === currentPosition },
+                  ]"
+                  @click="selectPosition(option.nursingOrderName)"
+                >
+                  {{ option.nursingOrderName }}
+                </div>
+              </div>
+
+              <!-- 陪护选项 - 水平排列 -->
+              <div v-else-if="scope.row.item === '陪护'" class="options-horizontal">
+                <div
+                  v-for="option in companionCareList"
+                  :key="option.definitionId"
+                  :class="[
+                    'option-item',
+                    { selected: option.nursingOrderName === currentCompanionCare },
+                  ]"
+                  @click="selectCompanionCare(option.nursingOrderName)"
+                >
+                  {{ option.nursingOrderName }}
+                </div>
+              </div>
+
+              <!-- 隔离等级选项 - 水平排列 -->
+              <div v-else-if="scope.row.item === '隔离等级'" class="options-horizontal">
+                <div
+                  v-for="option in isolationLevelList"
+                  :key="option.definitionId"
+                  :class="[
+                    'option-item',
+                    { selected: option.nursingOrderName === currentIsolationLevel },
+                  ]"
+                  @click="selectIsolationLevel(option.nursingOrderName)"
+                >
+                  {{ option.nursingOrderName }}
+                </div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 操作按钮区域 -->
+      <div class="nursing-status-actions">
+        <el-button @click="handleCancel" size="small">取消</el-button>
+        <el-button type="primary" @click="handleConfirm" size="small">确定</el-button>
+      </div>
+    </template>
+  </div>
+</template>
+<script setup>
+import { getCurrentInstance, onMounted, ref, reactive, watch } from 'vue';
+import { getNursingOrdersInfos, saveNursingOrders, getEncounterNursingOrders } from './api';
+import { patientInfo } from '../../store/patient.js';
+// 导入获取诊断信息的API
+import { getEncounterDiagnosis } from '@/views/doctorstation/components/api';
+
+const { proxy } = getCurrentInstance();
+const loading = ref(false);
+
+// 护理状态数据列表
+const nursingLevelList = ref([]);
+const conditionList = ref([]);
+const dietList = ref([]);
+const positionList = ref([]);
+const companionCareList = ref([]);
+const isolationLevelList = ref([]);
+const nursingRoutineList = ref([]);
+const nursingStatusList = ref([]);
+
+// 当前选中的值 - 使用null表示未选择
+const currentNursingLevel = ref(null);
+const currentCondition = ref(null);
+const currentDiet = ref(null);
+const currentPosition = ref(null);
+const currentNursingRoutine = ref(null);
+const currentCompanionCare = ref(null);
+const currentIsolationLevel = ref(null);
+
+// 跟踪明确取消选择的项目，用于处理保存后的数据加载
+const lastModifiedItems = reactive({
+  nursingLevel: false,
+  condition: false,
+  nursingRoutine: false,
+  diet: false,
+  position: false,
+  companionCare: false,
+  isolationLevel: false,
+});
+
+// 护理项目列表
+const nursingItems = reactive([
+  {
+    item: '护理级别',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+  {
+    item: '病情',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+  {
+    item: '护理常规',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+  {
+    item: '饮食',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+  {
+    item: '体位',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+  {
+    item: '陪护',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+  {
+    item: '隔离等级',
+    currentStatus: '',
+    changing: '',
+    operation: '',
+  },
+]);
+
+// 获取标签类型
+const getStatusType = (status) => {
+  if (status === '无') return 'default';
+  return 'primary'; // 改为蓝色
+};
+
+// 获取短名称（用于显示）
+const getShortName = (fullName, maxLength) => {
+  if (fullName.length <= maxLength) return fullName;
+  return fullName.substring(0, maxLength) + '...';
+};
+
+// 护理级别选择处理
+const selectNursingLevel = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentNursingLevel.value === value) {
+    currentNursingLevel.value = null;
+    lastModifiedItems.nursingLevel = true; // 标记为已明确取消选择
+  } else {
+    currentNursingLevel.value = value;
+    lastModifiedItems.nursingLevel = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const nursingLevelItem = nursingItems.find((item) => item.item === '护理级别');
+  if (nursingLevelItem) {
+    nursingLevelItem.currentStatus = currentNursingLevel.value || '';
+  }
+};
+
+// 病情选择处理
+const selectCondition = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentCondition.value === value) {
+    currentCondition.value = null;
+    lastModifiedItems.condition = true; // 标记为已明确取消选择
+  } else {
+    currentCondition.value = value;
+    lastModifiedItems.condition = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const conditionItem = nursingItems.find((item) => item.item === '病情');
+  if (conditionItem) {
+    conditionItem.currentStatus = currentCondition.value || '';
+  }
+};
+
+// 护理常规选择处理
+const selectNursingRoutine = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentNursingRoutine.value === value) {
+    currentNursingRoutine.value = null;
+    lastModifiedItems.nursingRoutine = true; // 标记为已明确取消选择
+  } else {
+    currentNursingRoutine.value = value;
+    lastModifiedItems.nursingRoutine = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const nursingRoutineItem = nursingItems.find((item) => item.item === '护理常规');
+  if (nursingRoutineItem) {
+    nursingRoutineItem.currentStatus = currentNursingRoutine.value || '';
+  }
+};
+
+// 饮食选择处理
+const selectDiet = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentDiet.value === value) {
+    currentDiet.value = null;
+    lastModifiedItems.diet = true; // 标记为已明确取消选择
+  } else {
+    currentDiet.value = value;
+    lastModifiedItems.diet = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const dietItem = nursingItems.find((item) => item.item === '饮食');
+  if (dietItem) {
+    dietItem.currentStatus = currentDiet.value || '';
+  }
+};
+
+// 体位选择处理
+const selectPosition = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentPosition.value === value) {
+    currentPosition.value = null;
+    lastModifiedItems.position = true; // 标记为已明确取消选择
+  } else {
+    currentPosition.value = value;
+    lastModifiedItems.position = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const positionItem = nursingItems.find((item) => item.item === '体位');
+  if (positionItem) {
+    positionItem.currentStatus = currentPosition.value || '';
+  }
+};
+
+// 陪护选择处理
+const selectCompanionCare = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentCompanionCare.value === value) {
+    currentCompanionCare.value = null;
+    lastModifiedItems.companionCare = true; // 标记为已明确取消选择
+  } else {
+    currentCompanionCare.value = value;
+    lastModifiedItems.companionCare = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const companionCareItem = nursingItems.find((item) => item.item === '陪护');
+  if (companionCareItem) {
+    companionCareItem.currentStatus = currentCompanionCare.value || '';
+  }
+};
+
+// 隔离等级选择处理
+const selectIsolationLevel = (value) => {
+  // 如果点击的是当前选中的值，则取消选中（设为null）
+  if (currentIsolationLevel.value === value) {
+    currentIsolationLevel.value = null;
+    lastModifiedItems.isolationLevel = true; // 标记为已明确取消选择
+  } else {
+    currentIsolationLevel.value = value;
+    lastModifiedItems.isolationLevel = false; // 有选择值，清除取消标记
+  }
+  // 更新当前状态显示
+  const isolationLevelItem = nursingItems.find((item) => item.item === '隔离等级');
+  if (isolationLevelItem) {
+    isolationLevelItem.currentStatus = currentIsolationLevel.value || '';
+  }
+};
+
+// 从后端获取护理状态数据
+const fetchNursingStatusData = () => {
+  // 显示加载状态
+  loading.value = true;
+
+  // 调用后端接口
+  getNursingOrdersInfos({
+    // encounterId: patientInfo.value.encounterId
+  })
+    .then((res) => {
+      // 隐藏加载状态
+      loading.value = false;
+
+      if (res.code === 200 && res.data) {
+        // 填充各列表数据
+        nursingLevelList.value = res.data.nursingList || [];
+        conditionList.value = res.data.conditionList || [];
+        dietList.value = res.data.dietList || [];
+        positionList.value = res.data.positionList || [];
+        companionCareList.value = res.data.companionCareList || [];
+        isolationLevelList.value = res.data.isolationLevelList || [];
+        nursingRoutineList.value = res.data.nursingRoutineList || [];
+
+        // 确保选项数据加载完成后，如果有患者信息则获取患者护理医嘱信息
+        if (patientInfo.value?.encounterId) {
+          fetchPatientNursingOrders();
+        }
+      }
+    })
+    .catch((error) => {
+      // 隐藏加载状态
+      loading.value = false;
+
+      // 记录错误日志
+      console.error('获取护理状态数据失败:', error);
+
+      // 添加用户友好的错误提示
+      if (proxy && proxy.$message) {
+        proxy.$message({
+          message: '获取护理状态数据失败，请稍后重试',
+          type: 'error',
+        });
+      }
+    });
+};
+
+// 组件挂载时自动获取数据
+onMounted(() => {
+  fetchNursingStatusData();
+});
+
+// 监听患者信息变化，重新获取数据
+watch(
+  patientInfo,
+  (newInfo) => {
+    if (newInfo?.encounterId) {
+      // 重置当前状态
+      resetCurrentStatus();
+      // 重新获取护理选项数据
+      fetchNursingStatusData();
+      // 延迟一小段时间再获取患者的护理医嘱信息，确保选项数据已经加载完成
+      setTimeout(() => {
+        fetchPatientNursingOrders();
+      }, 100);
+    }
+  },
+  { deep: true }
+);
+
+// 重置当前选择状态
+const resetCurrentStatus = () => {
+  currentNursingLevel.value = null;
+  currentCondition.value = null;
+  currentDiet.value = null;
+  currentPosition.value = null;
+  currentNursingRoutine.value = null;
+  currentCompanionCare.value = null;
+  currentIsolationLevel.value = null;
+
+  // 重置取消选择跟踪对象
+  Object.keys(lastModifiedItems).forEach((key) => {
+    lastModifiedItems[key] = false;
+  });
+
+  // 更新显示状态
+  nursingItems.forEach((item) => {
+    item.currentStatus = '';
+  });
+};
+
+// 获取患者的护理医嘱信息
+const fetchPatientNursingOrders = () => {
+  // 确保有有效的就诊ID
+  if (!patientInfo.value?.encounterId) return;
+
+  // 调用API获取患者的护理医嘱数据
+  getEncounterNursingOrders({
+    encounterId: patientInfo.value.encounterId,
+  })
+    .then((res) => {
+      if (res.code === 200 && res.data) {
+        // 根据后端返回的definitionId匹配对应的选项
+        // 护理级别 (categoryEnum: 26)
+        // 只有当项目未被标记为明确取消选择时，才从后端加载数据
+        if (!lastModifiedItems.nursingLevel && res.data.nursing?.definitionId) {
+          const definitionId = res.data.nursing.definitionId;
+          // 在nursingLevelList中查找对应的选项
+          const matchedItem = nursingLevelList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentNursingLevel.value = matchedItem.nursingOrderName;
+            const nursingLevelItem = nursingItems.find((item) => item.item === '护理级别');
+            if (nursingLevelItem) {
+              nursingLevelItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentNursingLevel.value = null;
+            const nursingLevelItem = nursingItems.find((item) => item.item === '护理级别');
+            if (nursingLevelItem) {
+              nursingLevelItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentNursingLevel.value = null;
+          const nursingLevelItem = nursingItems.find((item) => item.item === '护理级别');
+          if (nursingLevelItem) {
+            nursingLevelItem.currentStatus = '';
+          }
+        }
+
+        // 病情 (categoryEnum: 38)
+        if (!lastModifiedItems.condition && res.data.condition?.definitionId) {
+          const definitionId = res.data.condition.definitionId;
+          const matchedItem = conditionList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentCondition.value = matchedItem.nursingOrderName;
+            const conditionItem = nursingItems.find((item) => item.item === '病情');
+            if (conditionItem) {
+              conditionItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentCondition.value = null;
+            const conditionItem = nursingItems.find((item) => item.item === '病情');
+            if (conditionItem) {
+              conditionItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentCondition.value = null;
+          const conditionItem = nursingItems.find((item) => item.item === '病情');
+          if (conditionItem) {
+            conditionItem.currentStatus = '';
+          }
+        }
+
+        // 护理常规 (categoryEnum: 39)
+        if (!lastModifiedItems.nursingRoutine && res.data.nursingRoutine?.definitionId) {
+          const definitionId = res.data.nursingRoutine.definitionId;
+          const matchedItem = nursingRoutineList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentNursingRoutine.value = matchedItem.nursingOrderName;
+            const nursingRoutineItem = nursingItems.find((item) => item.item === '护理常规');
+            if (nursingRoutineItem) {
+              nursingRoutineItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentNursingRoutine.value = null;
+            const nursingRoutineItem = nursingItems.find((item) => item.item === '护理常规');
+            if (nursingRoutineItem) {
+              nursingRoutineItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentNursingRoutine.value = null;
+          const nursingRoutineItem = nursingItems.find((item) => item.item === '护理常规');
+          if (nursingRoutineItem) {
+            nursingRoutineItem.currentStatus = '';
+          }
+        }
+
+        // 饮食 (categoryEnum: 27)
+        if (!lastModifiedItems.diet && res.data.diet?.definitionId) {
+          const definitionId = res.data.diet.definitionId;
+          const matchedItem = dietList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentDiet.value = matchedItem.nursingOrderName;
+            const dietItem = nursingItems.find((item) => item.item === '饮食');
+            if (dietItem) {
+              dietItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentDiet.value = null;
+            const dietItem = nursingItems.find((item) => item.item === '饮食');
+            if (dietItem) {
+              dietItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentDiet.value = null;
+          const dietItem = nursingItems.find((item) => item.item === '饮食');
+          if (dietItem) {
+            dietItem.currentStatus = '';
+          }
+        }
+
+        // 体位 (categoryEnum: 40)
+        if (!lastModifiedItems.position && res.data.position?.definitionId) {
+          const definitionId = res.data.position.definitionId;
+          const matchedItem = positionList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentPosition.value = matchedItem.nursingOrderName;
+            const positionItem = nursingItems.find((item) => item.item === '体位');
+            if (positionItem) {
+              positionItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentPosition.value = null;
+            const positionItem = nursingItems.find((item) => item.item === '体位');
+            if (positionItem) {
+              positionItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentPosition.value = null;
+          const positionItem = nursingItems.find((item) => item.item === '体位');
+          if (positionItem) {
+            positionItem.currentStatus = '';
+          }
+        }
+
+        // 陪护 (categoryEnum: 41)
+        if (!lastModifiedItems.companionCare && res.data.companionCare?.definitionId) {
+          const definitionId = res.data.companionCare.definitionId;
+          const matchedItem = companionCareList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentCompanionCare.value = matchedItem.nursingOrderName;
+            const companionCareItem = nursingItems.find((item) => item.item === '陪护');
+            if (companionCareItem) {
+              companionCareItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentCompanionCare.value = null;
+            const companionCareItem = nursingItems.find((item) => item.item === '陪护');
+            if (companionCareItem) {
+              companionCareItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentCompanionCare.value = null;
+          const companionCareItem = nursingItems.find((item) => item.item === '陪护');
+          if (companionCareItem) {
+            companionCareItem.currentStatus = '';
+          }
+        }
+
+        // 隔离等级 (categoryEnum: 42)
+        if (!lastModifiedItems.isolationLevel && res.data.isolationLevel?.definitionId) {
+          const definitionId = res.data.isolationLevel.definitionId;
+          const matchedItem = isolationLevelList.value.find(
+            (item) => item.id === definitionId || item.definitionId === definitionId
+          );
+          if (matchedItem) {
+            currentIsolationLevel.value = matchedItem.nursingOrderName;
+            const isolationLevelItem = nursingItems.find((item) => item.item === '隔离等级');
+            if (isolationLevelItem) {
+              isolationLevelItem.currentStatus = matchedItem.nursingOrderName;
+            }
+          } else {
+            currentIsolationLevel.value = null;
+            const isolationLevelItem = nursingItems.find((item) => item.item === '隔离等级');
+            if (isolationLevelItem) {
+              isolationLevelItem.currentStatus = '';
+            }
+          }
+        } else {
+          currentIsolationLevel.value = null;
+          const isolationLevelItem = nursingItems.find((item) => item.item === '隔离等级');
+          if (isolationLevelItem) {
+            isolationLevelItem.currentStatus = '';
+          }
+        }
+      }
+    })
+    .catch((error) => {
+      console.error('获取患者护理医嘱信息失败:', error);
+    });
+};
+
+// 定义暴露的属性
+defineExpose({
+  refreshData: fetchNursingStatusData,
+});
+
+// 取消按钮处理函数
+const handleCancel = () => {
+  // 重置所有选择状态
+  resetCurrentStatus();
+
+  // 重新获取患者的护理医嘱信息
+  if (patientInfo.value?.encounterId) {
+    fetchPatientNursingOrders();
+  }
+
+  // 添加提示信息
+  if (proxy && proxy.$message) {
+    proxy.$message({
+      message: '已取消设置',
+      type: 'info',
+    });
+  }
+};
+
+// 日期格式化函数
+const 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}`;
+};
+
+// 确认按钮处理函数
+const handleConfirm = async () => {
+  // 检查是否有有效的就诊ID和患者ID
+  if (!patientInfo.value?.encounterId || !patientInfo.value?.patientId) {
+    if (proxy && proxy.$message) {
+      proxy.$message({
+        message: '请先选择患者',
+        type: 'warning',
+      });
+    }
+    return;
+  }
+
+  // 显示加载状态
+  loading.value = true;
+
+  // 获取真实诊断ID
+  let conditionId = null;
+  let encounterDiagnosisId = null;
+
+  try {
+    // 确保patientInfo和encounterId存在
+    if (patientInfo.value && patientInfo.value.encounterId) {
+      console.log('开始获取诊断信息，encounterId:', patientInfo.value.encounterId);
+      // 调用API获取患者的诊断信息
+      const diagnosisRes = await getEncounterDiagnosis(patientInfo.value.encounterId);
+      // 检查API响应是否成功
+      if (
+        diagnosisRes &&
+        diagnosisRes.code === 200 &&
+        diagnosisRes.data &&
+        Array.isArray(diagnosisRes.data) &&
+        diagnosisRes.data.length > 0
+      ) {
+        const firstDiagnosis = diagnosisRes.data[0];
+        console.log('获取到的第一个诊断信息:', firstDiagnosis);
+
+        // 直接使用API返回的真实诊断ID
+        if (firstDiagnosis.conditionId && firstDiagnosis.encounterDiagnosisId) {
+          conditionId = firstDiagnosis.conditionId;
+          encounterDiagnosisId = firstDiagnosis.encounterDiagnosisId;
+          console.log(
+            '使用API返回的真实诊断ID - conditionId:',
+            conditionId,
+            'encounterDiagnosisId:',
+            encounterDiagnosisId
+          );
+        }
+      }
+    }
+
+    // 如果无法获取真实诊断ID，才使用encounterId作为后备
+    if (!conditionId || !encounterDiagnosisId) {
+      conditionId = patientInfo.value?.encounterId;
+      encounterDiagnosisId = patientInfo.value?.encounterId;
+      console.log('使用encounterId作为诊断ID的后备值:', conditionId);
+    }
+
+    // 准备提交的数据，包含就诊相关信息和护理项目数组
+    const submitData = {
+      // 就诊id - 从store中获取真实的就诊ID
+      encounterId: patientInfo.value.encounterId,
+      // 患者id - 从store中获取真实的患者ID
+      patientId: patientInfo.value.patientId,
+      // 诊断ID - 使用真实的诊断ID
+      conditionId: conditionId,
+      // 就诊诊断id - 使用真实的诊断ID
+      encounterDiagnosisId: encounterDiagnosisId,
+      // 医嘱开始时间，格式化为yyyy-MM-dd HH:mm:ss
+      startTime: formatDate(new Date()),
+    };
+
+    // 准备护理项目数据数组，按照后端要求的格式
+    const nursingOrdersSaveDetailDtoList = [];
+
+    // 添加护理级别 - 根据选项找到对应的definitionId
+    const selectedLevel = nursingLevelList.value.find(
+      (item) => item.nursingOrderName === currentNursingLevel.value
+    );
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedLevel?.definitionId || null,
+      categoryEnum: 26, // 护理级别的categoryCode
+    });
+
+    // 添加病情
+    const selectedCondition = conditionList.value.find(
+      (item) => item.nursingOrderName === currentCondition.value
+    );
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedCondition?.definitionId || null,
+      categoryEnum: 38, // 病情的categoryCode
+    });
+
+    // 添加护理常规
+    const selectedRoutine = nursingRoutineList.value.find(
+      (item) => item.nursingOrderName === currentNursingRoutine.value
+    );
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedRoutine?.definitionId || null,
+      categoryEnum: 39, // 护理常规的categoryCode
+    });
+
+    // 添加饮食
+    const selectedDiet = dietList.value.find((item) => item.nursingOrderName === currentDiet.value);
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedDiet?.definitionId || null,
+      categoryEnum: 27, // 膳食的categoryCode
+    });
+
+    // 添加体位
+    const selectedPosition = positionList.value.find(
+      (item) => item.nursingOrderName === currentPosition.value
+    );
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedPosition?.definitionId || null,
+      categoryEnum: 40, // 体位的categoryCode
+    });
+
+    // 添加陪护
+    const selectedCompanion = companionCareList.value.find(
+      (item) => item.nursingOrderName === currentCompanionCare.value
+    );
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedCompanion?.definitionId || null,
+      categoryEnum: 41, // 陪护的categoryCode
+    });
+
+    // 添加隔离等级
+    const selectedIsolation = isolationLevelList.value.find(
+      (item) => item.nursingOrderName === currentIsolationLevel.value
+    );
+    nursingOrdersSaveDetailDtoList.push({
+      definitionId: selectedIsolation?.definitionId || null,
+      categoryEnum: 42, // 隔离等级的categoryCode
+    });
+
+    // 将护理项目数组添加到提交数据中
+    submitData.nursingOrdersSaveDetailDtoList = nursingOrdersSaveDetailDtoList;
+
+    // 在控制台输出传给后端的数据
+    console.log('提交给后端的护理状态数据:', submitData);
+
+    // 调用API保存数据
+    const res = await saveNursingOrders(submitData);
+
+    // 处理成功响应
+    if (res.code === 200) {
+      if (proxy && proxy.$message) {
+        proxy.$message({
+          message: '护理医嘱保存成功',
+          type: 'success',
+        });
+      }
+
+      // 先重置当前状态，确保清除所有选择和跟踪标记
+      resetCurrentStatus();
+      // 延迟一小段时间再获取数据，确保后端已更新
+      setTimeout(() => {
+        // 重新加载患者的护理医嘱信息
+        fetchPatientNursingOrders();
+      }, 100);
+    } else {
+      if (proxy && proxy.$message) {
+        proxy.$message({
+          message: res.message || '保存失败',
+          type: 'error',
+        });
+      }
+    }
+  } catch (error) {
+    // 处理错误
+    console.error('保存护理医嘱失败:', error);
+    if (proxy && proxy.$message) {
+      proxy.$message({
+        message: '保存失败，请稍后重试',
+        type: 'error',
+      });
+    }
+  } finally {
+    // 隐藏加载状态
+    loading.value = false;
+
+    // 保存成功后，重新获取患者的护理医嘱信息以更新显示
+    if (patientInfo.value?.encounterId) {
+      fetchPatientNursingOrders();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+/* 操作按钮区域样式 */
+.nursing-status-actions {
+  margin-top: 15px;
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  padding: 10px 0;
+  border-top: 1px solid #ebeef5;
+}
+.nursing-status-container {
+  height: 100%;
+  padding: 15px;
+  display: flex;
+  flex-direction: column;
+  background-color: #ffffff;
+  overflow: auto;
+}
+
+.nursing-status-header {
+  margin-bottom: 15px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.nursing-status-header h3 {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.loading-container {
+  height: 200px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.nursing-table {
+  flex: 1;
+  overflow: auto;
+  font-size: 14px;
+  color: #303133;
+
+  ::v-deep .el-table__header {
+    font-weight: 600;
+  }
+
+  ::v-deep .el-table__cell {
+    padding: 12px 10px; /* 增加左右内边距 */
+    text-align: left; /* 调整为左对齐 */
+    border-right: 1px solid #ebeef5;
+    white-space: normal; /* 允许换行 */
+    word-break: break-word;
+    min-height: 40px; /* 设置最小高度 */
+  }
+
+  ::v-deep .el-table__row:hover {
+    background-color: #f5f7fa;
+  }
+
+  ::v-deep .el-table__row:nth-child(odd) {
+    background-color: #fafafa;
+  }
+
+  /* 为操作列设置更宽的最小宽度 */
+  ::v-deep .el-table__column--operation {
+    min-width: 400px !important;
+  }
+}
+
+.status-tag {
+  padding: 4px 12px;
+  border-radius: 4px;
+  background-color: #409eff; /* 蓝色背景 */
+  color: #ffffff; /* 白色文字 */
+}
+
+.condition-text {
+  color: #409eff;
+  font-weight: 500;
+}
+
+.operation-content {
+  display: flex;
+  height: 100%;
+  width: 100%;
+  overflow: visible;
+}
+
+/* 水平排列样式 */
+.options-horizontal {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  width: 100%;
+  align-items: flex-start;
+}
+
+.option-item {
+  padding: 6px 12px;
+  margin: 2px 0;
+  border-radius: 4px;
+  background-color: #f0f2f5;
+  color: #606266;
+  font-size: 13px;
+  text-align: center;
+  transition: all 0.3s ease;
+  cursor: pointer;
+  white-space: normal; /* 允许文本换行 */
+  max-width: 150px; /* 设置最大宽度 */
+  min-width: 80px; /* 设置最小宽度 */
+  word-break: keep-all; /* 保持单词完整性 */
+}
+
+/* 增强选中状态样式的优先级 */
+.options-horizontal .option-item.selected {
+  background-color: #409eff !important;
+  color: #ffffff !important;
+}
+
+.option-item:hover:not(.selected) {
+  background-color: #ecf5ff;
+  color: #409eff;
+}
+
+/* 响应式调整 */
+@media (max-width: 1200px) {
+  .nursing-table {
+    ::v-deep .el-table__cell {
+      padding: 8px 8px;
+    }
+
+    ::v-deep .el-table__column--operation {
+      min-width: 350px !important;
+    }
+  }
+
+  .option-item {
+    padding: 4px 8px;
+    font-size: 12px;
+    max-width: 130px;
+  }
+}
+
+@media (max-width: 768px) {
+  .nursing-status-container {
+    padding: 10px;
+  }
+
+  .nursing-table {
+    font-size: 12px;
+
+    ::v-deep .el-table__cell {
+      padding: 6px 6px;
+    }
+
+    ::v-deep .el-table__column--operation {
+      min-width: 300px !important;
+    }
+  }
+
+  .options-horizontal {
+    gap: 5px;
+  }
+
+  .option-item {
+    padding: 3px 6px;
+    font-size: 11px;
+    max-width: 120px;
+  }
+}
+</style>
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
index 964e554f..488c11bd 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -2,6 +2,7 @@
   <div>
     <el-row :gutter="24">
       <el-col :span="4" :xs="24">
+<<<<<<< HEAD
         <el-input
           v-model="diagnosis"
           placeholder="诊断名称"
@@ -23,40 +24,40 @@
           :filter-node-method="filterNode"
           @node-click="handleNodeClick"
         >
+=======
+        <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">
+>>>>>>> upstream/develop
           <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 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)"
-                >
+                <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 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>
@@ -82,32 +83,17 @@
 </el-table-column>
             <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="120">
               <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 :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-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-option v-for="item in med_type" :key="item.value" :label="item.label" :value="item.value" />
                   </el-select>
                 </el-form-item>
               </template>
@@ -115,25 +101,12 @@
             <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"
-                    />
+                  <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)"
-                      />
+                      <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>
@@ -145,6 +118,7 @@
             <el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
             <el-table-column label="诊断类型" align="center" prop="maindiseFlag" width="120">
               <template #default="scope">
+<<<<<<< HEAD
               <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                 <el-checkbox
                   label="主诊断"
@@ -167,17 +141,21 @@
                     :label="item.label"
                     :value="item.value"
                   />
+=======
+                <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" />
+>>>>>>> upstream/develop
                 </el-select>
               </div>
               </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 link type="primary" @click="handleDeleteDiagnosis(scope.row, scope.$index)">
                   删除
                 </el-button>
               </template>
@@ -186,6 +164,7 @@
         </el-form>
       </el-col>
     </el-row>
+<<<<<<< HEAD
     <diagnosisdialog
       :openDiagnosis="openDiagnosis"
       @close="closeDiagnosisDialog"
@@ -196,6 +175,11 @@
       :patientInfo="props.patientInfo"
       @close="closeDiagnosisDialog"
     />
+=======
+    <diagnosisdialog :openDiagnosis="openDiagnosis" @close="closeDiagnosisDialog" :radio="orgOrUser" />
+    <AddDiagnosisDialog :openAddDiagnosisDialog="openAddDiagnosisDialog" :patientInfo="patientInfo"
+      @close="closeDiagnosisDialog" />
+>>>>>>> upstream/develop
   </div>
 </template>
 
@@ -292,7 +276,6 @@ function getList() {
       
       form.value.diagnosisList = diagnosisList;
       emits('diagnosisSave', false);
-      console.log(form.value.diagnosisList);
     }
   });
   
@@ -321,7 +304,6 @@ function getList() {
         });
       }
       emits('diagnosisSave', false);
-      console.log(form.value.diagnosisList);
     }
   });
   
@@ -594,7 +576,7 @@ function closeDiagnosisDialog(str) {
   getTree();
 }
 
-function queryDiagnosisUse(value) {}
+function queryDiagnosisUse(value) { }
 
 function handleChange(value) {
   diagnosisSearchkey.value = value;
@@ -658,6 +640,7 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 .el-checkbox.is-bordered.el-checkbox--small {
   background-color: #ffffff;
 }
+
 .custom-tree-node {
   display: flex;
   align-items: center;
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js
index b525369b..8b41c4b4 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js
@@ -93,6 +93,17 @@ export function geturger(data) {
   })
 }
 
+/**
+ * 住院患者转科
+ */
+export function transferOrganization(data) {
+  return request({
+    url: '/reg-doctorstation/special-advice/transfer-organization-orders',
+    method: 'post',
+    data: data
+  })
+}
+
 
 
 
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
index 4eee360b..6c11e1ea 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/applicationFormBottomBtn.vue
@@ -121,7 +121,6 @@ const submitApplicationForm = () => {
   }
 };
 const submitOk = () => {
-  debugger;
   applicationFormDialogVisible.value = false;
   applicationFormName.value = null;
 };
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/leaveHospitalDialog.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/leaveHospitalDialog.vue
new file mode 100644
index 00000000..1f4fd175
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/leaveHospitalDialog.vue
@@ -0,0 +1,59 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    destroy-on-close
+    width="600px"
+    :close-on-click-modal="false"
+    title="出院申请"
+    @close="closeDialog"
+  >
+    <div style="padding: 0 80px">
+      <el-form :model="form" :rules="rules" ref="formRef">
+        <el-form-item label="出院方式">
+          <el-select v-model="form.outpatientType">
+            <el-option
+              v-for="(item, index) in dscg_way"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="出院时间">
+          <el-radio-group v-model="form.outpatientTime">
+            <el-radio value="1">今日</el-radio>
+            <el-radio value="2">明日</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="出院描述"
+          ><el-input v-model="form.outpatientDescription" type="textarea" rows="5" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="submitApplicationForm"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+const { proxy } = getCurrentInstance();
+const { dscg_way } = proxy.useDict('dscg_way');
+const dialogVisible = ref(false);
+const form = reactive({
+  outpatientType: [],
+  outpatientTime: '',
+  outpatientDescription: '',
+});
+
+function openDialog() {
+  dialogVisible.value = true;
+}
+
+defineExpose({
+  openDialog,
+});
+</script>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue
new file mode 100644
index 00000000..3e89dce2
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    destroy-on-close
+    width="600px"
+    :close-on-click-modal="false"
+    title="转科申请"
+    @close="closeDialog"
+  >
+    <div style="padding: 0 80px">
+      <el-form :model="form" :rules="rules" ref="formRef">
+        <el-form-item label="转入科室" prop="targetOrganizationId">
+          <el-select
+            v-model="form.targetOrganizationId"
+            @change="fetchWardList"
+            placeholder="请选择转入科室"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="转入病区" prop="targetLocationId">
+          <el-select v-model="form.targetLocationId" no-data-text="请先选择科室" placeholder="请选择转入病区">
+            <el-option
+              v-for="item in wardList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="转科时间" prop="startTime">
+          <el-radio-group v-model="form.startTime">
+            <el-radio :value="today">今日</el-radio>
+            <el-radio :value="tomorrow">明日</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="转科原因" prop="reasonText">
+          <el-input
+            v-model="form.reasonText"
+            type="textarea"
+            rows="5"
+            placeholder="请输入转科原因"
+          />
+        </el-form-item>
+      </el-form>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="submitApplicationForm"> 确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { transferOrganization } from './api.js';
+import { getWardList, getOrgList } from '@/api/public.js';
+import { patientInfo } from '../../../store/patient.js';
+const { proxy } = getCurrentInstance();
+const dialogVisible = ref(false);
+const deptList = ref([]); // 科室列表
+const wardList = ref([]); // 病区列表
+const today = ref(proxy.formatDateStr(new Date(),'YYYY-MM-DD HH:mm:ss'))
+const tomorrow = ref(proxy.formatDateStr(new Date().setDate(new Date + 1),'YYYY-MM-DD HH:mm:ss'))
+
+const form = reactive({
+  targetOrganizationId: '',
+  targetLocationId: '',
+  startTime: '',
+  reasonText: '',
+});
+
+// 表单校验规则
+const rules = ref({
+  targetOrganizationId: [{ required: true, message: '请选择转入科室', trigger: 'change' }],
+  targetLocationId: [{ required: true, message: '请选择转入病区', trigger: 'change' }],
+  startTime: [{ required: true, message: '请选择转科时间', trigger: 'change' }],
+  reasonText: [{ required: false }],
+});
+
+// 获取科室列表
+function fetchDeptList() {
+  getOrgList().then((response) => {
+    deptList.value = response.data;
+  });
+}
+
+// 获取病区列表
+function fetchWardList() {
+  getWardList({ orgId: form.targetOrganizationId }).then((response) => {
+    wardList.value = response.data;
+  });
+}
+
+function openDialog() {
+  dialogVisible.value = true;
+  // 打开对话框时获取数据
+  fetchDeptList();
+}
+
+// 提交表单
+function submitApplicationForm() {
+  proxy.$refs.formRef.validate((valid) => {
+    console.log(patientInfo.value);
+    if (valid) {
+      form.encounterId = patientInfo.value.encounterId
+      form.patientId = patientInfo.value.patientId
+      // 表单校验通过，执行提交逻辑
+      transferOrganization(form).then((res) => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('转科申请已提交');
+          dialogVisible.value = false;
+        }
+      });
+    } else {
+      // 表单校验不通过
+      proxy.$modal.msgWarning('请完善必填信息');
+      return false;
+    }
+  });
+}
+
+// 关闭对话框
+function closeDialog() {
+  // 重置表单
+  proxy.$refs.formRef.resetFields();
+  // 重置数据
+  Object.assign(form, {
+    targetOrganizationId: '',
+    targetLocationId: '',
+    startTime: '',
+    reasonText: '',
+  });
+}
+
+defineExpose({
+  openDialog,
+});
+</script>
\ No newline at end of file
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
index b12a1f0d..cc7c0f92 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -10,10 +10,20 @@
         <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
+          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
+          type="primary"
+          plain
+          :disabled="false"
+          @click="proxy.$refs.prescriptionHistoryRef.handleOpen()"
+        >
           历史
         </el-button>
         <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
@@ -24,13 +34,22 @@
         <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-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-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 }}元
@@ -47,19 +66,38 @@
             <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-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-button link type="primary" @click="handleTransferOrg">转科</el-button>
+          <el-button link type="primary" @click="handleLeaveHospital">出院</el-button>
         </el-space>
       </div>
     </div>
     <div class="inpatientDoctor-order-table">
-      <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
+        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">
+              <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">
@@ -92,10 +130,17 @@
                     </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 +
+                      <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 +
@@ -111,19 +156,32 @@
                             item.price.toFixed(2) +
                             '/' +
                             item.unitCode_dictText
-                            " @click="handleNumberClick(item, scope.$index)" />
+                          "
+                          @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)"
+                    <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>x
-                    <span class="medicine-info"> 诊断：{{ diagnosisName }} </span>x
+                        style="width: 70px; margin-right: 20px"
+                      /> </el-form-item
+                    >x <span class="medicine-info"> 诊断：{{ diagnosisName }} </span>x
                     <span class="medicine-info"> 皮试：{{ scope.row.skinTestFlag_enumText }} </span>
-                    <span class="medicine-info"> 注射药品：{{ scope.row.injectFlag_enumText }} </span>
+                    <span class="medicine-info">
+                      注射药品：{{ scope.row.injectFlag_enumText }}
+                    </span>
                     <span class="total-amount">
                       总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
                     </span>
@@ -131,104 +189,200 @@
                   <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
+                        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=" ">
+                      <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" />
+                          <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)"
+                        <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)" />
+                          @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
+                        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="
+                      <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);
+                          "
+                          @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-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
+                      <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);
+                          "
+                          @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" />
+                          "
+                          :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
+                    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="
+                      <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)"
+                      <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)" />
+                          @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)">
+                      <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" />
+                          <el-option
+                            v-if="item.type != unitMap['dose']"
+                            :value="item.value"
+                            :label="item.label"
+                          />
                         </template>
                       </el-select>
                     </div>
@@ -251,10 +405,17 @@
                       }}
                     </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 +
+                      <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 +
@@ -270,26 +431,49 @@
                             item.price.toFixed(2) +
                             '/' +
                             item.unitCode_dictText
-                            " @click="handleNumberClick(item, scope.$index)" />
+                          "
+                          @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"
+                      <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)" />
+                          @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)">
+                      <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;
-                            }
-                          " />
+                          <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 元' }}
+                        总金额：{{
+                          scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元'
+                        }}
                       </span>
                     </div>
                     <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
@@ -308,20 +492,45 @@
                       }}
                     </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"
+                      <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)" />
+                          @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
+                        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 元' }}
+                        总金额：{{
+                          scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元'
+                        }}
                       </span>
                       <span style="font-size: 16px; font-weight: 600">
                         <!-- 金额: {{ scope.row.priceList[0].price }} -->
@@ -338,18 +547,25 @@
         </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;
-                });
-              }
-            " />
+            <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)" />
+            <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">
@@ -363,11 +579,18 @@
         </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-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'">
+            <span
+              v-else
+              :style="scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5'"
+            >
               {{ scope.row.therapyEnum_enumText }}
             </span>
           </template>
@@ -375,31 +598,54 @@
         <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="
+              <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"
+                "
+              >
+                <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)" />
+              <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="
+                  <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;
                         // 拦截上下键和回车事件
@@ -409,7 +655,9 @@
                           adviceTableRef.handleKeyDown(e);
                         }
                       }
-                    " @blur="handleBlur(scope.row)" />
+                    "
+                    @blur="handleBlur(scope.row)"
+                  />
                 </template>
               </el-popover>
             </template>
@@ -464,11 +712,11 @@
               {{
                 scope.row.rateCode_dictText
                   ? scope.row.rateCode_dictText +
-                  ' ' +
-                  scope.row.dispensePerDuration +
-                  '天' +
-                  ' ' +
-                  scope.row.methodCode_dictText
+                    ' ' +
+                    scope.row.dispensePerDuration +
+                    '天' +
+                    ' ' +
+                    scope.row.methodCode_dictText
                   : ''
               }}
             </span>
@@ -510,8 +758,8 @@
       :patientInfo="patientInfo.value"
       @userPrescriptionHistory="handleSaveHistory"
     /> -->
-
-
+    <LeaveHospitalDialog ref="leaveHospitalDialogRef" />
+    <TransferOrganizationDialog ref="transferOrganizationRef" />
   </div>
 </template>
 
@@ -537,6 +785,8 @@ import { patientInfo } from '../../store/patient.js';
 import Decimal from 'decimal.js';
 import useUserStore from '@/store/modules/user';
 import ApplicationFormBottomBtn from './applicationForm/applicationFormBottomBtn.vue';
+import LeaveHospitalDialog from './applicationForm/leaveHospitalDialog.vue';
+import TransferOrganizationDialog from './applicationForm/transferOrganizationDialog.vue';
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);
 const queryParams = ref({});
@@ -1376,7 +1626,7 @@ function handleSingOut() {
 function handleStopAdvice() {
   let requestIdList = prescriptionList.value
     .filter((item) => {
-      return item.check && item.therapyEnum == '1';
+      return item.check;
     })
     .map((item) => {
       return {
@@ -1384,10 +1634,10 @@ function handleStopAdvice() {
         adviceType: item.adviceType,
       };
     });
-  if (requestIdList.length == 0) {
-    proxy.$modal.msgWarning('仅长期医嘱可停止');
-    return;
-  }
+  // if (requestIdList.length == 0) {
+  //   proxy.$modal.msgWarning('仅长期医嘱可停止');
+  //   return;
+  // }
   stopAdvice(requestIdList).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess('操作成功');
@@ -1743,10 +1993,12 @@ function sortPrescriptionList() {
   });
 }
 
-// 获取全部选中行
-// function getSelectRows() {
-//   return prescriptionList.value.filter((item) => item.check);
-// }
+function handleLeaveHospital() {
+  proxy.$refs['leaveHospitalDialogRef'].openDialog();
+}
+function handleTransferOrg() {
+  proxy.$refs['transferOrganizationRef'].openDialog();
+}
 
 // 处理行chexkbox选中
 function handleCheckBoxChange(value, index, row) {
@@ -1893,7 +2145,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
   .order-operate-btn {
     flex: none;
   }
-  .inpatientDoctor-order-table{
+  .inpatientDoctor-order-table {
     flex: auto;
     width: 100%;
   }
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/emr/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/emr/index.vue
index bae4d7b0..8be4e468 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/emr/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/emr/index.vue
@@ -5,26 +5,31 @@
 -->
 <template>
   <div class="emr-use-container">
-    <div class="template-tree-container">
-      <div class="search-box">
-        <el-input placeholder="病历名称搜索..." v-model="queryParams.name">
-          <template #append>
-            <el-button @click="queryTemplateTree">查询</el-button>
-          </template>
-        </el-input>
+    <div class="disBtn" :class="{'disLeftBtnNor':leftShow,'disLeftBtnAct':!leftShow}" @click="disNode"><img src="../../../../assets/icons/svg/foldup.svg"></div>
+    <div class="disBtn" :class="{'disRightBtnNor':rightShow,'disRightBtnAct':!rightShow}" @click="disNode_R"><img src="../../../../assets/icons/svg/foldup.svg"></div>
+    <transition name="el-zoom-in-left">
+      <div class="template-tree-container" v-if="leftShow">
+        <div class="search-box">
+          <el-input placeholder="病历名称搜索..." v-model="queryParams.name">
+            <template #append>
+              <el-button @click="queryTemplateTree">查询</el-button>
+            </template>
+          </el-input>
+        </div>
+        <el-scrollbar class="template-tree-scrollbar">
+          <el-tree
+              ref="templateTree"
+              :data="templateData"
+              :props="defaultProps"
+              auto-expand-parent
+              node-key="id"
+              @node-click="handleNodeClick"
+              class="template-tree"
+          ></el-tree>
+        </el-scrollbar>
       </div>
-      <el-scrollbar class="template-tree-scrollbar">
-        <el-tree
-          ref="templateTree"
-          :data="templateData"
-          :props="defaultProps"
-          auto-expand-parent
-          node-key="id"
-          @node-click="handleNodeClick"
-          class="template-tree"
-        ></el-tree>
-      </el-scrollbar>
-    </div>
+    </transition>
+
     <div class="operate-container">
       <div class="operate-btns">
         <el-space>
@@ -40,25 +45,29 @@
         </el-scrollbar>
       </div>
     </div>
-    <div class="quickly-container">
-      <el-tabs v-model="quicklyactiveName" type="card">
-        <el-tab-pane label="历史" name="history">
-          <History
-            @historyClick="handleHistoryClick"
-            ref="historyRef"
-            v-model:definitionId="currentSelectTemplate.id"
-          />
-        </el-tab-pane>
-        <el-tab-pane label="模版" name="model">
-          <Template
-            @templateClick="handleTemplateClick"
-            ref="templateRef"
-            v-model:definitionId="currentSelectTemplate.id"
-            @edit="templateEdit"
-          />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
+
+    <transition name="el-zoom-in-left">
+      <div class="quickly-container" v-if="rightShow">
+        <el-tabs v-model="quicklyactiveName" type="card">
+          <el-tab-pane label="历史" name="history">
+            <History
+                @historyClick="handleHistoryClick"
+                ref="historyRef"
+                v-model:definitionId="currentSelectTemplate.id"
+            />
+          </el-tab-pane>
+          <el-tab-pane label="模版" name="model">
+            <Template
+                @templateClick="handleTemplateClick"
+                ref="templateRef"
+                v-model:definitionId="currentSelectTemplate.id"
+                @edit="templateEdit"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </transition>
+
     <TemplateEdit
       ref="templateEditRef"
       :formData="editTemplateForm"
@@ -93,6 +102,9 @@ const currentSelectTemplate = ref({
 const currentComponent = ref('');
 const emrComponentRef = ref(null);
 const quicklyactiveName = ref('history');
+const leftShow = ref(true);
+const rightShow = ref(true);
+
 
 // 树配置（模板树）
 const defaultProps = {
@@ -175,7 +187,6 @@ const handleSubmitOk = async (data) => {
   if (currentOperate.value === 'add') {
     //
     try {
-      // debugger;
       if (!patientInfo.value?.encounterId || !patientInfo.value?.patientId) {
         ElMessage.error('请先选择患者！');
         return;
@@ -263,11 +274,77 @@ onMounted(() => {
 });
 
 defineExpose({ state });
+
+const disNode = () => {
+  leftShow.value = !leftShow.value;
+}
+const disNode_R = () => {
+  rightShow.value = !rightShow.value;
+}
 </script>
 <style lang="scss" scoped>
 .emr-use-container {
   display: flex;
   height: 100%;
+  img {
+    width: 200%;
+    height: 200%;
+  }
+  .disBtn {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+  }
+  .disLeftBtnNor {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    left: 18%;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(-90deg) ;
+    }
+  }
+  .disLeftBtnAct {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    left: 0;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(90deg);
+    }
+  }
+  .disRightBtnNor {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    right: 18.5%;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(90deg);
+    }
+  }
+  .disRightBtnAct {
+    cursor: pointer;
+    position: absolute;
+    top: 40%;
+    right: 0;
+    width: 20px;
+    height: 60px;
+    z-index: 1111;
+    img {
+      transform: rotate(-90deg);
+    }
+  }
 
   .template-tree-container {
     border-right: 1px solid #ebeef5;
@@ -293,8 +370,9 @@ defineExpose({ state });
   }
 
   .operate-container {
-    width: 300px;
-    flex: auto;
+    width: 100%;
+    //width: 300px;
+    //flex: auto;
     display: flex;
     flex-direction: column;
     padding: 0 8px 8px 8px;
@@ -323,4 +401,12 @@ defineExpose({ state });
     }
   }
 }
+
+@layer utilities {
+  .transition-width {
+    transition-property: width;
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    transition-duration: 300ms;
+  }
+}
 </style>
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
index 7ab7008d..96a2225e 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
@@ -11,4 +11,5 @@ import BloodTtransfusionAapplication from './components/applicationShow/bloodTtr
 import ExamineApplication from './components/applicationShow/examineApplication.vue'
 import SurgeryApplication from './components/applicationShow/surgeryApplication.vue'
 import TestApplication from './components/applicationShow/testApplication.vue'
-export { PatientList, PatientCard, Advice,Diagnose, BloodTtransfusionAapplication, ExamineApplication, SurgeryApplication, TestApplication }
+import NursingStatus from './components/applicationShow/nursingStatus.vue'
+export { PatientList, PatientCard, Advice,Diagnose, BloodTtransfusionAapplication, ExamineApplication, SurgeryApplication, TestApplication, NursingStatus }
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
index b70364bc..d70160cd 100644
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -21,8 +21,8 @@
             <el-tab-pane label="诊断录入" name="diagnosis">
               <Diagnose ref="diagnosisRef" :patientInfo="patientInfo" />
             </el-tab-pane>
-            <el-tab-pane label="住院病历" name="emr">
-              <emr />
+            <el-tab-pane label="住院病历" name="inhospitalEmr">
+              <Emr  ref="inhospitalEmrRef"/>
             </el-tab-pane>
             <el-tab-pane label="医技报告" name="fourth">Task</el-tab-pane>
             <el-tab-pane label="检验申请" name="test">
@@ -37,6 +37,9 @@
             <el-tab-pane label="输血申请" name="blood">
               <BloodTtransfusionAapplication />
             </el-tab-pane>
+            <el-tab-pane label="护理状态" name="nursing">
+              <NursingStatus />
+            </el-tab-pane>
           </el-tabs>
         </el-main>
       </el-container>
@@ -48,7 +51,7 @@ import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue
 // const { proxy } = getCurrentInstance()
 // const emits = defineEmits([])
 // const props = defineProps({})
-import Emr from "./emr/index.vue";
+import Emr from './emr/index.vue';
 import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
 import {
   PatientList,
@@ -58,6 +61,7 @@ import {
   ExamineApplication,
   SurgeryApplication,
   TestApplication,
+  NursingStatus,
 } from './index.js';
 const state = reactive({});
 onBeforeMount(() => {});
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
new file mode 100644
index 00000000..4219d1ef
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -0,0 +1,510 @@
+<template>
+  <el-dialog v-model="dialogVisible" title="补费" width="90%" :close-on-click-modal="false">
+    <!-- 弹窗内容 - 左右布局 -->
+    <div style="display: flex; gap: 20px; height: 70vh">
+      <!-- 左侧：收费组套列表 - 卡片式布局 -->
+      <div
+        style="
+          width: 250px;
+          border: 1px solid #e4e7ed;
+          border-radius: 4px;
+          display: flex;
+          flex-direction: column;
+        "
+      >
+        <!-- 搜索框 -->
+        <div style="padding: 10px; border-bottom: 1px solid #e4e7ed">
+          <el-input v-model="groupSearchText" placeholder="输入组套名称" clearable />
+        </div>
+        <!-- 收费组套列表 - 卡片式布局 -->
+        <div style="flex: 1; overflow-y: auto; padding: 10px">
+          <div
+            v-for="group in chargeGroups"
+            :key="group.id"
+            class="group-card"
+            @click="selectChargeGroup(group)"
+          >
+            <div class="group-status">
+              <span class="status-dot"></span>
+              {{ getGroupType(group.name) }}
+            </div>
+            <div class="group-name">{{ group.name }}</div>
+            <div class="group-info">
+              {{ getGroupInfo(group.id) }}
+            </div>
+          </div>
+          <!-- 只显示暂无数据文本 -->
+          <div
+            v-if="chargeGroups.length === 0"
+            style="text-align: center; color: #909399; padding: 20px"
+          >
+            暂无数据
+          </div>
+        </div>
+      </div>
+
+      <!-- 右侧：费用项目和信息 -->
+      <div style="flex: 1; display: flex; flex-direction: column">
+        <!-- 费用项目表格 -->
+        <el-table :data="feeItemsList" border style="width: 100%; flex: 1">
+          <el-table-column label="收费项目" prop="itemName" min-width="200">
+            <template #default="scope">
+              <el-input
+                v-model="scope.row.itemName"
+                placeholder="请输入收费项目"
+                style="width: 100%"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" prop="unitPrice" width="100" align="center">
+            <template #default="scope">
+              <el-input-number
+                v-model="scope.row.unitPrice"
+                :min="0"
+                :step="0.01"
+                precision="2"
+                style="width: 100px"
+                @change="calculateTotalAmount"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="计费数量" prop="quantity" width="100" align="center">
+            <template #default="scope">
+              <el-input-number
+                v-model="scope.row.quantity"
+                :min="1"
+                :step="1"
+                style="width: 100px"
+                @change="calculateTotalAmount"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="金额" prop="amount" width="100" align="center" />
+          <el-table-column label="医保类型" prop="insuranceType" width="100" align="center">
+            <template #default="scope">
+              <el-input
+                v-model="scope.row.insuranceType"
+                placeholder="医保类型"
+                style="width: 100px"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="特限符合" prop="special" width="100" align="center">
+            <template #default="scope">
+              <el-switch v-model="scope.row.special" />
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 添加项目按钮 - 移到右侧费用项目表格下方 -->
+        <div
+          style="
+            margin-top: 10px;
+            padding: 15px;
+            border: 1px dashed #dcdfe6;
+            border-radius: 4px;
+            text-align: center;
+            cursor: pointer;
+            color: #409eff;
+            transition: all 0.3s;
+          "
+          @click="addEmptyItem"
+        >
+          + 添加项目
+        </div>
+
+        <!-- 底部信息区域 -->
+        <div style="margin-top: 20px; display: flex; flex-wrap: wrap; gap: 15px">
+          <div style="display: flex; align-items: center">
+            <span style="margin-right: 8px">执行时间：</span>
+            <el-date-picker
+              v-model="executeTime"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择日期时间"
+              style="width: 200px"
+            />
+          </div>
+
+          <div style="display: flex; align-items: center">
+            <span style="margin-right: 8px">执行科室：</span>
+            <el-select v-model="selectedDept" placeholder="选择科室" style="width: 150px">
+              <el-option
+                v-for="dept in departmentOptions"
+                :key="dept.value"
+                :label="dept.label"
+                :value="dept.value"
+              />
+            </el-select>
+          </div>
+
+          <div style="display: flex; align-items: center">
+            <span style="margin-right: 8px">开方医生：</span>
+            <el-select v-model="selectedDoctor" placeholder="选择医生" style="width: 150px">
+              <el-option label="内科医生" value="doctor1" />
+              <el-option label="外科医生" value="doctor2" />
+              <el-option label="儿科医生" value="doctor3" />
+            </el-select>
+          </div>
+
+          <div style="display: flex; align-items: center">
+            <span style="margin-right: 8px">执行人：</span>
+            <el-select v-model="executor" placeholder="选择执行人" style="width: 150px">
+              <el-option label="系统管理员" value="admin" />
+              <el-option label="护士甲" value="nurse1" />
+              <el-option label="护士乙" value="nurse2" />
+            </el-select>
+          </div>
+        </div>
+
+        <!-- 总金额和操作按钮 -->
+        <div
+          style="
+            margin-top: 20px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          "
+        >
+          <div style="font-size: 14px; font-weight: bold; text-align: right">
+            本次补费总金额：<span style="color: #ff4d4f">{{ totalAmount.toFixed(2) }}</span>
+          </div>
+          <div>
+            <el-button @click="handleCancel">取消</el-button>
+            <el-button type="primary" @click="handleConfirm">确定</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, watch } from 'vue';
+import { ElMessage } from 'element-plus';
+import { formatDateStr } from '@/utils/index';
+
+// Props定义
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  initialData: {
+    type: Array,
+    default: () => [],
+  },
+  patientInfo: {
+    type: String,
+    default: '',
+  },
+});
+
+// Emits定义
+const emit = defineEmits(['update:visible', 'confirm', 'cancel']);
+
+// 响应式数据
+const dialogVisible = computed({
+  get: () => props.visible,
+  set: (value) => emit('update:visible', value),
+});
+const searchItemText = ref('');
+const selectedItemName = ref('');
+const feeTabs = ref('chargeItems');
+const feeItemsList = ref([]);
+const executeTime = ref('');
+const selectedDept = ref('');
+const selectedDoctor = ref('');
+const executor = ref('');
+const departmentOptions = ref([]);
+// 收费组套相关数据
+const chargeGroups = ref([]);
+const groupSearchText = ref('');
+
+// 计算总金额
+const totalAmount = computed(() => {
+  return feeItemsList.value.reduce((sum, item) => {
+    return sum + (item.unitPrice || 0) * (item.quantity || 0);
+  }, 0);
+});
+
+// 初始化
+onMounted(() => {
+  // 加载科室选项
+  loadDepartmentOptions();
+  // 加载收费组套数据
+  loadChargeGroups();
+});
+
+// 监听初始数据变化
+watch(
+  () => props.initialData,
+  (newData) => {
+    if (newData && newData.length > 0) {
+      initFeeDialogData(newData);
+    }
+  },
+  { deep: true }
+);
+
+// 监听弹窗显示状态
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      // 设置默认执行时间为当前时间
+      executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
+    } else {
+      // 弹窗关闭时重置数据
+      resetData();
+    }
+  }
+);
+
+// 加载科室选项
+function loadDepartmentOptions() {
+  // 模拟科室数据
+  departmentOptions.value = [
+    { label: '内科', value: 'internal' },
+    { label: '外科', value: 'surgery' },
+    { label: '儿科', value: 'pediatrics' },
+    { label: '妇产科', value: 'obstetrics' },
+    { label: '其他科室', value: 'others' },
+  ];
+}
+
+// 加载收费组套数据
+function loadChargeGroups() {
+  // 模拟收费组套数据
+  chargeGroups.value = [
+    { id: '1', name: '血常规检查组套' },
+    { id: '2', name: '生化检查组套' },
+    { id: '3', name: '心电图检查组套' },
+    { id: '4', name: 'CT检查组套' },
+    { id: '5', name: '输液治疗组套' },
+  ];
+}
+
+// 获取组套类型
+function getGroupType(name) {
+  if (name.includes('检查')) return '检查';
+  if (name.includes('治疗')) return '治疗';
+  return '常规';
+}
+
+// 获取组套信息
+function getGroupInfo(id) {
+  const infoMap = {
+    1: '检验科/基础检查',
+    2: '检验科/生化项目',
+    3: '心电图室/常规检查',
+    4: '影像科/影像学检查',
+    5: '内科/治疗项目',
+  };
+  return infoMap[id] || '标准收费项目';
+}
+
+// 初始化费用数据
+function initFeeDialogData(selectedRows) {
+  // 将选中的项目转换为弹窗中的费用项目格式
+  feeItemsList.value = selectedRows.map((row) => ({
+    itemName: row.chargeItem,
+    unitPrice: row.unitPrice,
+    quantity: row.quantity,
+    amount: row.unitPrice * row.quantity,
+    dept: '内科',
+    special: false,
+    insuranceType: '',
+  }));
+}
+
+// 选择收费组套
+function selectChargeGroup(group) {
+  // 模拟根据选中的组套添加对应的费用项目
+  const groupItems = {
+    1: [
+      {
+        itemName: '红细胞计数',
+        unitPrice: 15.0,
+        quantity: 1,
+        dept: '检验科',
+        special: false,
+        insuranceType: '甲类',
+      },
+    ],
+    2: [
+      {
+        itemName: '肝功能检查',
+        unitPrice: 80.0,
+        quantity: 1,
+        dept: '检验科',
+        special: false,
+        insuranceType: '甲类',
+      },
+    ],
+    3: [
+      {
+        itemName: '心电图检查',
+        unitPrice: 45.0,
+        quantity: 1,
+        dept: '心电图室',
+        special: false,
+        insuranceType: '甲类',
+      },
+    ],
+    4: [
+      {
+        itemName: 'CT扫描',
+        unitPrice: 300.0,
+        quantity: 1,
+        dept: '影像科',
+        special: false,
+        insuranceType: '乙类',
+      },
+    ],
+    5: [
+      {
+        itemName: '静脉输液',
+        unitPrice: 20.0,
+        quantity: 1,
+        dept: '内科',
+        special: false,
+        insuranceType: '甲类',
+      },
+    ],
+  };
+
+  const items = groupItems[group.id] || [];
+  // 计算金额
+  items.forEach((item) => {
+    item.amount = item.unitPrice * item.quantity;
+  });
+
+  // 添加到费用项目列表
+  feeItemsList.value = [...feeItemsList.value, ...items];
+}
+
+// 添加空白项目
+function addEmptyItem() {
+  const newItem = {
+    itemName: '', // 空白项目名称
+    unitPrice: 0, // 默认单价为0
+    quantity: 1, // 默认数量为1
+    amount: 0, // 默认金额为0
+    dept: '内科', // 默认科室
+    special: false, // 默认特限不符合
+    insuranceType: '', // 空白医保类型
+  };
+
+  // 添加到费用项目列表
+  feeItemsList.value.push(newItem);
+
+  // 显示提示信息
+  ElMessage.success('已添加空白项目，请填写相关信息');
+}
+
+// 计算总金额（当数量变化时调用）
+function calculateTotalAmount() {
+  // 更新每个项目的金额
+  feeItemsList.value.forEach((item) => {
+    item.amount = (item.unitPrice || 0) * (item.quantity || 0);
+  });
+}
+
+// 取消操作
+function handleCancel() {
+  emit('cancel');
+  dialogVisible.value = false;
+}
+
+// 确认操作
+function handleConfirm() {
+  // 构建提交数据
+  const submitData = {
+    feeItems: feeItemsList.value,
+    executeTime: executeTime.value,
+    department: selectedDept.value,
+    doctor: selectedDoctor.value,
+    executor: executor.value,
+    totalAmount: totalAmount.value,
+  };
+
+  // 发送确认事件
+  emit('confirm', submitData);
+  dialogVisible.value = false;
+}
+
+// 重置数据
+function resetData() {
+  feeItemsList.value = [];
+  executeTime.value = '';
+  selectedDept.value = '';
+  selectedDoctor.value = '';
+  executor.value = '';
+}
+</script>
+
+<style scoped>
+:deep(.el-dialog__body) {
+  padding: 20px;
+}
+
+/* 添加项目按钮样式 */
+:deep(
+    .el-dialog div[style*='flex: 1; display: flex; flex-direction: column'] > div:nth-child(2):hover
+  ) {
+  background-color: #ecf5ff;
+}
+
+/* 收费组套卡片样式 */
+.group-card {
+  background: #ffffff;
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
+  padding: 12px;
+  margin-bottom: 12px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.group-card:hover {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+  box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
+}
+
+.group-status {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+  font-size: 14px;
+  font-weight: 500;
+  color: #606266;
+}
+
+.status-dot {
+  width: 8px;
+  height: 8px;
+  background-color: #67c23a;
+  border-radius: 50%;
+  margin-right: 6px;
+}
+
+.group-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 8px;
+  word-break: break-word;
+}
+
+.group-info {
+  font-size: 12px;
+  color: #909399;
+  border-top: 1px dashed #ebeef5;
+  padding-top: 8px;
+  margin-top: 4px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/OrderBilling.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/OrderBilling.vue
new file mode 100644
index 00000000..4e25e9df
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/OrderBilling.vue
@@ -0,0 +1,528 @@
+<template>
+  <div style="height: calc(100vh - 126px)">
+    <!-- 操作工具栏 -->
+
+    <!-- 主内容区域 - 左右布局 -->
+    <div style="display: flex; height: calc(100% - 51px)">
+      <!-- 左侧：医嘱列表 -->
+      <div style="width: 50%; border-right: 1px solid #e4e7ed; overflow-y: auto">
+        <!--筛选条件 -->
+        <div style="display: flex; align-items: center; gap: 10px; padding: 10px 0 0 10px">
+          <!-- 医嘱类型tabs -->
+          <el-tabs
+            v-model="orderType"
+            type="card"
+            class="date-tabs"
+            @tab-click="handleOrderTypeClick"
+            style="width: auto; margin-right: 0"
+          >
+            <el-tab-pane label="全部" name="all"></el-tab-pane>
+            <el-tab-pane label="长期" name="long"></el-tab-pane>
+            <el-tab-pane label="临时" name="temp"></el-tab-pane>
+          </el-tabs>
+
+          <!-- 医嘱类型选择 -->
+          <el-form-item label="医嘱类型：" style="margin-bottom: 0">
+            <el-select
+              v-model="specificOrderType"
+              placeholder="医嘱类型"
+              clearable
+              style="width: 120px"
+            >
+              <el-option label="请选择" value="" />
+              <el-option
+                v-for="type in orderTypeOptions"
+                :key="type.value"
+                :label="type.label"
+                :value="type.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <!-- 显示有效勾选框 -->
+          <el-checkbox v-model="showValid">显示有效</el-checkbox>
+        </div>
+        <div style="display: flex; align-items: center; gap: 10px; padding: 10px">
+          <el-form-item label="开方科室：" style="margin-bottom: 0">
+            <el-select
+              v-model="prescribeDept"
+              placeholder="开方科室"
+              clearable
+              style="width: 120px"
+            >
+              <el-option label="请选择" value="" />
+              <el-option
+                v-for="type in departmentOptions"
+                :key="type.value"
+                :label="type.label"
+                :value="type.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="执行科室：" style="margin-bottom: 0">
+            <el-select
+              v-model="execDepartment"
+              placeholder="执行科室"
+              clearable
+              style="width: 120px"
+            >
+              <el-option label="请选择" value="" />
+              <el-option
+                v-for="type in departmentOptions"
+                :key="type.value"
+                :label="type.label"
+                :value="type.value"
+              />
+            </el-select>
+            <button class="reset-btn" @click="resetExecDepartment" title="重置">
+              <el-icon><Refresh /></el-icon>
+            </button>
+          </el-form-item>
+
+          <!-- 执行科室选择 -->
+        </div>
+        <!-- 非医嘱计费 -->
+        <div
+          style="margin: 10px 0; border: 1px solid #e4e7ed; border-radius: 4px; overflow: hidden"
+        >
+          <div style="background-color: #f5f7fa; padding: 8px 12px; font-weight: bold">
+            非医嘱计费
+          </div>
+          <table
+            style="
+              width: 100%;
+              border-collapse: collapse;
+              border: 1px solid #e4e7ed;
+              border-top: none;
+            "
+          >
+            <tbody>
+              <tr style="border-bottom: 1px solid #e4e7ed">
+                <td style="padding: 10px; width: 100px">床位计费</td>
+                <td style="padding: 10px; text-align: right">
+                  住院天数：{{ hospitalDays }}天 / 计费数量：{{ billingQuantity }}
+                </td>
+              </tr>
+              <tr>
+                <td style="padding: 10px; width: 100px">其他</td>
+                <td style="padding: 10px; text-align: right">总费用：{{ totalCost.toFixed(2) }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <!-- 医嘱表格 -->
+        <div v-loading="loading">
+          <el-table
+            ref="orderTableRef"
+            :data="orderList"
+            border
+            style="width: 100%"
+            :header-cell-style="{ background: '#f5f7fa !important' }"
+          >
+            <!-- <el-table-column type="selection" align="center" width="50" /> -->
+            <el-table-column label="类型" prop="type" width="80" align="center" />
+            <el-table-column label="医嘱内容" prop="content" />
+            <el-table-column label="预计执行" prop="unit" width="100" align="center" />
+            <el-table-column label="开始/停止" prop="period" width="180" align="center">
+              <template #default="scope">
+                {{ scope.row.startDate }}<br />
+                {{ scope.row.endDate || '未停止' }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+
+      <!-- 右侧：费用列表 -->
+      <div style="width: 50%; overflow-y: auto">
+        <div
+          style="
+            height: 51px;
+            border-bottom: 2px solid #e4e7ed;
+            display: flex;
+            align-items: center;
+            padding: 0 15px;
+          "
+        >
+          <div style="display: flex; align-items: center; gap: 10px">
+            <el-tabs
+              v-model="orderType"
+              type="card"
+              class="date-tabs"
+              @tab-click="handleOrderTypeClick"
+              style="width: auto; margin-right: 0"
+            >
+              <el-tab-pane label="费用明细" name="all"></el-tab-pane>
+              <el-tab-pane label="按天汇总" name="long"></el-tab-pane>
+            </el-tabs>
+          </div>
+
+          <div style="display: flex; align-items: center; gap: 10px; margin-left: 10px">
+            <!-- 项目选择 -->
+            <el-form-item label="项目：" style="margin-bottom: 0">
+              <el-select
+                v-model="selectedProject"
+                placeholder="项目"
+                clearable
+                style="width: 120px"
+              >
+                <el-option label="请选择" value="" />
+                <el-option
+                  v-for="project in projectOptions"
+                  :key="project.value"
+                  :label="project.label"
+                  :value="project.value"
+                />
+              </el-select>
+            </el-form-item>
+
+            <!-- 显示静脉勾选框 -->
+            <el-checkbox v-model="showVenous">显示静脉</el-checkbox>
+
+            <!-- 补费按钮 -->
+            <el-button type="primary">补费</el-button>
+          </div>
+        </div>
+        <div v-loading="loading">
+          <el-table
+            ref="feeTableRef"
+            :data="feeList"
+            border
+            style="width: 100%"
+            :header-cell-style="{ background: '#f5f7fa !important' }"
+          >
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="收费项目" prop="itemName" min-width="180" />
+            <el-table-column label="单价" prop="unitPrice" width="100" align="center" />
+            <el-table-column label="使用数量" prop="quantity" width="100" align="center" />
+            <el-table-column label="金额" prop="amount" width="100" align="center" />
+            <el-table-column label="退费审核" width="80" align="center">
+              <template #default="scope">
+                <el-button type="text" style="color: #409eff">退费申请</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
+import { formatDateStr } from '@/utils/index';
+
+// 响应式数据
+const loading = ref(false);
+const orderList = ref([]); // 医嘱列表
+const feeList = ref([]); // 费用列表
+const hospitalDays = ref(0); // 住院天数
+const billingQuantity = ref(0); // 计费数量
+const totalCost = ref(0.0); // 总费用
+const execDepartment = ref('');
+const orderType = ref('all'); // all, long, temp
+const specificOrderType = ref('');
+const showValid = ref(true);
+const prescribeDept = ref('');
+const selectedProject = ref('');
+const showVenous = ref(false);
+const departmentOptions = ref([]);
+const orderTypeOptions = ref([]);
+const projectOptions = ref([]);
+const orderTableRef = ref(null);
+const feeTableRef = ref(null);
+
+// 初始化
+onMounted(() => {
+  // 加载选项数据
+  loadOptions();
+  // 加载初始数据
+  handleQuery();
+  // 生成模拟床位计费数据
+  generateBedBillingData();
+});
+
+// 加载选项数据
+function loadOptions() {
+  // 模拟科室数据
+  departmentOptions.value = [
+    { label: '内科', value: 'internal' },
+    { label: '外科', value: 'surgery' },
+    { label: '儿科', value: 'pediatrics' },
+    { label: '妇产科', value: 'obstetrics' },
+    { label: '其他科室', value: 'others' },
+  ];
+
+  // 模拟医嘱类型数据
+  orderTypeOptions.value = [
+    { label: '药品', value: 'drug' },
+    { label: '检查', value: 'check' },
+    { label: '检验', value: 'test' },
+    { label: '治疗', value: 'treatment' },
+  ];
+
+  // 模拟项目数据
+  projectOptions.value = [
+    { label: '药品', value: 'drug' },
+    { label: '检查', value: 'check' },
+    { label: '检验', value: 'test' },
+    { label: '治疗', value: 'treatment' },
+  ];
+}
+
+// 处理医嘱类型切换
+function handleOrderTypeClick(tab) {
+  orderType.value = tab.paneName;
+  // 只更新医嘱列表，不影响费用列表
+  orderList.value = filterOrderList();
+}
+
+// 生成模拟床位计费数据
+function generateBedBillingData() {
+  // 模拟从接口获取的数据
+  // 住院天数随机生成1-30天
+  hospitalDays.value = Math.floor(Math.random() * 30) + 1;
+  // 计费数量根据住院天数生成
+  billingQuantity.value = Math.ceil(hospitalDays.value / 7);
+  // 总费用根据计费数量计算
+  totalCost.value = billingQuantity.value * 200; // 假设每部分费用200元
+}
+
+// 生成模拟医嘱数据
+function generateMockOrderData() {
+  return [
+    {
+      type: '长期',
+      content: '维生素C片【0.1g*100片/瓶】(住院西药房)',
+      unit: '0.1g(1片)',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '1',
+    },
+    {
+      type: '长期',
+      content: '盐酸地芬尼多片【25mg*30片】(住院西药房)',
+      unit: '25mg(1片)',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '2',
+    },
+    {
+      type: '长期',
+      content: '注射用头孢他啶【0.5g/瓶】(住院西药房)',
+      unit: '0.5g(1瓶)',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '3',
+    },
+    {
+      type: '长期',
+      content: '静脉注射2.0分/每日一次(9点)',
+      unit: '',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '4',
+    },
+    {
+      type: '长期',
+      content: '注射用苄星青霉素(基)【120万单位/瓶*10瓶/盒】(住院西药房)',
+      unit: '120万u/1瓶',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '5',
+    },
+    {
+      type: '长期',
+      content: '维生素K1注射液(国基)【10mg*1ml*10支/盒】(住院西药房)',
+      unit: '10mg/1支',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '6',
+    },
+    {
+      type: '护理',
+      content: '护理级别：III级护理',
+      unit: '',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '7',
+    },
+    {
+      type: '长期',
+      content: '病情：病重',
+      unit: '',
+      startDate: '2025-07-01',
+      endDate: '',
+      id: '8',
+    },
+  ];
+}
+
+// 生成模拟费用数据
+function generateMockFeeData() {
+  return [
+    {
+      itemName: '盐酸地芬尼多片',
+      unitPrice: 20.3,
+      quantity: 5,
+      amount: 3.4,
+      id: '1',
+    },
+    {
+      itemName: '维生素C片',
+      unitPrice: 12,
+      quantity: 5,
+      amount: 0.6,
+      id: '2',
+    },
+    {
+      itemName: '盐酸地芬尼多片',
+      unitPrice: 20.3,
+      quantity: 1,
+      amount: 0.68,
+      id: '3',
+    },
+  ];
+}
+// 重置执行科室
+function resetExecDepartment() {
+  execDepartment.value = '';
+}
+
+// 处理医嘱列表筛选
+function filterOrderList() {
+  let filteredOrders = generateMockOrderData();
+
+  // 应用红色框内的筛选条件（医嘱列表专用）
+  if (orderType.value === 'long') {
+    filteredOrders = filteredOrders.filter((item) => item.type === '长期');
+  } else if (orderType.value === 'temp') {
+    filteredOrders = filteredOrders.filter((item) => item.type === '临时');
+  }
+
+  // 执行科室筛选
+  if (execDepartment.value) {
+    // 这里可以根据实际业务逻辑进行筛选
+  }
+
+  // 医嘱类型筛选
+  if (specificOrderType.value) {
+    // 这里可以根据实际业务逻辑进行筛选
+  }
+
+  // 显示有效筛选
+  if (showValid.value) {
+    // 这里可以根据实际业务逻辑进行筛选
+  }
+
+  // 开方科室筛选
+  if (prescribeDept.value) {
+    // 这里可以根据实际业务逻辑进行筛选
+  }
+
+  return filteredOrders;
+}
+
+// 处理费用列表筛选
+function filterFeeList() {
+  let filteredFees = generateMockFeeData();
+
+  // 应用绿色框内的筛选条件（费用列表专用）
+
+  // 项目筛选
+  if (selectedProject.value) {
+    // 这里可以根据实际业务逻辑进行筛选
+  }
+
+  // 显示静脉筛选
+  if (showVenous.value) {
+    // 这里可以根据实际业务逻辑进行筛选
+  }
+
+  return filteredFees;
+}
+
+// 查询按钮点击
+function handleQuery() {
+  if (patientInfoList.value.length === 0) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+
+  loading.value = true;
+
+  // 模拟API调用延迟
+  setTimeout(() => {
+    // 分别独立筛选医嘱列表和费用列表
+    orderList.value = filterOrderList();
+    feeList.value = filterFeeList();
+
+    loading.value = false;
+  }, 500);
+}
+
+// 暴露方法供父组件调用
+defineExpose({
+  handleQuery,
+});
+</script>
+
+<style scoped>
+/* 日期tabs样式 */
+.date-tabs .el-tabs__header {
+  margin-bottom: 0;
+}
+
+.date-tabs .el-tabs__content {
+  display: none;
+}
+
+:deep(.el-table__header th) {
+  background-color: #f5f7fa !important;
+  font-weight: bold;
+}
+
+:deep(.el-table__row:hover > td) {
+  background-color: #f5f7fa !important;
+}
+
+/* 自定义复选框样式 */
+:deep(.el-checkbox__label) {
+  margin-left: 4px;
+}
+
+/* 调整按钮样式 */
+:deep(.el-button--primary) {
+  background-color: #409eff;
+  border-color: #409eff;
+}
+
+:deep(.el-button--text) {
+  color: #409eff;
+}
+
+.reset-btn {
+  width: 24px;
+  height: 24px;
+  border: none;
+  background-color: transparent;
+  cursor: pointer;
+  margin-left: 8px;
+  padding: 0;
+  border-radius: 50%;
+  transition: all 0.3s ease;
+}
+
+.reset-btn:hover {
+  background-color: #f5f7fa;
+  transform: scale(1.05);
+}
+
+.reset-btn:active {
+  transform: scale(0.95);
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js
new file mode 100644
index 00000000..ddfebc42
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js
@@ -0,0 +1,56 @@
+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
+  })
+}
+
+/**
+ * 执行医嘱
+ */
+export function adviceExecute(data) {
+  return request({
+    url: '/nurse-station/advice-process/advice-execute',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 取消执行医嘱
+ */
+export function adviceCancel(data) {
+  return request({
+    url: '/nurse-station/advice-process/advice-cancel',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/billingList.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/billingList.vue
new file mode 100644
index 00000000..cf8dcadf
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/billingList.vue
@@ -0,0 +1,388 @@
+<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;
+        padding: 0 15px;
+      "
+    >
+      <div style="display: flex; align-items: center">
+        <!-- 日期选择tabs -->
+        <el-tabs
+          v-model="dateRange"
+          type="card"
+          class="date-tabs"
+          @tab-click="handleDateTabClick"
+          style="margin-right: 20px"
+        >
+          <el-tab-pane label="今日" name="today"></el-tab-pane>
+          <el-tab-pane label="昨日" name="yesterday"></el-tab-pane>
+          <el-tab-pane label="其他" name="other"></el-tab-pane>
+        </el-tabs>
+
+        <!-- 日期选择器 -->
+        <el-date-picker
+          v-model="dateRangeValue"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="handleDatePickerChange"
+          style="width: 240px; margin-right: 20px"
+        />
+
+        <!-- 执行科室选择 -->
+        <el-select
+          v-model="execDepartment"
+          placeholder="请选择执行科室"
+          clearable
+          style="width: 150px; margin-right: 20px"
+        >
+          <el-option
+            v-for="dept in departmentOptions"
+            :key="dept.value"
+            :label="dept.label"
+            :value="dept.value"
+          />
+        </el-select>
+
+        <!-- 查询按钮 -->
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+      </div>
+
+      <div style="display: flex; align-items: center">
+        <!-- 全选开关 -->
+        <div style="display: flex; align-items: center; margin-right: 20px">
+          <span style="margin-right: 8px">全选：</span>
+          <el-switch v-model="selectAll" @change="handleSelectAll" />
+        </div>
+
+        <!-- 计费按钮 -->
+        <el-button type="primary" @click="handleCalculate">计费</el-button>
+
+        <!-- 批量划价按钮 -->
+        <el-button type="primary" plain @click="handleBatchPrice" style="margin-left: 20px"
+          >批量划价</el-button
+        >
+      </div>
+    </div>
+
+    <!-- 费用列表区域 -->
+    <div
+      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
+      v-loading="loading"
+    >
+      <el-table
+        ref="tableRef"
+        :data="billingList"
+        border
+        style="width: 100%"
+        :header-cell-style="{ background: '#eef9fd !important' }"
+      >
+        <el-table-column type="selection" align="center" width="50" />
+        <el-table-column label="医嘱内容" prop="orderContent" min-width="200" />
+        <el-table-column label="应执行日期" prop="executeDate" width="120" align="center" />
+        <el-table-column label="执行收费项目" prop="chargeItem" min-width="180" />
+        <el-table-column label="单价" prop="unitPrice" width="100" align="center">
+          <template #default="scope">
+            <el-input-number
+              v-model="scope.row.unitPrice"
+              :min="0"
+              :step="0.01"
+              style="width: 100px"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="使用数量" prop="quantity" width="100" align="center">
+          <template #default="scope">
+            <el-input-number v-model="scope.row.quantity" :min="1" :step="1" style="width: 100px" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100" align="center">
+          <template #default="scope">
+            <!-- <el-button type="primary" size="small" @click="handlePrice(scope.row)">划价</el-button> -->
+
+            <el-button type="primary" size="small" @click="handleDelete(scope.row)">撤销</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 无数据提示 -->
+      <el-empty v-if="!loading && billingList.length === 0" description="暂无数据" />
+    </div>
+
+    <!-- 使用计费弹窗组件 -->
+    <FeeDialog
+      v-model:visible="dialogVisible"
+      :initial-data="selectedFeeItems"
+      :patient-info="currentPatientInfo"
+      @confirm="handleFeeDialogConfirm"
+      @cancel="handleFeeDialogCancel"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
+import { formatDateStr } from '@/utils/index';
+import FeeDialog from './FeeDialog.vue';
+
+// 响应式数据
+const loading = ref(false);
+const billingList = ref([]);
+const dateRange = ref('today'); // today, yesterday, other
+const dateRangeValue = ref([]);
+const execDepartment = ref('');
+const selectAll = ref(false);
+const departmentOptions = ref([]);
+const tableRef = ref(null);
+
+// 计费弹窗相关数据
+const dialogVisible = ref(false);
+const selectedFeeItems = ref([]);
+const currentPatientInfo = ref('');
+
+// 初始化
+onMounted(() => {
+  // 设置默认日期
+  const today = new Date();
+  dateRangeValue.value = [formatDateStr(today, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
+
+  // 加载科室选项
+  loadDepartmentOptions();
+});
+
+// 加载科室选项
+function loadDepartmentOptions() {
+  // 模拟科室数据
+  departmentOptions.value = [
+    { label: '内科', value: 'internal' },
+    { label: '外科', value: 'surgery' },
+    { label: '儿科', value: 'pediatrics' },
+    { label: '妇产科', value: 'obstetrics' },
+    { label: '其他科室', value: 'others' },
+  ];
+}
+
+// 处理日期tabs点击
+function handleDateTabClick(tab) {
+  const rangeType = tab.paneName;
+  const today = new Date();
+  const yesterday = new Date();
+  yesterday.setDate(today.getDate() - 1);
+
+  switch (rangeType) {
+    case 'today':
+      dateRangeValue.value = [
+        formatDateStr(today, 'YYYY-MM-DD'),
+        formatDateStr(today, 'YYYY-MM-DD'),
+      ];
+      break;
+    case 'yesterday':
+      dateRangeValue.value = [
+        formatDateStr(yesterday, 'YYYY-MM-DD'),
+        formatDateStr(yesterday, 'YYYY-MM-DD'),
+      ];
+      break;
+    // other 情况保持用户选择的值
+  }
+}
+
+// 处理日期选择器变化
+function handleDatePickerChange() {
+  if (dateRangeValue.value.length > 0) {
+    dateRange.value = 'other';
+  }
+}
+
+// 生成模拟数据
+function generateMockData() {
+  const mockData = [
+    {
+      orderContent: '血常规检查',
+      executeDate: dateRangeValue.value[0],
+      chargeItem: '血液分析',
+      unitPrice: 35.0,
+      quantity: 1,
+      id: '1',
+    },
+    {
+      orderContent: '静脉注射',
+      executeDate: dateRangeValue.value[0],
+      chargeItem: '静脉输液',
+      unitPrice: 20.0,
+      quantity: 2,
+      id: '2',
+    },
+    {
+      orderContent: 'CT检查',
+      executeDate: dateRangeValue.value[0],
+      chargeItem: '胸部CT平扫',
+      unitPrice: 320.0,
+      quantity: 1,
+      id: '3',
+    },
+    {
+      orderContent: '药物治疗',
+      executeDate: dateRangeValue.value[0],
+      chargeItem: '抗生素注射',
+      unitPrice: 58.5,
+      quantity: 1,
+      id: '4',
+    },
+  ];
+
+  // 根据科室筛选模拟数据
+  if (execDepartment.value) {
+    // 模拟根据科室筛选
+    return mockData.filter((_, index) => index % 2 === 0);
+  }
+
+  return mockData;
+}
+
+// 查询按钮点击
+function handleQuery() {
+  if (patientInfoList.value.length === 0) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+
+  loading.value = true;
+
+  // 模拟API调用延迟
+  setTimeout(() => {
+    // 使用模拟数据
+    billingList.value = generateMockData();
+    loading.value = false;
+  }, 500);
+}
+
+// 全选/取消全选
+function handleSelectAll(value) {
+  selectAll.value = value;
+  if (tableRef.value) {
+    if (value) {
+      tableRef.value.toggleAllSelection();
+    } else {
+      // 取消全选
+      tableRef.value.clearSelection();
+    }
+  }
+}
+
+// 打开计费弹窗
+function handleCalculate() {
+  // 获取选中的数据
+  const selectedRows = getSelectedRows();
+  // if (selectedRows.length === 0) {
+  //   ElMessage.warning('请先选择要计费的项目');
+  //   return;
+  // }
+
+  // 设置弹窗初始数据
+  selectedFeeItems.value = [...selectedRows];
+
+  // 设置患者信息
+  if (patientInfoList.value.length > 0) {
+    const patient = patientInfoList.value[0];
+    currentPatientInfo.value = `${patient.patientName || '未知患者'}`;
+  }
+
+  // 显示弹窗
+  dialogVisible.value = true;
+}
+
+// 处理计费弹窗确认
+function handleFeeDialogConfirm(data) {
+  // 模拟计费操作
+  setTimeout(() => {
+    ElMessage.success('计费成功');
+    // 刷新数据
+    handleQuery();
+  }, 300);
+}
+
+// 处理计费弹窗取消
+function handleFeeDialogCancel() {
+  // 可以在这里添加取消后的处理逻辑
+}
+
+// 批量划价
+function handleBatchPrice() {
+  // 获取选中的数据
+  const selectedRows = getSelectedRows();
+  if (selectedRows.length === 0) {
+    ElMessage.warning('请先选择要划价的项目');
+    return;
+  }
+
+  // 模拟批量划价操作
+  setTimeout(() => {
+    ElMessage.success(`批量划价成功，共${selectedRows.length}项`);
+    // 更新状态，模拟已划价
+    selectedRows.forEach((row) => {
+      row.status = 'priced';
+    });
+  }, 300);
+}
+
+// 单项划价
+function handlePrice(row) {
+  // 模拟单项划价操作
+  setTimeout(() => {
+    ElMessage.success('划价成功');
+    // 更新状态，模拟已划价
+    row.status = 'priced';
+  }, 300);
+}
+function handleDelete(row) {
+  // 从数据列表中删除当前行
+  const index = billingList.value.findIndex((item) => item.id === row.id);
+  if (index !== -1) {
+    billingList.value.splice(index, 1);
+    ElMessage.success('撤销成功');
+  }
+}
+
+// 获取选中的行
+function getSelectedRows() {
+  if (tableRef.value) {
+    return tableRef.value.selection || [];
+  }
+  return [];
+}
+
+// 暴露方法供父组件调用
+defineExpose({
+  handleQuery,
+});
+</script>
+
+<style scoped>
+/* 日期tabs样式 */
+.date-tabs .el-tabs__header {
+  margin-bottom: 0;
+}
+
+.date-tabs .el-tabs__content {
+  display: none;
+}
+
+:deep(.el-table__header th) {
+  background-color: #eef9fd !important;
+}
+
+:deep(.el-table__row:hover > td) {
+  background-color: #eef9fd !important;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue
new file mode 100644
index 00000000..911f9e9e
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue
@@ -0,0 +1,490 @@
+<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;
+        padding: 0 15px;
+      "
+    >
+      <div style="display: flex; align-items: center">
+        <!-- 日期选择tabs -->
+        <el-tabs
+          v-model="dateRange"
+          type="card"
+          class="date-tabs"
+          @tab-click="handleDateTabClick"
+          style="margin-right: 20px"
+        >
+          <el-tab-pane label="今日" name="today"></el-tab-pane>
+          <el-tab-pane label="昨日" name="yesterday"></el-tab-pane>
+          <el-tab-pane label="其他" name="other"></el-tab-pane>
+        </el-tabs>
+
+        <!-- 日期选择器 -->
+        <el-date-picker
+          v-model="dateRangeValue"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="handleDatePickerChange"
+          style="width: 240px; margin-right: 20px"
+        />
+
+        <!-- 缴费方式选择 -->
+        <el-select
+          v-model="paymentMethod"
+          placeholder="请选择缴费方式"
+          clearable
+          style="width: 150px; margin-right: 20px"
+        >
+          <el-option
+            v-for="method in paymentMethodOptions"
+            :key="method.value"
+            :label="method.label"
+            :value="method.value"
+          />
+        </el-select>
+
+        <!-- 查询按钮 -->
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+      </div>
+
+      <div style="display: flex; align-items: center">
+        <!-- 导出按钮 -->
+        <el-button @click="handleExport">导出</el-button>
+
+        <!-- 打印按钮 -->
+        <el-button @click="handlePrint" style="margin-left: 15px">打印</el-button>
+      </div>
+    </div>
+
+    <!-- 预交金列表区域 -->
+    <div
+      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
+      v-loading="loading"
+    >
+      <!-- 费用汇总信息 -->
+      <div style="background-color: white; padding: 15px; margin-bottom: 10px; border-radius: 4px;">
+        <div style="display: flex; justify-content: flex-end; align-items: center">
+          <div style="text-align: right;">
+            <p style="margin: 0; font-size: 18px; font-weight: bold; color: #ff4d4f;">
+              合计金额：¥{{ totalAmount.toFixed(2) }}
+            </p>
+            <p style="margin: 5px 0; color: #606266; font-size: 14px;">缴费次数：{{ depositList.length }}次</p>
+          </div>
+        </div>
+      </div>
+
+      <el-table
+        ref="tableRef"
+        :data="depositList"
+        border
+        style="width: 100%"
+        :header-cell-style="{ background: '#eef9fd !important' }"
+        @sort-change="handleSortChange"
+      >
+        <el-table-column label="序号" type="index" width="60" align="center" />
+        <el-table-column label="预交金编号" prop="depositNo" min-width="180" />
+        <el-table-column label="金额" prop="amount" width="120" align="center" sortable>
+          <template #default="scope">
+            <span style="color: #ff4d4f">{{ scope.row.amount.toFixed(2) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="缴费方式" prop="paymentMethodName" width="120" align="center" />
+        <el-table-column label="缴费时间" prop="paymentTime" width="150" align="center" sortable />
+        <el-table-column label="收费员" prop="cashier" width="100" align="center" />
+      </el-table>
+
+      <!-- 分页 -->
+      <div style="margin-top: 15px; display: flex; justify-content: flex-end;">
+        <el-pagination
+          v-model:current-page="currentPage"
+          v-model:page-size="pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+
+      <!-- 无数据提示 -->
+      <el-empty v-if="!loading && depositList.length === 0" description="暂无预交金数据" />
+    </div>
+
+    <!-- 打印预览弹窗 -->
+    <el-dialog v-model="printDialogVisible" title="打印预览" width="80%" :close-on-click-modal="false">
+      <div id="print-content">
+        <div style="text-align: center; margin-bottom: 20px;">
+          <h2 style="margin: 0;">预交金清单</h2>
+          <p style="margin: 5px 0;">患者姓名：{{ patientInfo || '未选择患者' }}</p>
+          <p style="margin: 5px 0;">费用周期：{{ formatDateRange() }}</p>
+        </div>
+        
+        <table style="width: 100%; border-collapse: collapse;">
+          <thead>
+            <tr style="background-color: #eef9fd;">
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">序号</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">预交金编号</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">金额</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">缴费方式</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">缴费时间</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">收费员</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(item, index) in depositList" :key="item.id">
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ index + 1 }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.depositNo }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.amount.toFixed(2) }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.paymentMethodName }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.paymentTime }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.cashier }}</td>
+            </tr>
+          </tbody>
+          <tfoot>
+            <tr style="background-color: #f5f7fa;">
+              <td colspan="2" style="border: 1px solid #e4e7ed; padding: 8px; text-align: right; font-weight: bold;">合计：</td>
+              <td colspan="4" style="border: 1px solid #e4e7ed; padding: 8px; color: #ff4d4f; font-weight: bold;">¥{{ totalAmount.toFixed(2) }}</td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+      
+      <template #footer>
+        <el-button @click="printDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="doPrint">打印</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
+import { getSinglePatient } from '../store/patient.js'; // 导入获取单选患者信息的方法
+import { formatDateStr } from '@/utils/index';
+
+// 响应式数据
+const loading = ref(false);
+const depositList = ref([]);
+const dateRange = ref('today'); // today, yesterday, other
+const dateRangeValue = ref([]);
+const paymentMethod = ref('');
+const paymentMethodOptions = ref([]);
+const tableRef = ref(null);
+const patientInfo = ref('');
+
+// 分页相关
+const currentPage = ref(1);
+const pageSize = ref(20);
+const total = ref(0);
+
+// 打印相关
+const printDialogVisible = ref(false);
+
+// 计算总金额
+const totalAmount = computed(() => {
+  return depositList.value.reduce((sum, item) => {
+    return sum + (item.amount || 0);
+  }, 0);
+});
+
+// 初始化
+onMounted(() => {
+  // 设置默认日期
+  const today = new Date();
+  dateRangeValue.value = [formatDateStr(today, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
+
+  // 加载缴费方式选项
+  loadPaymentMethodOptions();
+  
+  // 监听患者选择变化
+  watchPatientSelection();
+});
+
+// 监听患者选择变化
+function watchPatientSelection() {
+  // 定期检查患者选择状态变化
+  setInterval(() => {
+    // 使用getSinglePatient方法获取单选患者信息
+    const selectedPatient = getSinglePatient();
+    if (selectedPatient) {
+      patientInfo.value = selectedPatient.patientName || '';
+    } else {
+      patientInfo.value = '未选择患者';
+    }
+  }, 300);
+}
+
+// 加载缴费方式选项
+function loadPaymentMethodOptions() {
+  // 模拟缴费方式数据
+  paymentMethodOptions.value = [
+    { label: '现金', value: 'cash' },
+    { label: '银行卡', value: 'bankcard' },
+    { label: '微信支付', value: 'wechat' },
+    { label: '支付宝', value: 'alipay' },
+    { label: '其他', value: 'others' },
+  ];
+}
+
+// 处理日期tabs点击
+function handleDateTabClick(tab) {
+  const rangeType = tab.paneName;
+  const today = new Date();
+  const yesterday = new Date();
+  yesterday.setDate(today.getDate() - 1);
+
+  switch (rangeType) {
+    case 'today':
+      dateRangeValue.value = [
+        formatDateStr(today, 'YYYY-MM-DD'),
+        formatDateStr(today, 'YYYY-MM-DD'),
+      ];
+      break;
+    case 'yesterday':
+      dateRangeValue.value = [
+        formatDateStr(yesterday, 'YYYY-MM-DD'),
+        formatDateStr(yesterday, 'YYYY-MM-DD'),
+      ];
+      break;
+    // other 情况保持用户选择的值
+  }
+}
+
+// 处理日期选择器变化
+function handleDatePickerChange() {
+  if (dateRangeValue.value.length > 0) {
+    dateRange.value = 'other';
+  }
+}
+
+// 格式化日期范围显示
+function formatDateRange() {
+  if (dateRangeValue.value && dateRangeValue.value.length === 2) {
+    return `${dateRangeValue.value[0]} 至 ${dateRangeValue.value[1]}`;
+  }
+  return '';
+}
+
+// 生成模拟数据
+function generateMockData() {
+  // 缴费方式映射
+  const paymentMethodMap = {
+    'cash': '现金',
+    'bankcard': '银行卡',
+    'wechat': '微信支付',
+    'alipay': '支付宝',
+    'others': '其他'
+  };
+  
+  // 生成模拟数据
+  const mockData = [];
+  const baseDate = new Date(dateRangeValue.value[0]);
+  const endDate = new Date(dateRangeValue.value[1]);
+  const daysDiff = Math.ceil((endDate - baseDate) / (1000 * 60 * 60 * 24)) + 1;
+  
+  // 收费员池
+  const cashiers = ['收费员A', '收费员B', '收费员C', '收费员D'];
+  
+  // 生成数据
+  let id = 1;
+  for (let day = 0; day < daysDiff; day++) {
+    const currentDate = new Date(baseDate);
+    currentDate.setDate(baseDate.getDate() + day);
+    
+    // 每天生成1-3条记录
+    const recordsCount = Math.floor(Math.random() * 3) + 1;
+    for (let i = 0; i < recordsCount; i++) {
+      // 随机选择一个缴费方式
+      const paymentMethods = paymentMethod.value ? [paymentMethod.value] : Object.keys(paymentMethodMap);
+      const randomMethod = paymentMethods[Math.floor(Math.random() * paymentMethods.length)];
+      
+      // 生成随机金额 (500-5000元)
+      const amount = Math.floor(Math.random() * 4500) + 500;
+      
+      // 生成时间
+      const hours = Math.floor(Math.random() * 8) + 8; // 8-16点
+      const minutes = Math.floor(Math.random() * 60);
+      const seconds = Math.floor(Math.random() * 60);
+      currentDate.setHours(hours, minutes, seconds);
+      const timeStr = formatDateStr(currentDate, 'YYYY-MM-DD HH:mm:ss');
+      
+      // 生成预交金编号 (示例格式：5000120200001)
+      const dateCode = formatDateStr(currentDate, 'YYYYMMDD');
+      const serialNum = String(id).padStart(6, '0');
+      const depositNo = `500${dateCode.slice(2)}${serialNum}`;
+      
+      mockData.push({
+        id: id++,
+        depositNo: depositNo,
+        amount: amount,
+        paymentMethod: randomMethod,
+        paymentMethodName: paymentMethodMap[randomMethod],
+        paymentTime: timeStr,
+        cashier: cashiers[Math.floor(Math.random() * cashiers.length)]
+      });
+    }
+  }
+  
+  return mockData;
+}
+
+// 查询按钮点击
+function handleQuery() {
+  // 添加调试日志，查看患者列表数据结构
+  console.log('患者列表数据:', patientInfoList.value);
+  
+  // 使用getSinglePatient方法获取单选患者信息
+  const selectedPatient = getSinglePatient();
+  
+  if (!selectedPatient) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+  
+  // 更新患者信息显示
+  const patientName = selectedPatient.patientName || 
+                     selectedPatient.name || 
+                     selectedPatient.patientInfo || 
+                     selectedPatient.patient || 
+                     '未命名患者';
+  patientInfo.value = patientName;
+  
+  loading.value = true;
+
+  // 模拟API调用延迟
+  setTimeout(() => {
+    try {
+      // 使用模拟数据
+      const allData = generateMockData();
+      total.value = allData.length;
+      
+      // 分页处理
+      const start = (currentPage.value - 1) * pageSize.value;
+      const end = start + pageSize.value;
+      depositList.value = allData.slice(start, end);
+    } catch (error) {
+      console.error('查询错误:', error);
+      ElMessage.error('查询失败，请重试');
+      depositList.value = [];
+      total.value = 0;
+    } finally {
+      loading.value = false;
+    }
+  }, 500);
+}
+
+// 处理排序变化
+function handleSortChange({ prop, order }) {
+  const sortedData = [...depositList.value];
+  
+  if (order === 'ascending') {
+    sortedData.sort((a, b) => (a[prop] > b[prop]) ? 1 : -1);
+  } else if (order === 'descending') {
+    sortedData.sort((a, b) => (a[prop] < b[prop]) ? 1 : -1);
+  }
+  
+  depositList.value = sortedData;
+}
+
+// 处理分页大小变化
+function handleSizeChange(newSize) {
+  pageSize.value = newSize;
+  currentPage.value = 1;
+  handleQuery();
+}
+
+// 处理当前页变化
+function handleCurrentChange(newCurrent) {
+  currentPage.value = newCurrent;
+  handleQuery();
+}
+
+// 导出
+function handleExport() {
+  if (depositList.value.length === 0) {
+    ElMessage.warning('暂无数据可导出');
+    return;
+  }
+  
+  // 模拟导出操作
+  ElMessage.success('导出成功');
+  // 实际项目中这里应该调用导出API或使用Excel库生成文件
+}
+
+// 打印预览
+function handlePrint() {
+  if (depositList.value.length === 0) {
+    ElMessage.warning('暂无数据可打印');
+    return;
+  }
+  
+  printDialogVisible.value = true;
+}
+
+// 执行打印
+function doPrint() {
+  try {
+    // 获取要打印的内容
+    const printContent = document.getElementById('print-content').innerHTML;
+    
+    // 创建临时窗口
+    const printWindow = window.open('', '_blank');
+    
+    // 写入内容
+    printWindow.document.write(`
+      <html>
+        <head>
+          <title>预交金清单</title>
+          <style>
+            body { font-family: Arial, sans-serif; margin: 20px; }
+            table { width: 100%; border-collapse: collapse; }
+            th, td { border: 1px solid #ccc; padding: 8px; }
+            th { background-color: #f2f2f2; }
+            tfoot { font-weight: bold; }
+            .total-row { background-color: #f5f5f5; }
+          </style>
+        </head>
+        <body>
+          ${printContent}
+        </body>
+      </html>
+    `);
+    
+    // 打印
+    printWindow.document.close();
+    printWindow.focus();
+    printWindow.print();
+  } catch (e) {
+    ElMessage.error('打印失败');
+    console.error('Print error:', e);
+  }
+}
+
+// 暴露方法供父组件调用
+defineExpose({
+  handleQuery,
+});
+</script>
+
+<style scoped>
+/* 日期tabs样式 */
+.date-tabs .el-tabs__header {
+  margin-bottom: 0;
+}
+
+.date-tabs .el-tabs__content {
+  display: none;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/feeDetailQuery.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/feeDetailQuery.vue
new file mode 100644
index 00000000..f0093a2d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/feeDetailQuery.vue
@@ -0,0 +1,611 @@
+<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;
+        padding: 0 15px;
+      "
+    >
+      <div style="display: flex; align-items: center">
+        <!-- 日期选择tabs -->
+        <el-tabs
+          v-model="dateRange"
+          type="card"
+          class="date-tabs"
+          @tab-click="handleDateTabClick"
+          style="margin-right: 20px"
+        >
+          <el-tab-pane label="今日" name="today"></el-tab-pane>
+          <el-tab-pane label="昨日" name="yesterday"></el-tab-pane>
+          <el-tab-pane label="其他" name="other"></el-tab-pane>
+        </el-tabs>
+
+        <!-- 日期选择器 -->
+        <el-date-picker
+          v-model="dateRangeValue"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="handleDatePickerChange"
+          style="width: 240px; margin-right: 20px"
+        />
+
+        <!-- 费用类型选择 -->
+        <el-select
+          v-model="feeType"
+          placeholder="请选择费用类型"
+          clearable
+          style="width: 150px; margin-right: 20px"
+        >
+          <el-option
+            v-for="type in feeTypeOptions"
+            :key="type.value"
+            :label="type.label"
+            :value="type.value"
+          />
+        </el-select>
+
+        <!-- 执行科室选择 -->
+        <el-select
+          v-model="execDepartment"
+          placeholder="请选择执行科室"
+          clearable
+          style="width: 150px; margin-right: 20px"
+        >
+          <el-option
+            v-for="dept in departmentOptions"
+            :key="dept.value"
+            :label="dept.label"
+            :value="dept.value"
+          />
+        </el-select>
+
+        <!-- 查询按钮 -->
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+      </div>
+
+      <div style="display: flex; align-items: center">
+        <!-- 导出按钮 -->
+        <el-button @click="handleExport">导出</el-button>
+
+        <!-- 打印按钮 -->
+        <el-button @click="handlePrint" style="margin-left: 15px">打印</el-button>
+      </div>
+    </div>
+
+    <!-- 费用明细列表区域 -->
+    <div
+      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
+      v-loading="loading"
+    >
+      <!-- 费用汇总信息 -->
+      <div style="background-color: white; padding: 15px; margin-bottom: 10px; border-radius: 4px;">
+        <div style="display: flex; justify-content: space-between; align-items: center">
+          <div>
+            <h3 style="margin: 0; font-weight: normal; color: #303133;">费用汇总</h3>
+            <p style="margin: 5px 0; color: #606266; font-size: 14px;">费用周期：{{ formatDateRange() }}</p>
+          </div>
+          <div style="text-align: right;">
+            <p style="margin: 0; font-size: 18px; font-weight: bold; color: #ff4d4f;">
+              合计金额：¥{{ totalAmount.toFixed(2) }}
+            </p>
+            <p style="margin: 5px 0; color: #606266; font-size: 14px;">明细项数：{{ feeDetailList.length }}项</p>
+          </div>
+        </div>
+      </div>
+
+      <el-table
+        ref="tableRef"
+        :data="feeDetailList"
+        border
+        style="width: 100%"
+        :header-cell-style="{ background: '#eef9fd !important' }"
+        @sort-change="handleSortChange"
+      >
+        <el-table-column label="项目名称" prop="itemName" min-width="200" />
+        <el-table-column label="费用类型" prop="feeTypeName" width="120" align="center" />
+        <el-table-column label="单价" prop="unitPrice" width="100" align="center" sortable />
+        <el-table-column label="数量" prop="quantity" width="100" align="center" sortable />
+        <el-table-column label="金额" prop="amount" width="100" align="center" sortable>
+          <template #default="scope">
+            <span style="color: #ff4d4f">{{ scope.row.amount.toFixed(2) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="执行科室" prop="execDept" width="120" align="center" />
+        <el-table-column label="执行人" prop="executor" width="100" align="center" />
+        <el-table-column label="执行日期" prop="executeDate" width="120" align="center" />
+        <el-table-column label="医保类型" prop="insuranceType" width="100" align="center">
+          <template #default="scope">
+            <el-tag v-if="scope.row.insuranceType" size="small">{{ scope.row.insuranceType }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark" min-width="150" />
+      </el-table>
+
+      <!-- 分页 -->
+      <div style="margin-top: 15px; display: flex; justify-content: flex-end;">
+        <el-pagination
+          v-model:current-page="currentPage"
+          v-model:page-size="pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+
+      <!-- 无数据提示 -->
+      <el-empty v-if="!loading && feeDetailList.length === 0" description="暂无费用明细数据" />
+    </div>
+
+    <!-- 打印预览弹窗 -->
+    <el-dialog v-model="printDialogVisible" title="打印预览" width="80%" :close-on-click-modal="false">
+      <div id="print-content">
+        <div style="text-align: center; margin-bottom: 20px;">
+          <h2 style="margin: 0;">费用明细清单</h2>
+          <p style="margin: 5px 0;">患者姓名：{{ patientInfo || '未选择患者' }}</p>
+          <p style="margin: 5px 0;">费用周期：{{ formatDateRange() }}</p>
+        </div>
+        
+        <table style="width: 100%; border-collapse: collapse;">
+          <thead>
+            <tr style="background-color: #eef9fd;">
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">项目名称</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">费用类型</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">单价</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">数量</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">金额</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">执行科室</th>
+              <th style="border: 1px solid #e4e7ed; padding: 8px;">执行日期</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="item in feeDetailList" :key="item.id">
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.itemName }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.feeTypeName }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.unitPrice.toFixed(2) }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.quantity }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.amount.toFixed(2) }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.execDept }}</td>
+              <td style="border: 1px solid #e4e7ed; padding: 8px;">{{ item.executeDate }}</td>
+            </tr>
+          </tbody>
+          <tfoot>
+            <tr style="background-color: #f5f7fa;">
+              <td colspan="4" style="border: 1px solid #e4e7ed; padding: 8px; text-align: right; font-weight: bold;">合计：</td>
+              <td colspan="3" style="border: 1px solid #e4e7ed; padding: 8px; color: #ff4d4f; font-weight: bold;">¥{{ totalAmount.toFixed(2) }}</td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+      
+      <template #footer>
+        <el-button @click="printDialogVisible = false">关闭</el-button>
+        <el-button type="primary" @click="doPrint">打印</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { ElMessage } from 'element-plus';
+import { patientInfoList } from '../../medicalOrderExecution/store/patient.js';
+import { formatDateStr } from '@/utils/index';
+
+// 响应式数据
+const loading = ref(false);
+const feeDetailList = ref([]);
+const dateRange = ref('today'); // today, yesterday, other
+const dateRangeValue = ref([]);
+const feeType = ref('');
+const execDepartment = ref('');
+const departmentOptions = ref([]);
+const feeTypeOptions = ref([]);
+const tableRef = ref(null);
+const patientInfo = ref('');
+
+// 分页相关
+const currentPage = ref(1);
+const pageSize = ref(20);
+const total = ref(0);
+
+// 打印相关
+const printDialogVisible = ref(false);
+
+// 计算总金额
+const totalAmount = computed(() => {
+  return feeDetailList.value.reduce((sum, item) => {
+    return sum + (item.amount || 0);
+  }, 0);
+});
+
+// 初始化
+onMounted(() => {
+  // 设置默认日期
+  const today = new Date();
+  dateRangeValue.value = [formatDateStr(today, 'YYYY-MM-DD'), formatDateStr(today, 'YYYY-MM-DD')];
+
+  // 加载科室选项
+  loadDepartmentOptions();
+  
+  // 加载费用类型选项
+  loadFeeTypeOptions();
+  
+  // 监听患者选择变化
+  watchPatientSelection();
+});
+
+// 监听患者选择变化
+function watchPatientSelection() {
+  // 定期检查患者选择状态变化
+  setInterval(() => {
+    if (patientInfoList.value && patientInfoList.value.length > 0) {
+      const selectedPatient = patientInfoList.value.find(patient => patient.selected === true);
+      if (selectedPatient) {
+        patientInfo.value = selectedPatient.patientName || '';
+      } else {
+        patientInfo.value = '未选择患者';
+      }
+    } else {
+      patientInfo.value = '未选择患者';
+    }
+  }, 300);
+}
+
+// 加载科室选项
+function loadDepartmentOptions() {
+  // 模拟科室数据
+  departmentOptions.value = [
+    { label: '内科', value: 'internal' },
+    { label: '外科', value: 'surgery' },
+    { label: '儿科', value: 'pediatrics' },
+    { label: '妇产科', value: 'obstetrics' },
+    { label: '检验科', value: 'laboratory' },
+    { label: '影像科', value: 'imaging' },
+    { label: '其他科室', value: 'others' },
+  ];
+}
+
+// 加载费用类型选项
+function loadFeeTypeOptions() {
+  // 模拟费用类型数据
+  feeTypeOptions.value = [
+    { label: '检查费', value: 'examine' },
+    { label: '治疗费', value: 'treatment' },
+    { label: '药品费', value: 'medicine' },
+    { label: '材料费', value: 'material' },
+    { label: '床位费', value: 'bed' },
+    { label: '其他费用', value: 'others' },
+  ];
+}
+
+// 处理日期tabs点击
+function handleDateTabClick(tab) {
+  const rangeType = tab.paneName;
+  const today = new Date();
+  const yesterday = new Date();
+  yesterday.setDate(today.getDate() - 1);
+
+  switch (rangeType) {
+    case 'today':
+      dateRangeValue.value = [
+        formatDateStr(today, 'YYYY-MM-DD'),
+        formatDateStr(today, 'YYYY-MM-DD'),
+      ];
+      break;
+    case 'yesterday':
+      dateRangeValue.value = [
+        formatDateStr(yesterday, 'YYYY-MM-DD'),
+        formatDateStr(yesterday, 'YYYY-MM-DD'),
+      ];
+      break;
+    // other 情况保持用户选择的值
+  }
+}
+
+// 处理日期选择器变化
+function handleDatePickerChange() {
+  if (dateRangeValue.value.length > 0) {
+    dateRange.value = 'other';
+  }
+}
+
+// 格式化日期范围显示
+function formatDateRange() {
+  if (dateRangeValue.value && dateRangeValue.value.length === 2) {
+    return `${dateRangeValue.value[0]} 至 ${dateRangeValue.value[1]}`;
+  }
+  return '';
+}
+
+// 生成模拟数据
+function generateMockData() {
+  // 费用类型映射
+  const feeTypeMap = {
+    'examine': '检查费',
+    'treatment': '治疗费',
+    'medicine': '药品费',
+    'material': '材料费',
+    'bed': '床位费',
+    'others': '其他费用'
+  };
+  
+  // 科室映射
+  const deptMap = {
+    'internal': '内科',
+    'surgery': '外科',
+    'pediatrics': '儿科',
+    'obstetrics': '妇产科',
+    'laboratory': '检验科',
+    'imaging': '影像科',
+    'others': '其他科室'
+  };
+  
+  // 项目数据池
+  const itemPools = {
+    'examine': ['血常规检查', '尿常规检查', '肝功能检查', '肾功能检查', '胸部CT', '心电图', 'B超'],
+    'treatment': ['静脉输液', '肌肉注射', '氧气吸入', '导尿', '换药', '雾化吸入'],
+    'medicine': ['抗生素注射液', '维生素C片', '感冒药', '止痛药', '降压药', '消炎药'],
+    'material': ['一次性输液器', '注射器', '医用棉花', '纱布', '胶带', '一次性手套'],
+    'bed': ['普通病房床位', 'ICU床位', '单人病房床位', '双人病房床位'],
+    'others': ['护理费', '诊疗费', '挂号费', '病历费']
+  };
+  
+  // 合并所有项目到allItems数组中（修复：添加这部分代码）
+  let allItems = [];
+  Object.keys(itemPools).forEach(type => {
+    itemPools[type].forEach(item => {
+      allItems.push({
+        type: type,
+        name: item
+      });
+    });
+  });
+  
+  // 筛选条件
+  if (feeType.value) {
+    allItems = allItems.filter(item => item.type === feeType.value);
+  }
+  
+  // 生成模拟数据
+  const mockData = [];
+  const baseDate = new Date(dateRangeValue.value[0]);
+  const endDate = new Date(dateRangeValue.value[1]);
+  const daysDiff = Math.ceil((endDate - baseDate) / (1000 * 60 * 60 * 24)) + 1;
+  
+  // 执行人池
+  const executors = ['护士A', '护士B', '医生A', '医生B', '技师A'];
+  
+  // 生成数据
+  let id = 1;
+  for (let day = 0; day < daysDiff; day++) {
+    const currentDate = new Date(baseDate);
+    currentDate.setDate(baseDate.getDate() + day);
+    const dateStr = formatDateStr(currentDate, 'YYYY-MM-DD');
+    
+    // 每天生成3-8条记录
+    const recordsCount = Math.floor(Math.random() * 6) + 3;
+    for (let i = 0; i < recordsCount; i++) {
+      // 随机选择一个项目
+      const randomItemIndex = Math.floor(Math.random() * allItems.length);
+      const selectedItem = allItems[randomItemIndex];
+      
+      // 随机选择一个科室
+      const deptKeys = Object.keys(deptMap);
+      const randomDeptKey = deptKeys[Math.floor(Math.random() * deptKeys.length)];
+      
+      // 如果有科室筛选且不符合，则跳过
+      if (execDepartment.value && randomDeptKey !== execDepartment.value) {
+        continue;
+      }
+      
+      // 生成随机单价和数量
+      const unitPrice = Math.floor(Math.random() * 190) + 10; // 10-200元
+      const quantity = Math.floor(Math.random() * 3) + 1; // 1-4
+      
+      // 医保类型
+      const insuranceTypes = ['', '甲类', '乙类', '丙类'];
+      const insuranceType = insuranceTypes[Math.floor(Math.random() * insuranceTypes.length)];
+      
+      mockData.push({
+        id: `item-${id++}`,
+        itemName: selectedItem.name,
+        feeType: selectedItem.type,
+        feeTypeName: feeTypeMap[selectedItem.type],
+        unitPrice: unitPrice,
+        quantity: quantity,
+        amount: unitPrice * quantity,
+        execDept: deptMap[randomDeptKey],
+        executor: executors[Math.floor(Math.random() * executors.length)],
+        executeDate: dateStr,
+        insuranceType: insuranceType,
+        remark: ''
+      });
+    }
+  }
+  
+  return mockData;
+}
+
+// 查询按钮点击
+function handleQuery() {
+  // 添加调试日志，查看患者列表数据结构
+  console.log('患者列表数据:', patientInfoList.value);
+  
+  // 更灵活的患者选择检测逻辑
+  let selectedPatient = null;
+  
+  if (patientInfoList.value && patientInfoList.value.length > 0) {
+    // 尝试查找选中状态的患者
+    selectedPatient = patientInfoList.value.find(patient => 
+      patient.selected === true || 
+      patient.checked === true || 
+      patient.isChecked === true ||
+      (typeof patient.selected === 'string' && patient.selected === '1')
+    );
+    
+    // 如果没有明确选中的患者，就使用列表中的第一个患者
+    if (!selectedPatient) {
+      selectedPatient = patientInfoList.value[0];
+    }
+  }
+  
+  // 即使没有明确选中的患者标志，也应该允许查询
+  if (!selectedPatient) {
+    ElMessage.warning('请先选择患者');
+    return;
+  }
+  
+  // 更新患者信息显示 - 修复：确保正确获取患者姓名
+  const patientName = selectedPatient.patientName || 
+                     selectedPatient.name || 
+                     selectedPatient.patientInfo || 
+                     selectedPatient.patient || 
+                     '未命名患者';
+  patientInfo.value = patientName;
+  
+  loading.value = true;
+
+  // 模拟API调用延迟
+  setTimeout(() => {
+    try {
+      // 使用模拟数据
+      const allData = generateMockData();
+      total.value = allData.length;
+      
+      // 分页处理
+      const start = (currentPage.value - 1) * pageSize.value;
+      const end = start + pageSize.value;
+      feeDetailList.value = allData.slice(start, end);
+    } catch (error) {
+      console.error('查询错误:', error);
+      ElMessage.error('查询失败，请重试');
+      feeDetailList.value = [];
+      total.value = 0;
+    } finally {
+      loading.value = false;
+    }
+  }, 500);
+}
+
+// 处理排序变化
+function handleSortChange({ prop, order }) {
+  const sortedData = [...feeDetailList.value];
+  
+  if (order === 'ascending') {
+    sortedData.sort((a, b) => (a[prop] > b[prop]) ? 1 : -1);
+  } else if (order === 'descending') {
+    sortedData.sort((a, b) => (a[prop] < b[prop]) ? 1 : -1);
+  }
+  
+  feeDetailList.value = sortedData;
+}
+
+// 处理分页大小变化
+function handleSizeChange(newSize) {
+  pageSize.value = newSize;
+  currentPage.value = 1;
+  handleQuery();
+}
+
+// 处理当前页变化
+function handleCurrentChange(newCurrent) {
+  currentPage.value = newCurrent;
+  handleQuery();
+}
+
+// 导出
+function handleExport() {
+  if (feeDetailList.value.length === 0) {
+    ElMessage.warning('暂无数据可导出');
+    return;
+  }
+  
+  // 模拟导出操作
+  ElMessage.success('导出成功');
+  // 实际项目中这里应该调用导出API或使用Excel库生成文件
+}
+
+// 打印预览
+function handlePrint() {
+  if (feeDetailList.value.length === 0) {
+    ElMessage.warning('暂无数据可打印');
+    return;
+  }
+  
+  printDialogVisible.value = true;
+}
+
+// 执行打印
+function doPrint() {
+  try {
+    // 获取要打印的内容
+    const printContent = document.getElementById('print-content').innerHTML;
+    
+    // 创建临时窗口
+    const printWindow = window.open('', '_blank');
+    
+    // 写入内容
+    printWindow.document.write(`
+      <html>
+        <head>
+          <title>费用明细清单</title>
+          <style>
+            body { font-family: Arial, sans-serif; margin: 20px; }
+            table { width: 100%; border-collapse: collapse; }
+            th, td { border: 1px solid #ccc; padding: 8px; }
+            th { background-color: #f2f2f2; }
+            tfoot { font-weight: bold; }
+            .total-row { background-color: #f5f5f5; }
+          </style>
+        </head>
+        <body>
+          ${printContent}
+        </body>
+      </html>
+    `);
+    
+    // 打印
+    printWindow.document.close();
+    printWindow.focus();
+    printWindow.print();
+  } catch (e) {
+    ElMessage.error('打印失败');
+    console.error('Print error:', e);
+  }
+}
+
+// 暴露方法供父组件调用
+defineExpose({
+  handleQuery,
+});
+</script>
+
+<style scoped>
+/* 日期tabs样式 */
+.date-tabs .el-tabs__header {
+  margin-bottom: 0;
+}
+
+.date-tabs .el-tabs__content {
+  display: none;
+}
+
+:deep(.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/InpatientBilling/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/index.vue
new file mode 100644
index 00000000..3673d9bf
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/index.vue
@@ -0,0 +1,138 @@
+<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: 80%; padding: 10px">
+      <!-- 标签页导航 -->
+      <el-tabs v-model="activeTab" class="demo-tabs" @tab-change="handleTabChange">
+        <el-tab-pane label="划价确费" name="billing">
+          <BillingList ref="billingRef" />
+        </el-tab-pane>
+        <el-tab-pane label="医嘱计费" name="orderBilling">
+          <OrderBilling ref="orderBillingRef" />
+        </el-tab-pane>
+        <el-tab-pane label="费用明细查询" name="expenseDetail">
+          <FeeDetailQuery ref="feeDetailQueryRef" />
+        </el-tab-pane>
+        <el-tab-pane label="预交金查询" name="depositQuery">
+          <deposit-query ref="depositQueryRef" />
+        </el-tab-pane>
+        <!-- <el-tab-pane label="患者流转日志" name="patientFlow">
+          <div style="padding: 20px; text-align: center; color: #909399">患者流转日志功能区域</div>
+        </el-tab-pane> -->
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, nextTick } from 'vue';
+import { ElMessage } from 'element-plus';
+import PatientList from '../medicalOrderExecution/components/patientList.vue';
+import BillingList from './components/billingList.vue';
+import FeeDetailQuery from './components/feeDetailQuery.vue';
+import DepositQuery from './components/depositQuery.vue';
+import OrderBilling from './components/OrderBilling.vue';
+
+// 预交金查询组件引用
+const depositQueryRef = ref(null);
+
+// 响应式数据
+const active = ref('first');
+const activeTab = ref('billing');
+const billingRef = ref(null);
+const feeDetailQueryRef = ref(null);
+const orderBillingRef = ref(null);
+
+// 刷新功能
+function refresh() {
+  ElMessage.success('刷新成功');
+  // 刷新患者列表
+}
+
+// 左侧标签页点击
+function handleClick() {
+  // 可以在这里添加左侧标签切换的逻辑
+}
+
+// 右侧标签页切换
+function handleTabChange() {
+  // 切换到划价确费标签时，刷新数据
+  if (activeTab.value === 'billing' && billingRef.value) {
+    nextTick(() => {
+      billingRef.value.handleQuery();
+    });
+  }
+  // 切换到医嘱计费标签时，刷新数据
+  if (activeTab.value === 'orderBilling' && orderBillingRef.value) {
+    nextTick(() => {
+      orderBillingRef.value.handleQuery();
+    });
+  }
+  // 切换到费用明细查询标签时，可以刷新数据
+  if (activeTab.value === 'expenseDetail' && feeDetailQueryRef.value) {
+    nextTick(() => {
+      // 根据feeDetailQuery组件提供的方法进行数据刷新
+    });
+  }
+  // 切换到预交金查询标签时，刷新数据
+  if (activeTab.value === 'depositQuery' && depositQueryRef.value) {
+    nextTick(() => {
+      depositQueryRef.value.handleQuery();
+    });
+  }
+}
+</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>
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/store/patient.js b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/store/patient.js
new file mode 100644
index 00000000..88d25391
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/store/patient.js
@@ -0,0 +1,21 @@
+// 选择患者信息
+export const patientInfo = ref()
+export function updatePatientInfo(info) {
+  patientInfo.value = info
+}
+
+// 多选患者
+export const patientInfoList = ref([])
+export function updatePatientInfoList(info) {
+  patientInfoList.value = info
+}
+
+// 获取单选患者信息（去掉复选框模式下使用）
+export function getSinglePatient() {
+  // 如果有选中的患者，只返回第一个患者信息，实现单选效果
+  if (patientInfoList.value && patientInfoList.value.length > 0) {
+    return patientInfoList.value[0];
+  }
+  return null;
+}
+
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/api.js
new file mode 100644
index 00000000..756718c7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/api.js
@@ -0,0 +1,89 @@
+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/medicine-summary/dispensing-form',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+/**
+ * 执行医嘱
+ */
+export function adviceExecute(data) {
+  return request({
+    url: '/nurse-station/advice-process/advice-execute',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 取消执行医嘱
+ */
+export function adviceCancel(data) {
+  return request({
+    url: '/nurse-station/advice-process/advice-cancel',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 汇总领药申请
+ */
+export function medicineSummary(data) {
+  return request({
+    url: '/nurse-station/medicine-summary/medicine-summary',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 查询汇总领药单
+ */
+export function getMedicineSummary(param) {
+  return request({
+    url: '/nurse-station/medicine-summary/summary-form',
+    method: 'get',
+    params: param
+  })
+}
+
+/**
+ * 获取汇总单详细信息
+ */
+export function getMedicineSummaryDetail(param) {
+  return request({
+    url: '/nurse-station/medicine-summary/summary-form-detail',
+    method: 'get',
+    params: param
+  })
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/patientList.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/patientList.vue
new file mode 100644
index 00000000..ae0292a2
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/patientList.vue
@@ -0,0 +1,146 @@
+<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/drugDistribution/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
new file mode 100644
index 00000000..457c9249
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
@@ -0,0 +1,327 @@
+<template>
+  <div style="height: calc(100vh - 176px)">
+    <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>{{ item[0].bedName + '【' + item[0].busNo + '】' }}</span>
+                <span>
+                  {{
+                    item[0].patientName + ' / ' + item[0].genderEnum_enumText + ' / ' + item[0].age
+                  }}
+                </span>
+                <el-tag style="margin-left: 10px">{{ item[0].contractName }}</el-tag>
+                <span style="margin-left: 30px; font-weight: 600">
+                  {{ 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
+            :ref="'tableRef' + index"
+            :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">
+              <template #default="scope">
+                <span>
+                  {{ scope.row.adviceName }}
+                </span>
+                <template v-if="scope.row.adviceTable == 'med_medication_request'">
+                  <span>
+                    {{ ' 【' + scope.row.volume + '】' }}
+                  </span>
+                  <span style="color: #447c95 !important">
+                    {{
+                      '(' +
+                      scope.row.methodCode_dictText +
+                      ' ' +
+                      scope.row.dose +
+                      scope.row.doseUnitCode_dictText +
+                      ' ' +
+                      scope.row.rateCode_dictText +
+                      ')'
+                    }}
+                  </span>
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="领药总量" prop="requestTime" width="150">
+              <template #default="scope">
+                {{ '1支' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="取药科室" prop="requestTime" width="150">
+              <template #default="scope">
+                {{ scope.row.positionName }}
+              </template>
+            </el-table-column>
+            <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[item]"
+                    style="display: inline-block; margin-left: 15px"
+                  >
+                    <el-checkbox
+                      v-for="(rateItem, rateIndex) in scope.row.rate[item]"
+                      :key="rateIndex"
+                      :value="rateItem.rate"
+                      @change="(value) => handleRateChange(value, rateItem, scope.row)"
+                      border
+                      size="small"
+                      style="margin-right: 15px"
+                    >
+                      {{ rateItem.rate }}
+                      <template v-if="rateItem.practitionerName">
+                        {{ rateItem.practitionerName }}
+                      </template>
+                    </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, adviceExecute, adviceCancel, medicineSummary } from './api';
+import { patientInfoList } from '../store/patient.js';
+import { formatDate, formatDateStr } from '@/utils/index';
+import { ref, getCurrentInstance } from 'vue';
+import useUserStore from '@/store/modules/user';
+
+const activeNames = ref([]);
+
+const userStore = useUserStore();
+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 chooseAll = ref(false);
+const props = defineProps({
+  exeStatus: {
+    type: Number,
+    default: 1,
+  },
+  requestStatus: {
+    type: Number,
+    default: 1,
+  },
+  deadline: {
+    type: String,
+  },
+});
+
+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,
+      requestStatus: props.requestStatus,
+    }).then((res) => {
+      // try {
+      // 根据encounterId分组
+      const groupedPrescriptions = res.data.records.reduce((groups, prescription) => {
+        let times = new Set();
+        let rate = {};
+        let checkedRates = {};
+        // 汇总时间点 默认全部汇总
+        prescription.dispenseIds = [];
+        prescription.medicineSummaryParamList.forEach((item) => {
+          // 已汇总的时间点不需要显示
+          if (item.dispenseStatus != 8) {
+            prescription.dispenseIds.push({
+              dispenseId: item.dispenseId,
+              receiverId: userStore.id,
+            });
+
+            // 将全部的时间点拆分 把日期去重，页面显示示例 05-15 [01:30 02:30 03:30]
+            let time = item.dispenseTime.substring(5, 10);
+            let rateTime = item.dispenseTime.substring(11, 16);
+            times.add(time);
+            rate[time] = rate[time] || [];
+            rate[time].push({ rate: rateTime, dispenseId: item.dispenseId });
+            checkedRates[time] = checkedRates[time] || [];
+            checkedRates[time].push(rateTime);
+          }
+        });
+
+        prescription.times = Array.from(times);
+        prescription.rate = rate;
+        prescription.checkedRates = checkedRates;
+        // 把相同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);
+      loading.value = false;
+      // } catch {
+      //   loading.value = false;
+      // }
+    });
+    chooseAll.value = false;
+  } else {
+    prescriptionList.value = [];
+    // proxy.$message.warning('请选择患者');
+  }
+}
+
+function handleMedicineSummary() {
+  let paramList = getSelectRows();
+  let ids = [];
+  paramList = paramList.forEach((item) => {
+    ids.push(...item.dispenseIds);
+  });
+  medicineSummary(ids).then((res) => {
+    if (res.code == 200) {
+      proxy.$message.success('操作成功');
+    }
+  });
+}
+
+function getSelectRows() {
+  // 获取选中的医嘱信息
+  let list = [];
+  prescriptionList.value.forEach((item, index) => {
+    list = [...list, ...proxy.$refs['tableRef' + index][0].getSelectionRows()];
+  });
+  return list;
+}
+function handleRateChange(value, item, row) {
+  // 拼接当前选中时间
+  if (value) {
+    row.dispenseIds.push({ dispenseId: item.dispenseId, receiverId: userStore.id });
+  } else {
+    row.dispenseIds.splice(
+      row.dispenseIds.findIndex((k) => {
+        return k.dispenseId === item.dispenseId;
+      }),
+      1
+    );
+  }
+}
+
+defineExpose({
+  handleGetPrescription,
+  handleMedicineSummary,
+});
+</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/drugDistribution/components/summaryMedicineList.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
new file mode 100644
index 00000000..f3f02f2c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue
@@ -0,0 +1,199 @@
+<template>
+  <div style="height: calc(100vh - 176px)">
+    <div
+      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
+      v-loading="loading"
+    >
+      <el-table
+        :data="medicineSummaryFormList"
+        border
+        :ref="'tableRef' + index"
+        :header-cell-style="{ background: '#eef9fd !important' }"
+      >
+        <el-table-column label="单据号" prop="busNo" align="center" width="180" />
+        <el-table-column label="申请时间" align="center" prop="applyTime" />
+        <el-table-column label="发药时间" align="center" prop="dispenseTime" />
+        <el-table-column label="药房" align="center" prop="locationName" />
+        <el-table-column label="申请人" align="center" prop="applicantName" />
+        <el-table-column label="领药人" align="center" prop="receiverName" />
+        <el-table-column label="发药状态" align="center" prop="statusEnum_enumText" />
+        <el-table-column label="操作" width="100" align="center">
+          <template #default="scope">
+            <el-button link type="primary" @click="getDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-dialog v-model="dialogVisible" title="汇总单详情" width="900">
+      <el-table
+        :data="medicineSummaryFormDetails"
+        border
+        :header-cell-style="{ background: '#eef9fd !important' }"
+      >
+        <el-table-column label="序号" type="index" align="center" width="60" />
+        <el-table-column label="药品名称" prop="itemName" align="center" />
+        <el-table-column label="规格" prop="totalVolume" align="center" width="180" />
+        <el-table-column label="批次号" prop="lotNumber" align="center" width="180" />
+        <el-table-column label="数量" prop="itemQuantity" align="center" width="180">
+          <template #default="scope">
+            <span>{{ scope.row.itemQuantity + ' ' + scope.row.minUnitCode_dictText }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { getMedicineSummary, getMedicineSummaryDetail } from './api';
+import { patientInfoList } from '../store/patient.js';
+import { ref, getCurrentInstance } from 'vue';
+
+const medicineSummaryFormList = ref([]);
+const medicineSummaryFormDetails = ref([]);
+const dialogVisible = ref(false);
+const { proxy } = getCurrentInstance();
+const loading = ref(false);
+const props = defineProps({
+  exeStatus: {
+    type: Number,
+    default: 1,
+  },
+  requestStatus: {
+    type: Number,
+    default: 1,
+  },
+});
+
+handleGetPrescription();
+function handleGetPrescription() {
+  loading.value = true;
+  let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
+  getMedicineSummary({}).then((res) => {
+    medicineSummaryFormList.value = res.data.records;
+    loading.value = false;
+  });
+}
+
+// 获取发药单详情
+function getDetail(row) {
+  getMedicineSummaryDetail({ summaryNo: row.busNo }).then((res) => {
+    medicineSummaryFormDetails.value = res.data;
+    dialogVisible.value = true;
+  });
+}
+
+function handleExecute() {
+  let list = getSelectRows();
+  list = list.map((item) => {
+    return {
+      requestId: item.requestId,
+      accountId: item.accountId,
+      adviceTable: item.adviceTable,
+      executeTimes: item.executeTimes,
+    };
+  });
+}
+
+function handleCancel() {
+  let list = getSelectRows();
+  console.log(list, 'list');
+  list = list.map((item) => {
+    return {
+      procedureId: item.procedureId,
+      executeTimes: item.cancelTimes,
+    };
+  });
+}
+
+function getSelectRows() {
+  // 获取选中的医嘱信息
+  let list = [];
+  prescriptionList.value.forEach((item, index) => {
+    list = [...list, ...proxy.$refs['tableRef' + index][0].getSelectionRows()];
+  });
+  return list;
+}
+
+/**
+ * 计算两个日期之间的所有日期（包含起始和结束日期）
+ * @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 handleRateChange(value, date, time, row) {
+  // 拼接当前选中时间
+  let tiemStr = row.year + '-' + date + ' ' + time + ':00';
+  if (value) {
+    row.executeTimes.push(tiemStr);
+  } else {
+    row.executeTimes.splice(row.executeTimes.indexOf(tiemStr), 1);
+  }
+  console.log(row.executeTimes, 'row.executeTimes');
+}
+
+function handelSwicthChange(value) {
+  prescriptionList.value.forEach((item, index) => {
+    proxy.$refs['tableRef' + index][0].toggleAllSelection();
+  });
+}
+
+// 处理后端返回的时间集合
+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/drugDistribution/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
index 39c34886..421eb93d 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
@@ -1,26 +1,296 @@
 <template>
-  <div class="drugDistribution-container">
-    <patientList />
-    <DrugDistributionList />
+  <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%">
+      <div
+        style="
+          height: 40px;
+          display: flex;
+          align-items: center;
+          border-bottom: solid 2px #e4e7ed;
+          padding: 0 15px;
+          background: linear-gradient(90deg, #f0f8ff, #e6f7ff);
+        "
+      >
+        <div class="nav-button-group">
+          <el-button
+            v-for="nav in navigationButtons"
+            :key="nav.path"
+            :type="currentRoute.path === nav.path ? 'primary' : 'default'"
+            size="small"
+            @click="navigateTo(nav.path)"
+            class="nav-button"
+            :class="{ 'active-nav': currentRoute.path === nav.path }"
+          >
+            <el-icon v-if="nav.icon"><component :is="nav.icon" /></el-icon>
+            <span>{{ nav.label }}</span>
+          </el-button>
+        </div>
+      </div>
+      <div
+        style="
+          height: 50px;
+          border-bottom: 2px solid #e4e7ed;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div>
+          <el-radio-group class="ml10" v-model="drugType">
+            <el-radio-button label="西药" value="1" />
+            <el-radio-button label="中药" value="2" />
+          </el-radio-group>
+          <el-radio-group class="ml20" v-model="isDetails" @change="handleRadioChange">
+            <el-radio-button label="明细" value="1" />
+            <el-radio-button label="汇总" value="2" />
+          </el-radio-group>
+          <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>
+          <span class="descriptions-item-label">全选：</span>
+          <el-switch v-model="chooseAll" @change="handelSwicthChange" />
+          <el-button class="ml20 mr20" type="primary" @click="handleExecute"> 汇总领药 </el-button>
+        </div>
+      </div>
+      <PrescriptionList
+        v-if="isDetails == 1"
+        ref="prescriptionRefs"
+        :exeStatus="exeStatus"
+        :requestStatus="requestStatus"
+        :deadline="deadline"
+      />
+      <SummaryMedicineList v-else />
+      <!-- <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"
+            :requestStatus="requestStatus"
+            :ref="(el) => setPrescriptionRef(el, tab.name)"
+          />
+        </el-tab-pane>
+      </el-tabs> -->
+    </div>
   </div>
 </template>
-<script setup >
-import patientList from './patientList.vue'
-import DrugDistributionList from './drugDistributionList.vue'
-</script>
-<style lang="scss" scoped>
-.drugDistribution-container {
-  display: flex;
-  height: 100%;
-  width: 100%;
 
-  .patientList-container {
-    flex: none;
-    width: 240px;
-  }
+<script setup>
+import { getCurrentInstance, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import PatientList from './components/patientList.vue';
+import PrescriptionList from './components/prescriptionList.vue';
+import SummaryMedicineList from './components/summaryMedicineList.vue';
 
-  .medicalOrderList-container {
-    flex: 1;
+const { proxy } = getCurrentInstance();
+const router = useRouter();
+const currentRoute = useRoute();
+
+const activeName = ref('preparation');
+const active = ref('first');
+const exeStatus = ref(1);
+const deadline = ref(proxy.formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
+const requestStatus = ref(3);
+const chooseAll = ref(false);
+const drugType = ref('1');
+const isDetails = ref('1');
+
+// 存储子组件引用的对象
+const prescriptionRefs = ref();
+
+// 导航按钮配置
+const navigationButtons = ref([
+  {
+    label: '入出转',
+    path: '/inHospital/statistics/inOut',
+    icon: 'Document',
+  },
+  {
+    label: '护理记录',
+    path: '/inHospital/statistics/nursingRecord',
+    icon: 'MedicineBox',
+  },
+  {
+    label: '三测单',
+    path: '/inHospital/statistics/tprChart',
+    icon: 'List',
+  },
+  {
+    label: '医嘱执行',
+    path: '/inHospital/statistics/medicalOrderExecution',
+    icon: 'Back',
+  },
+  {
+    label: '医嘱校对',
+    path: '/inHospital/statistics/medicalOrderProofread',
+    icon: 'Back',
+  },
+  {
+    label: '汇总发药申请',
+    path: '/inHospital/statistics/drugDistribution',
+    icon: 'Back',
+  },
+  {
+    label: '住院记账',
+    path: '/inHospital/statistics/InpatientBilling',
+    icon: 'Back',
+  },
+]);
+
+// 页面导航方法
+const navigateTo = (path) => {
+  router.push(path);
+};
+
+// 定义处方列表tabs配置
+const prescriptionTabs = [
+  { label: '待执行', name: 'preparation' },
+  { label: '已执行', name: 'completed' },
+  { label: '不执行', name: 'stopped' },
+  { label: '取消执行', name: 'cancel' },
+];
+
+function handleClick(tabName) {
+  // tabName是tab的name属性值
+  const activeTabName = tabName || activeName.value;
+
+  switch (activeTabName) {
+    case 'preparation':
+      // 执行状态待执行
+      exeStatus.value = 1;
+      // 请求状态已校对
+      requestStatus.value = 3;
+      break;
+    case 'completed':
+      exeStatus.value = 6;
+      break;
+    case 'stopped':
+      exeStatus.value = 5;
+      break;
+    case 'cancel':
+      exeStatus.value = 9;
+      break;
   }
 }
+
+function handleGetPrescription() {
+  prescriptionRefs.value.handleGetPrescription();
+}
+
+function handelSwicthChange() {
+  if (chooseAll.value) {
+    proxy.$refs['prescriptionRefs'].selectAllRows();
+  } else {
+    proxy.$refs['prescriptionRefs'].clearSelection();
+  }
+}
+
+function handleRadioChange(value) {
+  if (value == '1') {
+    handleGetPrescription();
+  }
+}
+
+function handleExecute() {
+  proxy.$refs['prescriptionRefs'].handleMedicineSummary();
+}
+
+provide('handleGetPrescription', (value) => {
+  prescriptionRefs.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;
+}
+
+.nav-button-group {
+  display: flex;
+  gap: 10px;
+}
+
+.nav-button {
+  transition: all 0.3s ease;
+  border-radius: 20px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.nav-button:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+.nav-button.active-nav {
+  box-shadow: 0 4px 8px rgba(64, 158, 255, 0.3);
+}
+
+.nav-button :deep(.el-icon) {
+  margin-right: 5px;
+}
 </style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/store/patient.js b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/store/patient.js
new file mode 100644
index 00000000..db579a0a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/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/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js
index ddfebc42..8630b3a3 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/api.js
@@ -50,7 +50,18 @@ export function adviceExecute(data) {
 export function adviceCancel(data) {
   return request({
     url: '/nurse-station/advice-process/advice-cancel',
-    method: 'post',
+    method: 'put',
+    data: data
+  })
+}
+
+/**
+ * 医嘱不执行
+ */
+export function adviceNoExecute(data) {
+  return request({
+    url: '/nurse-station/advice-process/advice-void',
+    method: 'put',
     data: data
   })
 }
\ 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
index 3f9be198..4449bbdf 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
@@ -39,6 +39,14 @@
         >
           执行选中
         </el-button>
+        <el-button
+          class="ml20"
+          type="primary"
+          @click="handleNoExecute"
+          :disabled="props.exeStatus == 6"
+        >
+          不执行
+        </el-button>
         <el-button
           class="ml20 mr20"
           type="danger"
@@ -182,13 +190,7 @@
                       :key="rateIndex"
                       :value="rateItem.rate"
                       @change="
-                        (value) =>
-                          handleRateChange(
-                            value,
-                            item,
-                            scope.row.checkedRates[timeIndex],
-                            scope.row
-                          )
+                        (value) => handleRateChange(value, item, rateItem.rate, scope.row, rateItem)
                       "
                       border
                       size="small"
@@ -212,7 +214,7 @@
 </template>
 
 <script setup>
-import { getPrescriptionList, adviceExecute, adviceCancel } from './api';
+import { getPrescriptionList, adviceExecute, adviceCancel, adviceNoExecute } from './api';
 import { patientInfoList } from '../store/patient.js';
 import { formatDate, formatDateStr } from '@/utils/index';
 import { ref, getCurrentInstance } from 'vue';
@@ -274,12 +276,15 @@ function handleGetPrescription() {
         prescription.procedureIds = [];
         // 添加复选框状态管理
         prescription.checkedRates = {};
+        // 已执行时间点列表
         let exeTimeList = prescription.exePerformRecordList.map((item) => {
           return formatDateStr(item.occurrenceTime, 'YYYY-MM-DD HH:mm:ss');
         });
+        // 不执行时间点列表
         let stopTimeList = prescription.stopPerformRecordList.map((item) => {
           return formatDateStr(item.occurrenceTime, 'YYYY-MM-DD HH:mm:ss');
         });
+        // 取消执行时间点列表
         let cancelTimeList = prescription.cancelPerformRecordList.map((item) => {
           return formatDateStr(item.occurrenceTime, 'YYYY-MM-DD HH:mm:ss');
         });
@@ -295,22 +300,23 @@ function handleGetPrescription() {
             let rateItems = [];
             rate.forEach((rateItem) => {
               let dateStr = prescription.year + '-' + time + ' ' + rateItem + ':00';
-              prescription.executeTimes.push(dateStr);
               switch (props.exeStatus) {
-                case 1:
-                  // 如果该时间点未执行，则加入待选中列表
-                  if (!exeTimeList.includes(dateStr)) {
+                case 1: // 待执行tab
+                  // 如果该时间点未执行并且不在不执行列表中，则加入待选中列表
+                  if (!exeTimeList.includes(dateStr) && !stopTimeList.includes(dateStr)) {
                     rateItems.push({
                       rate: rateItem,
                     });
                     checkedRatesForTime.push(rateItem);
+                    prescription.executeTimes.push(dateStr);
                   }
                   break;
-                case 6:
+                case 6: // 已执行tab
                   let index = exeTimeList.findIndex((item) => {
                     return item == dateStr;
                   });
                   if (index != -1) {
+                    // 显示执行人practitionerName
                     rateItems.push({
                       procedureId: prescription.exePerformRecordList[index].procedureId,
                       practitionerName: prescription.exePerformRecordList[index].practitionerName,
@@ -318,18 +324,30 @@ function handleGetPrescription() {
                     });
                     checkedRatesForTime.push(rateItem);
                   }
+                  // 这里把时间点都加到执行时间列表中，后续遍历全部执行者id用
+                  prescription.executeTimes.push(dateStr);
                   break;
-                case 5:
+                case 5: // 不执行tab
+                  let index1 = stopTimeList.findIndex((item) => {
+                    return item == dateStr;
+                  });
                   if (stopTimeList.includes(dateStr)) {
+                    // 显示执行人practitionerName
                     rateItems.push({
+                      practitionerName: prescription.stopPerformRecordList[index1].practitionerName,
                       rate: rateItem,
                     });
                     checkedRatesForTime.push(rateItem);
                   }
                   break;
-                case 9:
+                case 9: // 取消执行tab
+                  let index2 = cancelTimeList.findIndex((item) => {
+                    return item == dateStr;
+                  });
                   if (cancelTimeList.includes(dateStr)) {
                     rateItems.push({
+                      practitionerName:
+                        prescription.cancelPerformRecordList[index2].practitionerName,
                       rate: rateItem,
                     });
                     checkedRatesForTime.push(rateItem);
@@ -352,8 +370,7 @@ function handleGetPrescription() {
           prescription.times = validTimes;
           prescription.rate = validRates;
           prescription.checkedRates = newCheckedRates;
-
-          // 处理已执行记录
+          // 处理已执行记录，拿到全部的执行人id，取消执行时候要传id
           prescription.exePerformRecordList.forEach((item) => {
             if (prescription.executeTimes.includes(item.occurrenceTime)) {
               prescription.procedureIds.push(item.procedureId);
@@ -386,6 +403,7 @@ function handleGetPrescription() {
   }
 }
 
+// 执行
 function handleExecute() {
   let list = getSelectRows();
   list = list.map((item) => {
@@ -404,16 +422,41 @@ function handleExecute() {
   });
 }
 
-function handleCancel() {
+// 不执行
+function handleNoExecute() {
   let list = getSelectRows();
-  console.log(list, 'list');
   list = list.map((item) => {
     return {
-      procedureId: item.procedureId,
-      executeTimes: item.cancelTimes,
+      requestId: item.requestId,
+      encounterId: item.encounterId,
+      patientId: item.patientId,
+      adviceTable: item.adviceTable,
+      executeTimes: item.executeTimes,
     };
   });
-  adviceCancel({ adviceExecuteParam: list }).then((res) => {
+  console.log(list, 'list');
+  adviceNoExecute({ adviceExecuteDetailList: list }).then((res) => {
+    if (res.code == 200) {
+      handleGetPrescription();
+    }
+  });
+}
+
+// 取消执行
+function handleCancel() {
+  let list = getSelectRows();
+  let producerIds = [];
+  list.forEach((item) => {
+    producerIds.push(
+      ...item.procedureIds.map((value) => {
+        return {
+          procedureId: value,
+          therapyEnum: item.therapyEnum,
+        };
+      })
+    );
+  });
+  adviceCancel({ adviceExecuteDetailList: producerIds }).then((res) => {
     if (res.code == 200) {
       handleGetPrescription();
     }
@@ -459,15 +502,18 @@ function getDateRange(startDate, endDate) {
   return dates;
 }
 
-function handleRateChange(value, date, time, row) {
+function handleRateChange(value, date, time, row, rateItem) {
   // 拼接当前选中时间
   let tiemStr = row.year + '-' + date + ' ' + time + ':00';
+  let index = row.executeTimes.indexOf(tiemStr);
+  debugger;
   if (value) {
     row.executeTimes.push(tiemStr);
+    row.procedureIds.push(rateItem.producerId);
   } else {
     row.executeTimes.splice(row.executeTimes.indexOf(tiemStr), 1);
+    row.procedureIds.splice(row.executeTimes.indexOf(rateItem.producerId), 1);
   }
-  console.log(row.executeTimes, 'row.executeTimes');
 }
 
 function handelSwicthChange(value) {
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
index d7d378a5..91c60270 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue
@@ -93,7 +93,6 @@ function handleTabClick(tabName) {
   }
   // 调用子组件方法
   nextTick(() => {
-    debugger;
     console.log(prescriptionRefs.value[activeTabName], '1');
 
     if (
diff --git a/openhis-ui-vue3/src/views/login.vue b/openhis-ui-vue3/src/views/login.vue
index f072f937..b3ea19d5 100644
--- a/openhis-ui-vue3/src/views/login.vue
+++ b/openhis-ui-vue3/src/views/login.vue
@@ -63,6 +63,10 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item prop="tenantId">
+        <span class="descriptions-item-label" style="margin: 0 10px 0 0">连接医保</span>
+        <el-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large"/>
+      </el-form-item>
       <el-form-item class="login-options">
         <el-checkbox v-model="loginForm.rememberMe" class="remember-me">记住我</el-checkbox>
         <el-link type="primary" class="forgot-password" @click="handleForgotPassword">忘记密码？</el-link>
@@ -271,7 +275,7 @@ function handleLogin() {
             }
             return acc;
           }, {});
-          if (true) {
+          if (env === 'development' || !loginForm.value.invokeYb) {
             router.push({ path: redirect.value || '/', query: otherQueryParams });
           } else {
             signIng.value = true;
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
index 20de7283..a8b4145d 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
@@ -59,63 +59,57 @@
       >
         重置
       </el-button>
-      <el-button
-        class="table-header-button"
-        type="primary"
-        @click="getList"
-        icon="Search"
-      >
+      <el-button class="table-header-button" type="primary" @click="getList" icon="Search">
         搜索
       </el-button>
     </div>
-    <el-table
-      max-height="700"
-      :data="receiptList"
-      row-key="supplyBusNo"
-      v-loading="loading"
-    >
-      <el-table-column
-        label="单据号"
-        align="center"
-        prop="supplyBusNo"
-        width="200"
-      />
-      <el-table-column
-        label="审批状态"
-        align="center"
-        prop="statusEnum_enumText"
-      />
-      <el-table-column
-        label="单据类型"
-        align="center"
-        prop="typeEnum_enumText"
-      />
+    <el-table max-height="700" :data="receiptList" row-key="supplyBusNo" v-loading="loading">
+      <el-table-column label="单据号" align="center" prop="supplyBusNo" width="160" />
+      <el-table-column label="审批状态" align="center" prop="statusEnum_enumText" />
+      <el-table-column label="单据类型" align="center" prop="typeEnum_enumText" />
+      <el-table-column label="经手人" align="center" prop="practitionerId_dictText">
+        <template #default="scope">
+          <span>{{ scope.row.practitionerId_dictText || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="供应商"
         align="center"
         prop="supplierId_dictText"
-      />
-      <el-table-column
-        label="经手人"
-        align="center"
-        prop="practitionerId_dictText"
-      />
-      <el-table-column
-        label="申请人"
-        align="center"
-        prop="applicantId_dictText"
-      />
-      <el-table-column label="申请时间" align="center" prop="applyTime">
+        width="180"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row.supplierId_dictText || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="目的仓库" align="center" prop="purposeLocationId_dictText">
+        <template #default="scope">
+          <span>{{ scope.row.purposeLocationId_dictText || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总金额" align="center" prop="totalAmount">
+        <template #default="scope">
+          <span v-if="scope.row.totalAmount">{{ scope.row.totalAmount }} 元 </span>
+          <span v-else>{{ '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请人" align="center" prop="applicantId_dictText">
+        <template #default="scope">
+          <span>{{ scope.row.applicantId_dictText || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请时间" align="center" prop="applyTime" width="180">
         <template #default="scope">
           {{ formatDate(scope.row.applyTime) }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="审批人"
-        align="center"
-        prop="approverId_dictText"
-      />
-      <el-table-column label="审批时间" align="center" prop="approvalTime">
+      <el-table-column label="审批人" align="center" prop="approverId_dictText">
+        <template #default="scope">
+          <span>{{ scope.row.approverId_dictText || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批时间" align="center" prop="approvalTime" width="180">
         <template #default="scope">
           {{ formatDate(scope.row.approvalTime) }}
         </template>
@@ -130,34 +124,12 @@
           <el-button
             link
             type="primary"
-            @click="handelApplys(scope.row,'apply')"
+            @click="handelApplys(scope.row, 'apply')"
             :disabled="scope.row.statusEnum == 3 || scope.row.statusEnum == 4"
           >
             审批
           </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="handelApplys(scope.row,'view')"
-          >
-            查看
-          </el-button>
-          <!-- <el-button
-            link
-            type="primary"
-            @click="handelApply(scope.row)"
-            :disabled="scope.row.statusEnum == 3 || scope.row.statusEnum == 4"
-          >
-            审批通过
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="handleReject(scope.row)"
-            :disabled="scope.row.statusEnum == 4 || scope.row.statusEnum == 3"
-          >
-            驳回
-          </el-button> -->
+          <el-button link type="primary" @click="handelApplys(scope.row, 'view')"> 查看 </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -187,14 +159,13 @@ import {
 } from "./components/api";
 import { purchaseInventoryApproved as purchaseReturnApproved } from '../returnedPurchase/components/api';
 import { useStore } from '@/store/store';
-import { formatDate } from "@/utils/index";
+import { formatDate } from '@/utils/index';
 import useTagsViewStore from '@/store/modules/tagsView';
-const tagsViewStore = useTagsViewStore();
 const router = useRouter();
 const route = useRoute();
 const store = useStore();
 const { proxy } = getCurrentInstance();
-const emit = defineEmits(["selectAdviceBase"]);
+const emit = defineEmits(['selectAdviceBase']);
 const total = ref(0);
 const queryParams = ref({
   pageNo: 1,
@@ -208,8 +179,8 @@ const loading = ref(false);
 watch(
   () => route.query.type,
   (newVlaue) => {
-    if(newVlaue){
-      getList()
+    if (newVlaue) {
+      getList();
     }
   },
   { immediate: true }
@@ -226,38 +197,43 @@ function getList() {
 }
 
 function handelApply(row) {
-  if(row.typeEnum ==2 || row.typeEnum ==8){ //商品调拨  8 批量
+  if (row.typeEnum == 2 || row.typeEnum == 8) {
+    //商品调拨  8 批量
     productTransferApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
+        proxy.$modal.msgSuccess('操作成功');
         getList();
       }
     });
-  }else if(row.typeEnum ==7 ){ //领用出库审批通过
+  } else if (row.typeEnum == 7) {
+    //领用出库审批通过
     requisitionIssueApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
+        proxy.$modal.msgSuccess('操作成功');
         getList();
       }
     });
-  }else if(row.typeEnum == 9){ //领用退库审批通过
+  } else if (row.typeEnum == 9) {
+    //领用退库审批通过
     returnIssueApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
+        proxy.$modal.msgSuccess('操作成功');
         getList();
       }
     });
-  }else if(row.typeEnum == 4||row.typeEnum == 10){ //盘点审批  批量盘点10通过
+  } else if (row.typeEnum == 4 || row.typeEnum == 10) {
+    //盘点审批  批量盘点10通过
     productStocktakingApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
+        proxy.$modal.msgSuccess('操作成功');
         getList();
       }
     });
-  }else if(row.typeEnum == 6){ // 报损审批通过
+  } else if (row.typeEnum == 6) {
+    // 报损审批通过
     lossReportApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
+        proxy.$modal.msgSuccess('操作成功');
         getList();
       }
     })
@@ -279,70 +255,82 @@ function handelApply(row) {
   }else{
     purchaseInventoryApproved(row.supplyBusNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("操作成功");
+        proxy.$modal.msgSuccess('操作成功');
         getList();
       }
     });
   }
-  console.log(row,"typeEnum_enumText")
-  
 }
 
 // 审批,查看
-function handelApplys(row,view) {
-  // if(view=='apply'){  // 审批
-  //   tagsViewStore.delView(router.currentRoute.value)
-  // }
-  if(row.typeEnum == 2){//商品调拨 
+function handelApplys(row, view) {
+  if (row.typeEnum == 2) {
+    //商品调拨
     // 跳转到审核页面
-    router.replace({path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:row.supplyBusNo,view:view}});
-    // router.push({ path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 8){  //8 批量
-    router.replace({ path: '/medicationmanagement/transferManagement/batchTransfer',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 7 ){ //领用出库审批通过
-    router.replace({ path: '/medicationmanagement/requisitionManagement/requisitionManagement',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 9){ //领用退库审批通过
-    router.replace({ path: '/medicationmanagement/requisitionManagement/returningInventory',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 4){ //盘点审批  
-    router.replace({ path: '/medicationmanagement/chkstock/chkstockPart',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 10){ // 批量盘点
-    router.replace({ path: '/medicationmanagement/chkstock/chkstockBatch',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 6){ // 报损审批通过
-    router.replace({ path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',query:{supplyBusNo:row.supplyBusNo,view:view}})
-  }else if(row.typeEnum == 5){ // 采购退货通过5
-    // getpurchaseInventoryDetailReturn(row.supplyBusNo).then((response) => {
-      // let currentData = response.data;
-      // console.log(currentData,"退库详情")
-      // store.setCurrentReturnData({ editRow: row, item: currentData });
-      router.replace({ path: '/medicationmanagement/medicationmanagement/returnedPurchase',query:{originalSupplyBusNo:row.supplyBusNo,view:view}})  
+    router.replace({
+      path: '/medicationmanagement/transferManagement/transferManagent',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 8) {
+    //8 批量
+    router.replace({
+      path: '/medicationmanagement/transferManagement/batchTransfer',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 7) {
+    //领用出库审批通过
+    router.replace({
+      path: '/medicationmanagement/requisitionManagement/requisitionManagement',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 9) {
+    //领用退库审批通过
+    router.replace({
+      path: '/medicationmanagement/requisitionManagement/returningInventory',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 4) {
+    //盘点审批
+    router.replace({
+      path: '/medicationmanagement/chkstock/chkstockPart',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 10) {
+    // 批量盘点
+    router.replace({
+      path: '/medicationmanagement/chkstock/chkstockBatch',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 6) {
+    // 报损审批通过
+    router.replace({
+      path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',
+      query: { supplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else if (row.typeEnum == 5) {
+    // 采购退货通过5
+    router.replace({
+      path: '/medicationmanagement/medicationmanagement/returnedPurchase',
+      query: { originalSupplyBusNo: row.supplyBusNo, view: view },
+    });
     // });
-    
-  }else{     // 采购入库 1
+  } else {
+    // 采购入库 1
     getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
       let currentData = response.data;
       store.setCurrentData({ editRow: row, item: currentData });
-      router.replace({ path: '/medicationmanagement/medicationmanagement/purchaseDocument',query:{supplyBusNo:row.supplyBusNo,view:view}})  
+      router.replace({
+        path: '/medicationmanagement/medicationmanagement/purchaseDocument',
+        query: { supplyBusNo: row.supplyBusNo, view: view },
+      });
     });
-    
   }
-  console.log(row,"typeEnum_enumText")
-  
-}
-
-// 驳回
-function handleReject(row) {
-  reject(row.supplyBusNo).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
-      getList();
-    }
-  });
 }
 
 function handleDateQuery(value) {
   if (value) {
-    queryParams.value.applyTimeSTime = value + " 00:00:00";
-    queryParams.value.applyTimeETime = value + " 23:59:59";
+    queryParams.value.applyTimeSTime = value + ' 00:00:00';
+    queryParams.value.applyTimeETime = value + ' 23:59:59';
   } else {
     queryParams.value.applyTimeSTime = undefined;
     queryParams.value.applyTimeETime = undefined;
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
index 0e922743..906ca0e3 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="app-container" v-loading="pageLoading" :element-loading-text="'审批中...'">
-     <el-row :gutter="10" class="mb8" v-if="viewStatus">
+    <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>
@@ -27,24 +22,36 @@
         <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 @click="handleDelete" >打印</el-button>
+        <el-button type="primary" plain icon="Printer" disabled @click="handleDelete"
+          >打印</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus"  @click="handleBatchAdd" >生成批量盘点单</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleBatchAdd"
+          >生成批量盘点单</el-button
+        >
       </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-row>
-    <el-form :model="receiptHeaderForm" ref="receiptHeaderRef" :inline="true" label-width="100px" :rules="rules">
+    <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="data.isEdit" />
+        <el-input
+          v-model="receiptHeaderForm.busNo"
+          placeholder="单据号："
+          clearable
+          style="width: 260px"
+          :disabled="data.isEdit"
+        />
       </el-form-item>
       <el-form-item label="仓库类型：" prop="purposeTypeEnum">
         <el-select
@@ -128,29 +135,22 @@
     </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="handleSave"
-                
-                >批量保存</el-button
-              >
-              <!-- v-hasPermi="['system:user:edit']" -->
-            </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-row :gutter="10" class="mb8" v-if="!viewStatus">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
+            <!-- v-hasPermi="['system:user:edit']" -->
+          </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" :disabled="viewStatus == 'apply'">
           <el-table
             v-loading="loading"
@@ -169,16 +169,12 @@
               fixed
               :show-overflow-tooltip="true"
             >
-            <template #default="scope">
+              <template #default="scope">
                 <el-form-item
                   :prop="`purchaseinventoryList.${scope.$index}.itemBusNo`"
                   :rules="tableRules.itemBusNo"
                 >
-                  <el-input
-                    v-model="scope.row.itemBusNo"
-                    placeholder=""
-                    disabled
-                  />
+                  <el-input v-model="scope.row.itemBusNo" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -196,11 +192,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.itemName`"
                   :rules="tableRules.itemName"
                 >
-                <el-input
-                  v-model="scope.row.itemName"
-                  placeholder=""
-                  disabled
-                />
+                  <el-input v-model="scope.row.itemName" placeholder="" disabled />
                   <!-- <PopoverList
                     @search="handleSearch"
                     :width="1000"
@@ -230,11 +222,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.totalVolume`"
                   :rules="tableRules.totalVolume"
                 >
-                  <el-input
-                    disabled
-                    v-model="scope.row.totalVolume"
-                    placeholder=""
-                  />
+                  <el-input disabled v-model="scope.row.totalVolume" placeholder="" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -247,14 +235,12 @@
               :show-overflow-tooltip="true"
             >
               <template #default="scope">
-                <el-form-item
-                  :prop="`purchaseinventoryList.${scope.$index}.lotNumber`"
-                >
-                  <el-input v-model="scope.row.lotNumber" placeholder="" disabled/>
+                <el-form-item :prop="`purchaseinventoryList.${scope.$index}.lotNumber`">
+                  <el-input v-model="scope.row.lotNumber" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
-            
+
             <!-- // 包装单位  一会细研究 -->
             <!-- <el-table-column
               label="包装单位"
@@ -315,23 +301,12 @@
                   :rules="tableRules.partPercent"
                 >
                   <div class="select_wrapper_div">
-                    <el-input
-                      v-model="scope.row.partPercent"
-                      placeholder=""
-                      disabled
-                    >
-                    </el-input>
+                    <el-input v-model="scope.row.partPercent" placeholder="" disabled> </el-input>
                   </div>
                 </el-form-item>
               </template>
             </el-table-column>
-             <el-table-column
-              label="单价 "
-              align="center"
-              key="price"
-              prop="price"
-              width="120"
-            >
+            <el-table-column label="单价 " align="center" key="price" prop="price" width="120">
               <template #default="scope">
                 <el-form-item
                   :prop="`purchaseinventoryList.${scope.$index}.price`"
@@ -373,9 +348,7 @@
                       :class="{ 'error-border': scope.row.error }"
                       @change="handleUnitCodeChange(scope.row, scope.$index, scope.row.unitCode)"
                     >
-                      <template
-                        v-if="scope.row.partPercent > 1"
-                      >
+                      <template v-if="scope.row.partPercent > 1">
                         <el-option
                           :label="scope.row.unitList.unitCode_dictText"
                           :value="scope.row.unitList.unitCode"
@@ -385,9 +358,7 @@
                           :value="scope.row.unitList.minUnitCode"
                         />
                       </template>
-                      <template
-                        v-if="scope.row.partPercent == 1"
-                      >
+                      <template v-if="scope.row.partPercent == 1">
                         <el-option
                           :label="scope.row.unitList.unitCode_dictText"
                           :value="scope.row.unitList.unitCode"
@@ -438,11 +409,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.totalPurposeQuantity`"
                   :rules="tableRules.totalPurposeQuantity"
                 >
-                  <el-input
-                    v-model="scope.row.totalPurposeQuantity"
-                    placeholder=""
-                    disabled
-                  />
+                  <el-input v-model="scope.row.totalPurposeQuantity" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -507,11 +474,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.itemQuantity`"
                   :rules="tableRules.itemQuantity"
                 >
-                  <el-input
-                    v-model="scope.row.itemQuantity"
-                    placeholder=""
-                    disabled
-                  />
+                  <el-input v-model="scope.row.itemQuantity" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -528,11 +491,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.profitAmount`"
                   :rules="tableRules.profitAmount"
                 >
-                  <el-input
-                    v-model="scope.row.profitAmount"
-                    placeholder=""
-                    disabled
-                  />
+                  <el-input v-model="scope.row.profitAmount" placeholder="" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -557,7 +516,7 @@
                       :class="{ 'error-border': scope.row.error }"
                       clearable
                       :disabled="viewStatus == 'view'"
-                      @change="reasonCodeChange(scope.row,scope.$index)"
+                      @change="reasonCodeChange(scope.row, scope.$index)"
                     >
                       <el-option
                         v-for="(item, index) in profit_reason"
@@ -587,7 +546,7 @@
                     v-model="scope.row.reason"
                     placeholder=""
                     :disabled="viewStatus == 'view'"
-                    @blur="reasonBlur(scope.row,scope.$index)"
+                    @blur="reasonBlur(scope.row, scope.$index)"
                   />
                 </el-form-item>
               </template>
@@ -605,12 +564,7 @@
                   :prop="`purchaseinventoryList.${scope.$index}.ybNo`"
                   :rules="tableRules.ybNo"
                 >
-                  <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>
@@ -627,11 +581,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>
@@ -643,13 +593,21 @@
               width="130"
             >
               <template #default="scope">
-                <el-tooltip :content="formatContent(scope.row.traceNo)" placement="top" 
-                  popper-class="custom-tooltip">
+                <el-tooltip
+                  :content="formatContent(scope.row.traceNo)"
+                  placement="top"
+                  popper-class="custom-tooltip"
+                >
                   <el-form-item
                     :prop="`purchaseinventoryList.${scope.$index}.traceNo`"
                     :rules="tableRules.traceNo"
                   >
-                    <el-input @change="(value) => handleTraceNo(value, scope.row, scope.$index)" 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>
@@ -675,7 +633,12 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-if="route.query.supplyBusNo||(forms.purchaseinventoryList&&forms.purchaseinventoryList[0]&&forms.purchaseinventoryList[0].id)"
+            v-if="
+              route.query.supplyBusNo ||
+              (forms.purchaseinventoryList &&
+                forms.purchaseinventoryList[0] &&
+                forms.purchaseinventoryList[0].id)
+            "
             v-show="total > 0"
             :total="total"
             v-model:page="queryParams.pageNo"
@@ -696,12 +659,7 @@
     <el-row
       :gutter="10"
       class="mb8"
-      style="
-        margin-top: 15px;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-      "
+      style="margin-top: 15px; display: flex; align-items: center; justify-content: flex-start"
     >
       <el-col :span="3">
         <span>制单人：{{ userStore.name }}</span>
@@ -713,21 +671,20 @@
         <span>单据状态：</span>
       </el-col> -->
       <el-col :span="6">
-        <el-row
-          :gutter="8"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: flex-start;
-          "
-        >
+        <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-row>
       </el-col>
     </el-row>
-    <TraceNoDialog :ypName="ypName" :openDialog="openTraceNoDialog" @submit="submit" :rowData="rowData" @cancel="openTraceNoDialog = false"/>
+    <TraceNoDialog
+      :ypName="ypName"
+      :openDialog="openTraceNoDialog"
+      @submit="submit"
+      :rowData="rowData"
+      @cancel="openTraceNoDialog = false"
+    />
   </div>
 </template>
 
@@ -741,9 +698,10 @@ import {
   getDetailInit,
   getstocktakingDetail, //查询盘点详情
   getStocktakingReceiptBatch, //生成批量盘点
-  addBatch,  //保存批量盘点
+  addBatch, //保存批量盘点
   productStocktakingApproved,
   reject,
+<<<<<<< HEAD
   getpharmacyCabinetList
 } from "../components/api";
 import PopoverList from "@/components/OpenHis/popoverList/index.vue";
@@ -751,22 +709,33 @@ import MedicineList from "../components/medicineList.vue";
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import { formatDate,formatDateymd } from "@/utils/index";
 import { ref } from "vue";
+=======
+} 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';
+>>>>>>> upstream/develop
 
 const router = useRouter();
 const route = useRoute();
 const userStore = useUserStore();
-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();
 const store = useStore();
 const { proxy } = getCurrentInstance();
-const { warehous_type,purchase_type,profit_reason } = 
-proxy.useDict( "warehous_type","purchase_type","profit_reason");
+const { warehous_type, purchase_type, profit_reason } = proxy.useDict(
+  'warehous_type',
+  'purchase_type',
+  'profit_reason'
+);
 const forms = reactive({
   purchaseinventoryList: [],
 });
-const viewStatus = ref("")
+const viewStatus = ref('');
 const purchaseinventoryList = ref([]);
 const open = ref(false);
 const loading = ref(false);
@@ -774,16 +743,16 @@ 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);
 const totalAmount = ref(0);
-const rowList = ref([])
-const openTraceNoDialog = ref(false)
-const ypName = ref("");
-const currentIndex = ref("");
-const pageLoading = ref(false)
+const rowList = ref([]);
+const openTraceNoDialog = ref(false);
+const ypName = ref('');
+const currentIndex = ref('');
+const pageLoading = ref(false);
 const props = defineProps({
   // 仓库
   purposeTypeListOptions: {
@@ -791,7 +760,7 @@ const props = defineProps({
     required: false,
   },
   // 药品类型
-  categoryListOptions:{
+  categoryListOptions: {
     type: Object,
     required: false,
   },
@@ -811,7 +780,7 @@ const props = defineProps({
     required: false,
   },
 });
-const rowData = ref({})
+const rowData = ref({});
 
 const form = reactive({
   purchaseinventoryList: [],
@@ -829,33 +798,23 @@ const data = reactive({
     pageNo: 1,
     pageSize: 10,
     // searchKey: undefined, // 供应商名称forms
-    sourceLocationId:'',
-    medicationType:'',
-    busNo: "", // 编码
+    sourceLocationId: '',
+    medicationType: '',
+    busNo: '', // 编码
     // statusEnum: undefined, // 状态
     // supplierId: undefined, // 供应商ID
     // applyTimeStart: undefined, // 申请时间开始
     // practitionerId: undefined, // 经手人ID
   },
   rules: {
-    purposeLocationId: [
-      { required: true, message: "请选择盘点仓库", trigger: "change" },
-    ],
-    medicationType: [
-      { required: true, message: "请选择药品类型", trigger: "change" },
-    ],
+    purposeLocationId: [{ required: true, message: '请选择盘点仓库', trigger: 'change' }],
+    medicationType: [{ required: true, message: '请选择药品类型', trigger: 'change' }],
   },
   tableRules: {
-    name: [{ required: true, message: "项目不能为空", trigger: "change" }],
-    unitCode: [
-      { required: true, message: "计量单位不能为空", trigger: "change" },
-    ],
-    itemQuantity: [
-      { required: true, message: "盈亏数量不能为空", trigger: "blur" },
-    ],
-    totalQuantity:[
-      { required: true, message: "实盘数量不能为空", trigger: "blur" },
-    ],
+    name: [{ required: true, message: '项目不能为空', trigger: 'change' }],
+    unitCode: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
+    itemQuantity: [{ required: true, message: '盈亏数量不能为空', trigger: 'blur' }],
+    totalQuantity: [{ required: true, message: '实盘数量不能为空', trigger: 'blur' }],
     // reasonCode: [
     //   { required: true, message: "盈亏类型不能为空", trigger: "change" },
     // ],
@@ -868,103 +827,103 @@ const freightListOptions = ref(undefined); // 货位列表
 const categoryListOptions = ref(undefined); // 药品类型
 const profitReasonOptions = 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.currentDataPLPD,
   (newVlaue) => {
-    if (newVlaue&&!route.query.supplyBusNo) {
-      form.purchaseinventoryList = newVlaue?.purchaseinventoryList
-      receiptHeaderForm.busNo = newVlaue?.receiptHeaderForm.busNo
-      receiptHeaderForm.occurrenceTime = newVlaue?.receiptHeaderForm.occurrenceTime
-   
-      receiptHeaderForm.purposeTypeEnum = newVlaue?.receiptHeaderForm.purposeTypeEnum
-      handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum,1)
-      receiptHeaderForm.purposeLocationId = newVlaue?.receiptHeaderForm.purposeLocationId
-      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.purposeTypeEnum = newVlaue?.receiptHeaderForm.purposeTypeEnum;
+      handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum, 1);
+      receiptHeaderForm.purposeLocationId = newVlaue?.receiptHeaderForm.purposeLocationId;
+      receiptHeaderForm.medicationType = newVlaue?.receiptHeaderForm.medicationType;
     }
   },
   { immediate: true }
-)
+);
 watch(
   () => store.currentDataPLPDALL,
   (newVlaue) => {
-    if (newVlaue&&!route.query.supplyBusNo) {
-       console.log(newVlaue,"--------------------------------------")
-      forms.purchaseinventoryList = newVlaue?.purchaseinventoryList
-      console.log(forms.purchaseinventoryList,"forms.purchaseinventoryList")
+    if (newVlaue && !route.query.supplyBusNo) {
+      console.log(newVlaue, '--------------------------------------');
+      forms.purchaseinventoryList = newVlaue?.purchaseinventoryList;
+      console.log(forms.purchaseinventoryList, 'forms.purchaseinventoryList');
     }
   },
   { immediate: true }
-)
+);
 watch(
   () => form.purchaseinventoryList,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-      if(viewStatus.value){
-        handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      if (viewStatus.value) {
+        handleTotalAmount();
       }
     }
   },
   { immediate: true }
-)
+);
 // 挂载时绑定事件
 onMounted(() => {
-  document.addEventListener("click", handleClickOutside);
+  document.addEventListener('click', handleClickOutside);
 });
 
 // 卸载时移除事件
 onUnmounted(() => {
-  document.removeEventListener("click", handleClickOutside);
+  document.removeEventListener('click', handleClickOutside);
 });
 
 function addNewRow() {
-  proxy.$refs["receiptHeaderRef"].validate((valid) => {
+  proxy.$refs['receiptHeaderRef'].validate((valid) => {
     if (valid) {
       if (data.isAdding) {
-        proxy.$message.warning("请先保存当前行后再新增！");
+        proxy.$message.warning('请先保存当前行后再新增！');
         return;
       }
       const newRow = {
-        id: "",
-        definitionId:"",
-        name:"",
-        itemBusNo:"",
-        itemTableName:"",
-        itemTable: "",
-        itemType:"",
-        itemType_enumText:"",
-        itemQuantity: "",
-        itemMaxQuantity:"",
-        itemId: "",
-        detailJson: "",
-        supplierId: "",
-        purposeTypeEnum: "",
-        purposeLocationId: "",
-        purposeLocationStoreId: "",
-        practitionerId: "",
-        traceNo: "",
-        invoiceNo: "",
-        lotNumber:"",
-        occurrenceTime:"",
-        startTime: "",
-        endTime: "",
-        partPercent:"",
-        price: "",
-        totalPrice: "",
-        sellPrice: "",
-        minSellPrice: "",
-        unitCode:"",
-        unitCode_dictText:'',
-        minUnitCode:"",
-        minUnitCode_dictText:"",
-        volume:'',
-        wbStr:'',
-        ybNo:'',
+        id: '',
+        definitionId: '',
+        name: '',
+        itemBusNo: '',
+        itemTableName: '',
+        itemTable: '',
+        itemType: '',
+        itemType_enumText: '',
+        itemQuantity: '',
+        itemMaxQuantity: '',
+        itemId: '',
+        detailJson: '',
+        supplierId: '',
+        purposeTypeEnum: '',
+        purposeLocationId: '',
+        purposeLocationStoreId: '',
+        practitionerId: '',
+        traceNo: '',
+        invoiceNo: '',
+        lotNumber: '',
+        occurrenceTime: '',
+        startTime: '',
+        endTime: '',
+        partPercent: '',
+        price: '',
+        totalPrice: '',
+        sellPrice: '',
+        minSellPrice: '',
+        unitCode: '',
+        unitCode_dictText: '',
+        minUnitCode: '',
+        minUnitCode_dictText: '',
+        volume: '',
+        wbStr: '',
+        ybNo: '',
         // locationInventoryList: [], // 库房列表
         unitList: {}, // 单位列表
         isEditing: true, // 标记当前行是否正在编辑
@@ -972,13 +931,13 @@ function addNewRow() {
         isSave: false, // 当前行是否保存
       };
       form.purchaseinventoryList.push(newRow);
-      data.isEdit = true
+      data.isEdit = true;
       data.isAdding = true; // 设置标志位为 true，表示有未保存的
     }
   });
 }
 
-function submit(value){
+function submit(value) {
   if (form.purchaseinventoryList[currentIndex.value].traceNo) {
     form.purchaseinventoryList[currentIndex.value].traceNo =
       form.purchaseinventoryList[currentIndex.value].traceNo + ',' + value;
@@ -988,67 +947,75 @@ function submit(value){
   openTraceNoDialog.value = false;
 }
 
-function formatContent(value){
-  let content = ''
-  if(value){
+function formatContent(value) {
+  let content = '';
+  if (value) {
     value.split(',').forEach((item, index) => {
-      content +=  `[${(index + 1)}] ${item}\n`
-    })
-    return content
+      content += `[${index + 1}] ${item}\n`;
+    });
+    return content;
   }
 }
 
 function handleBlur(row, index) {
-  console.log(row)
-  debugger
+  console.log(row);
   let hasError = false;
-    for (let key in row) {
-    if(!row[key]){
-      row[key] = ''
+  for (let key in row) {
+    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';
       }
     }
   }
-  if(row.itemQuantity==0 || !row.itemQuantity){
-    row.itemQuantity = 0 
-    row.profitAmount = 0
+  if (row.itemQuantity == 0 || !row.itemQuantity) {
+    row.itemQuantity = 0;
+    row.profitAmount = 0;
   }
-  if(row.totalQuantity==0 || !row.totalQuantity ){
-    row.totalQuantity = 0
-    row.totalPrice = 0
+  if (row.totalQuantity == 0 || !row.totalQuantity) {
+    row.totalQuantity = 0;
+    row.totalPrice = 0;
   }
-  row.totalQuantity = Number(row.totalQuantity)
-  console.log(receiptHeaderForm,row,"receiptHeaderForm")
+  row.totalQuantity = Number(row.totalQuantity);
+  console.log(receiptHeaderForm, row, 'receiptHeaderForm');
   // row.sourceLocationId =receiptHeaderForm.sourceLocationId
   // row.sourceLocationStoreId = receiptHeaderForm.sourceLocationStoreId;
-  row.purposeLocationId = receiptHeaderForm.purposeLocationId
+  row.purposeLocationId = receiptHeaderForm.purposeLocationId;
   row.purposeLocationStoreId = receiptHeaderForm.purposeLocationStoreId;
   row.busNo = receiptHeaderForm.busNo;
-  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);
   row.occurrenceTime = receiptHeaderForm.occurrenceTime;
-  let purposeTypeEnum = warehous_type.value.filter(e=>{return e.label==receiptHeaderForm.purposeTypeEnum})
-  row.purposeTypeEnum = (purposeTypeEnum&&purposeTypeEnum[0])?purposeTypeEnum[0].value:receiptHeaderForm.purposeTypeEnum
+  let purposeTypeEnum = warehous_type.value.filter((e) => {
+    return e.label == receiptHeaderForm.purposeTypeEnum;
+  });
+  row.purposeTypeEnum =
+    purposeTypeEnum && purposeTypeEnum[0]
+      ? purposeTypeEnum[0].value
+      : receiptHeaderForm.purposeTypeEnum;
   // let sourceLocationId = sourceTypeListOptions.value.filter(e=>{return e.name==receiptHeaderForm.sourceLocationId})
   // row.sourceLocationId = (sourceLocationId&&sourceLocationId[0])?sourceLocationId[0].id:receiptHeaderForm.sourceLocationId
-  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.totalQuantity){
-    row.itemQuantity = 0
-    row.profitAmount = 0
+  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.totalQuantity) {
+    row.itemQuantity = 0;
+    row.profitAmount = 0;
   }
 }
 
-
 // 点击行时记录当前行
 function handleRowClick(row) {
   // getMedicineList({ itemId: row.itemId }).then((res) => {
@@ -1075,9 +1042,9 @@ function handleSearch(value) {
 const locationList = ref([]);
 // 选择药品
 function selectRow(rowValue, index) {
-  console.log(receiptHeaderForm,rowValue,"receiptHeaderForm.sourceLocationId1")
+  console.log(receiptHeaderForm, rowValue, 'receiptHeaderForm.sourceLocationId1');
   rowIndex.value = index;
-  form.purchaseinventoryList[index].purposeLocationId = receiptHeaderForm.purposeLocationId
+  form.purchaseinventoryList[index].purposeLocationId = receiptHeaderForm.purposeLocationId;
   form.purchaseinventoryList[index].itemId = rowValue.definitionId;
   form.purchaseinventoryList[index].name = rowValue.name;
   form.purchaseinventoryList[index].volume = rowValue.volume;
@@ -1086,11 +1053,21 @@ 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
-  if(route.query.supplyBusNo){
-    handleLocationClick(receiptHeaderForm.purposeLocationId,form.purchaseinventoryList[index].itemId,index,form.purchaseinventoryList[index].lotNumber)
-  }else{
-    handleLocationClick(form.purchaseinventoryList[index].purposeLocationId,form.purchaseinventoryList[index].itemId,index,form.purchaseinventoryList[index].lotNumber)
+  form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber;
+  if (route.query.supplyBusNo) {
+    handleLocationClick(
+      receiptHeaderForm.purposeLocationId,
+      form.purchaseinventoryList[index].itemId,
+      index,
+      form.purchaseinventoryList[index].lotNumber
+    );
+  } else {
+    handleLocationClick(
+      form.purchaseinventoryList[index].purposeLocationId,
+      form.purchaseinventoryList[index].itemId,
+      index,
+      form.purchaseinventoryList[index].lotNumber
+    );
   }
 }
 // function selectRow(rowValue, index) {
@@ -1120,57 +1097,75 @@ function selectRow(rowValue, index) {
 
 /**计算合计金额 */
 function handleTotalAmount() {
-  totalAmount.value = form.purchaseinventoryList.reduce(
-    (accumulator, currentRow) => {
-      if(accumulator){
-        return (accumulator + (Number(currentRow.profitAmount) || 0))
-      }else{
-        return (accumulator + (currentRow.profitAmount) || 0)
-      }
-    },
-    0
-  );
+  totalAmount.value = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
+    if (accumulator) {
+      return accumulator + (Number(currentRow.profitAmount) || 0);
+    } else {
+      return accumulator + currentRow.profitAmount || 0;
+    }
+  }, 0);
 }
 // 选择仓库
-function handleLocationClick(purposeLocationId,itemId,index,lotNumber) {
+function handleLocationClick(purposeLocationId, itemId, index, lotNumber) {
   getCount({
     itemId: itemId,
     orgLocationId: purposeLocationId,
     // objLocationId:purposeLocationId,
-    lotNumber:lotNumber
+    lotNumber: lotNumber,
   }).then((res) => {
-    if (res.data&&res.data[0]) {
-      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || "";
+    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].totalQuantity = res.data[0].objQuantity || 0;
       // 单价
-      form.purchaseinventoryList[index].traceNo = res.data[0].traceNo || "";
-      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) || "";
-      console.log(res.data[0] ,form.purchaseinventoryList[index].minUnitCode,form.purchaseinventoryList[index].unitList,'res.data[0].minUnitCode ')
-      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].traceNo = res.data[0].traceNo || '';
+      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) || '';
+      console.log(
+        res.data[0],
+        form.purchaseinventoryList[index].minUnitCode,
+        form.purchaseinventoryList[index].unitList,
+        'res.data[0].minUnitCode '
+      );
+      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);
         }
       }
-      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)
+      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
+      );
       if (form.purchaseinventoryList[index].totalPurposeQuantity == 0) {
         proxy.$message.warning('仓库数量为0，无法调用！');
         return;
       }
-    }else {
+    } else {
       form.purchaseinventoryList[index].totalPurposeQuantity = 0;
-      form.purchaseinventoryList[index].totalQuantity = 0
+      form.purchaseinventoryList[index].totalQuantity = 0;
       form.purchaseinventoryList[index].price = 0;
       proxy.$message.warning('仓库数量为0，无法调用！');
     }
@@ -1179,122 +1174,177 @@ function handleLocationClick(purposeLocationId,itemId,index,lotNumber) {
 
 // 单位处理
 function handleUnitCodeChange(row, index, value) {
-  console.log(row, index, value,12121211)
-  if(!form.purchaseinventoryList[index].statusMaxvalue&&Number(row.measurementUnitCode)==Number(value)){
-    return     
+  console.log(row, index, value, 12121211);
+  if (
+    !form.purchaseinventoryList[index].statusMaxvalue &&
+    Number(row.measurementUnitCode) == Number(value)
+  ) {
+    return;
   }
-  if (row.minUnitCode == value) { //最小计量单位
-    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].totalQuantity = 0
-    form.purchaseinventoryList[index].profitAmount = 0
+  if (row.minUnitCode == value) {
+    //最小计量单位
+    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].totalQuantity = 0;
+    form.purchaseinventoryList[index].profitAmount = 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);
-
-  } else {  // 切换成大的计量单位
-    form.purchaseinventoryList[index].itemQuantity = 0
-    form.purchaseinventoryList[index].totalPrice = 0
-    form.purchaseinventoryList[index].totalQuantity = 0
-    form.purchaseinventoryList[index].profitAmount = 0
-    getMaxCounts(row,index)
+  } else {
+    // 切换成大的计量单位
+    form.purchaseinventoryList[index].itemQuantity = 0;
+    form.purchaseinventoryList[index].totalPrice = 0;
+    form.purchaseinventoryList[index].totalQuantity = 0;
+    form.purchaseinventoryList[index].profitAmount = 0;
+    getMaxCounts(row, index);
   }
-  form.purchaseinventoryList[index].statusMaxvalue = true
-  editBatchTransfer(index)
+  form.purchaseinventoryList[index].statusMaxvalue = true;
+  editBatchTransfer(index);
 }
-function getMaxCounts(row,index,counts){
-    form.purchaseinventoryList[index].oldtotalPurposeQuantity =  form.purchaseinventoryList[index].totalPurposeQuantity
-    form.purchaseinventoryList[index].totalPurposeQuantity =
+function getMaxCounts(row, index, counts) {
+  form.purchaseinventoryList[index].oldtotalPurposeQuantity =
+    form.purchaseinventoryList[index].totalPurposeQuantity;
+  form.purchaseinventoryList[index].totalPurposeQuantity =
     form.purchaseinventoryList[index].totalPurposeQuantity / row.partPercent;
 
-    const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalPurposeQuantity); // 获取整数部分
-    const decimalPart2 = form.purchaseinventoryList[index].totalPurposeQuantity - integerPart2; // 获取小数部分
+  const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalPurposeQuantity); // 获取整数部分
+  const decimalPart2 = form.purchaseinventoryList[index].totalPurposeQuantity - integerPart2; // 获取小数部分
 
-    if(decimalPart2){
-      form.purchaseinventoryList[index].totalPurposeQuantity = integerPart2 + form.purchaseinventoryList[index].unitList.unitCode_dictText +
-      (decimalPart2*row.partPercent).toFixed(0) +
-      form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+  if (decimalPart2) {
+    form.purchaseinventoryList[index].totalPurposeQuantity =
+      integerPart2 +
+      form.purchaseinventoryList[index].unitList.unitCode_dictText +
+      (decimalPart2 * 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;
+
+    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; // 获取小数部分
+    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;
     }
-    //数量
-    if(counts){
-      form.purchaseinventoryList[index].olditemQuantity =  form.purchaseinventoryList[index].itemQuantity*row.partPercent
-      form.purchaseinventoryList[index].itemMaxQuantity = form.purchaseinventoryList[index].itemQuantity
+    const integerPart2 = Math.floor(
+      form.purchaseinventoryList[index].totalQuantity / row.partPercent
+    ); // 获取整数部分
+    const decimalPart2 =
+      form.purchaseinventoryList[index].totalQuantity / row.partPercent - integerPart2; // 获取小数部分
 
-      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; // 获取小数部分
-      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
-      }
-      const integerPart2 = Math.floor(form.purchaseinventoryList[index].totalQuantity/row.partPercent); // 获取整数部分
-      const decimalPart2 = (form.purchaseinventoryList[index].totalQuantity/row.partPercent) - integerPart2; // 获取小数部分
-
-      if(decimalPart2){
-        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].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
-      }
-    }else{
-      form.purchaseinventoryList[index].price =
+    if (decimalPart2) {
+      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].totalQuantity =
+        form.purchaseinventoryList[index].totalPurposeQuantity +
+        form.purchaseinventoryList[index].itemQuantity;
+    }
+  } else {
+    form.purchaseinventoryList[index].price =
       form.purchaseinventoryList[index].price * row.partPercent;
-      form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
-    }
+    form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+  }
 }
-function getMaxCountsAll(row,index,counts){
-    forms.purchaseinventoryList[index].oldtotalPurposeQuantity =  forms.purchaseinventoryList[index].totalPurposeQuantity
-    forms.purchaseinventoryList[index].totalPurposeQuantity =
+function getMaxCountsAll(row, index, counts) {
+  forms.purchaseinventoryList[index].oldtotalPurposeQuantity =
+    forms.purchaseinventoryList[index].totalPurposeQuantity;
+  forms.purchaseinventoryList[index].totalPurposeQuantity =
     forms.purchaseinventoryList[index].totalPurposeQuantity / row.partPercent;
 
-    const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalPurposeQuantity); // 获取整数部分
-    const decimalPart2 = forms.purchaseinventoryList[index].totalPurposeQuantity - integerPart2; // 获取小数部分
+  const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalPurposeQuantity); // 获取整数部分
+  const decimalPart2 = forms.purchaseinventoryList[index].totalPurposeQuantity - integerPart2; // 获取小数部分
 
-    if(decimalPart2){
-      forms.purchaseinventoryList[index].totalPurposeQuantity = integerPart2 + forms.purchaseinventoryList[index].unitList.unitCode_dictText +
-      (decimalPart2*row.partPercent).toFixed(0) +
-      forms.purchaseinventoryList[index].unitList.minUnitCode_dictText
+  if (decimalPart2) {
+    forms.purchaseinventoryList[index].totalPurposeQuantity =
+      integerPart2 +
+      forms.purchaseinventoryList[index].unitList.unitCode_dictText +
+      (decimalPart2 * row.partPercent).toFixed(0) +
+      forms.purchaseinventoryList[index].unitList.minUnitCode_dictText;
+  }
+  //数量
+  if (counts) {
+    forms.purchaseinventoryList[index].olditemQuantity =
+      forms.purchaseinventoryList[index].itemQuantity * row.partPercent;
+    forms.purchaseinventoryList[index].itemMaxQuantity =
+      forms.purchaseinventoryList[index].itemQuantity;
+
+    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; // 获取小数部分
+    console.log(
+      integerPart,
+      decimalPart,
+      forms.purchaseinventoryList[index].itemQuantity,
+      121212121
+    );
+    if (decimalPart) {
+      forms.purchaseinventoryList[index].itemQuantity =
+        integerPart +
+        forms.purchaseinventoryList[index].unitList.unitCode_dictText +
+        (decimalPart * row.partPercent).toFixed(0) +
+        forms.purchaseinventoryList[index].minUnitCode_dictText;
     }
-    //数量
-    if(counts){
-      forms.purchaseinventoryList[index].olditemQuantity =  forms.purchaseinventoryList[index].itemQuantity*row.partPercent
-      forms.purchaseinventoryList[index].itemMaxQuantity = forms.purchaseinventoryList[index].itemQuantity
+    const integerPart2 = Math.floor(
+      forms.purchaseinventoryList[index].totalQuantity / row.partPercent
+    ); // 获取整数部分
+    const decimalPart2 =
+      forms.purchaseinventoryList[index].totalQuantity / row.partPercent - integerPart2; // 获取小数部分
 
-      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; // 获取小数部分
-      console.log(integerPart,decimalPart,forms.purchaseinventoryList[index].itemQuantity,121212121)
-      if(decimalPart){
-        forms.purchaseinventoryList[index].itemQuantity = integerPart + forms.purchaseinventoryList[index].unitList.unitCode_dictText +
-        (decimalPart*row.partPercent).toFixed(0) +
-        forms.purchaseinventoryList[index].minUnitCode_dictText
-      }
-      const integerPart2 = Math.floor(forms.purchaseinventoryList[index].totalQuantity/row.partPercent); // 获取整数部分
-      const decimalPart2 = (forms.purchaseinventoryList[index].totalQuantity/row.partPercent) - integerPart2; // 获取小数部分
-
-      if(decimalPart2){
-        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].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
-      }
-    }else{
-      forms.purchaseinventoryList[index].price =
+    if (decimalPart2) {
+      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].totalQuantity =
+        forms.purchaseinventoryList[index].totalPurposeQuantity +
+        forms.purchaseinventoryList[index].itemQuantity;
+    }
+  } else {
+    forms.purchaseinventoryList[index].price =
       forms.purchaseinventoryList[index].price * row.partPercent;
-      forms.purchaseinventoryList[index].price = forms.purchaseinventoryList[index].price.toFixed(4);
-    }
+    forms.purchaseinventoryList[index].price = forms.purchaseinventoryList[index].price.toFixed(4);
+  }
 }
 // function getMaxCounts(row,index,counts){
 //   form.purchaseinventoryList[index].oldtotalQuantity =  form.purchaseinventoryList[index].totalQuantity
@@ -1351,27 +1401,27 @@ function getMaxCountsAll(row,index,counts){
 // }
 
 function handleSave() {
-  if(form.purchaseinventoryList.length==0){
-    proxy.$message.warning("请先生成批量盘点单在进行批量保存！");
-    return
+  if (form.purchaseinventoryList.length == 0) {
+    proxy.$message.warning('请先生成批量盘点单在进行批量保存！');
+    return;
   }
-  rowList.value = []
-  forms.purchaseinventoryList.map((row,index)=>{
-    if(row){
-      handleBlur(row)
-      proxy.$refs["receiptHeaderRef"].validate((valid) => {
+  rowList.value = [];
+  forms.purchaseinventoryList.map((row, index) => {
+    if (row) {
+      handleBlur(row);
+      proxy.$refs['receiptHeaderRef'].validate((valid) => {
         if (valid) {
-          proxy.$refs["formRef"].validate((valid) => {
+          proxy.$refs['formRef'].validate((valid) => {
             if (valid) {
               // 当前行没有id视为首次新增
               // if (!row.id) {
               //   data.isAdding = false; // 允许新增下一行
               // }
-              let rows = JSON.parse(JSON.stringify(row))
+              let rows = JSON.parse(JSON.stringify(row));
               // delete rows.itemMaxQuantity
               // delete rows.olditemQuantity
               // delete rows.oldtotalQuantity
-              // delete rows.oldtotalPurposeQuantity 
+              // delete rows.oldtotalPurposeQuantity
               // if(rows.unitCode== rows.unitList.minUnitCode){
               //   rows.itemQuantity = form.purchaseinventoryList[index].olditemQuantity?form.purchaseinventoryList[index].olditemQuantity:form.purchaseinventoryList[index].itemQuantity
               //   rows.totalQuantity = form.purchaseinventoryList[index].oldtotalQuantity?form.purchaseinventoryList[index].oldtotalQuantity:form.purchaseinventoryList[index].totalQuantity
@@ -1379,65 +1429,74 @@ function handleSave() {
               //   rows.itemQuantity = form.purchaseinventoryList[index].itemMaxQuantity?form.purchaseinventoryList[index].itemMaxQuantity:form.purchaseinventoryList[index].itemQuantity
               //   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){
-                  rows.unitCode = rows.unitList.minUnitCode
-                }else{
-                  rows.unitCode = rows.unitList.unitCode
-                  rows.unitCode_dictText = rows.unitList.unitCode_dictText
+              if (rows.unitCode == rows.unitCode_dictText) {
+                if (rows.unitCode_dictText == rows.unitList.minUnitCode_dictText) {
+                  rows.unitCode = rows.unitList.minUnitCode;
+                } else {
+                  rows.unitCode = rows.unitList.unitCode;
+                  rows.unitCode_dictText = rows.unitList.unitCode_dictText;
                 }
               }
-              if(rows.profitAmount||rows.profitAmount==0){
-                let totalPrice =  rows.totalPrice
-                rows.totalPrice = rows.profitAmount
-                rows.profitAmount = totalPrice
+              if (rows.profitAmount || rows.profitAmount == 0) {
+                let totalPrice = rows.totalPrice;
+                rows.totalPrice = rows.profitAmount;
+                rows.profitAmount = totalPrice;
               }
-              if(rows.itemQuantity&&typeof rows.itemQuantity==='string'&& rows.itemQuantity.split(rows.unitCode)){
-                rows.price = rows.price/rows.partPercent
-                rows.unitCode = rows.unitList.minUnitCode
-                rows.unitCode_dictText= rows.unitList.minUnitCode_dictText
-                rows.totalPurposeQuantity =rows.oldtotalPurposeQuantity
-                rows.totalQuantity = rows.totalQuantity*rows.partPercent   
-                rows.itemQuantity= rows.totalQuantity - rows.totalPurposeQuantity 
+              if (
+                rows.itemQuantity &&
+                typeof rows.itemQuantity === 'string' &&
+                rows.itemQuantity.split(rows.unitCode)
+              ) {
+                rows.price = rows.price / rows.partPercent;
+                rows.unitCode = rows.unitList.minUnitCode;
+                rows.unitCode_dictText = rows.unitList.minUnitCode_dictText;
+                rows.totalPurposeQuantity = rows.oldtotalPurposeQuantity;
+                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){
-                addTransferProducts(rowList._rawValue)
+              rowList.value.push(JSON.parse(JSON.stringify(rows)));
+              if (
+                rowList._rawValue &&
+                rowList._rawValue.length == forms.purchaseinventoryList.length
+              ) {
+                addTransferProducts(rowList._rawValue);
               }
             }
           });
         }
-      })
-    }
-  })
-  // 保存逻辑...
-}
-function addTransferProducts(rowList){
-  console.log(rowList,JSON.parse(JSON.stringify(rowList)),"rowList")
-  addBatch(JSON.parse(JSON.stringify(rowList))).then((res) => {
-
-    if (res.data) {
-      console.log(res.data,"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;
-      })
-      forms.purchaseinventoryList.map((row,index)=>{
-        console.log(row,"res.data")
-        forms.purchaseinventoryList[index].id = res.data[index]
-        forms.purchaseinventoryList[index].isSave = true;
-      })
-      store.setCurrentDataPLPD({purchaseinventoryList: form.purchaseinventoryList,receiptHeaderForm: receiptHeaderForm });
-      store.setCurrentDataPLPDAll({purchaseinventoryList: forms.purchaseinventoryList});
+      });
     }
   });
-} 
+  // 保存逻辑...
+}
+function addTransferProducts(rowList) {
+  console.log(rowList, JSON.parse(JSON.stringify(rowList)), 'rowList');
+  addBatch(JSON.parse(JSON.stringify(rowList))).then((res) => {
+    if (res.data) {
+      console.log(res.data, '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;
+      });
+      forms.purchaseinventoryList.map((row, index) => {
+        console.log(row, 'res.data');
+        forms.purchaseinventoryList[index].id = res.data[index];
+        forms.purchaseinventoryList[index].isSave = true;
+      });
+      store.setCurrentDataPLPD({
+        purchaseinventoryList: form.purchaseinventoryList,
+        receiptHeaderForm: receiptHeaderForm,
+      });
+      store.setCurrentDataPLPDAll({ purchaseinventoryList: forms.purchaseinventoryList });
+    }
+  });
+}
 
 /** 选择条数  */
 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;
@@ -1445,12 +1504,12 @@ 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 handleScan(row, index) {
+  rowData.value = row;
+  rowData.value.locationId = queryParams.value.sourceLocationId;
+  ypName.value = row.name;
+  openTraceNoDialog.value = true;
+  currentIndex.value = index;
 }
 
 /** 重置操作表单 */
@@ -1485,70 +1544,85 @@ function reset() {
   //   medicationType: "1",
   //   purposeTypeEnum: undefined,
   // };
-  proxy.resetForm("receiptHeaderRef");
+  proxy.resetForm('receiptHeaderRef');
   form.purchaseinventoryList = [];
 }
-function handleBatchAdd(){
-   proxy.$refs["receiptHeaderRef"].validate((valid) => {
+function handleBatchAdd() {
+  proxy.$refs['receiptHeaderRef'].validate((valid) => {
     if (valid) {
       if (data.isAdding) {
-        proxy.$message.warning("请先保存当前行后再新增！");
+        proxy.$message.warning('请先保存当前行后再新增！');
         return;
       }
       data.isAdding = true; // 设置标志位为 true，表示有未保存的
-      console.log(receiptHeaderForm,form.purchaseinventoryList,"receiptHeaderForm.value")
-      getBatchList()
+      console.log(receiptHeaderForm, form.purchaseinventoryList, 'receiptHeaderForm.value');
+      getBatchList();
       // console.log(res.data,receiptHeaderForm,"获取详情");
     }
-  })
+  });
   // proxy.$message.warning("等待后端提供接口进行联调");
 }
-function getDetailAll(){
-  forms.purchaseinventoryList.map((e,index)=>{
+function getDetailAll() {
+  forms.purchaseinventoryList.map((e, index) => {
     // form.purchaseinventoryList[index].statusMaxvalue =  false
-    e.volume = e.totalVolume
-    e.name = e.itemName
-    e.manufacturer = e.manufacturerText
-    if(e.purposeTypeEnum){
-      warehous_type.value.map(item=>{
-        if(item.value == e.purposeTypeEnum ){
-          receiptHeaderForm.purposeTypeEnum = item.label
+    e.volume = e.totalVolume;
+    e.name = e.itemName;
+    e.manufacturer = e.manufacturerText;
+    if (e.purposeTypeEnum) {
+      warehous_type.value.map((item) => {
+        if (item.value == e.purposeTypeEnum) {
+          receiptHeaderForm.purposeTypeEnum = item.label;
         }
-      })
-      handleChangePurposeTypeEnum(e.purposeTypeEnum,1)
+      });
+      handleChangePurposeTypeEnum(e.purposeTypeEnum, 1);
     }
-    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
-          forms.purchaseinventoryList[index].itemType_enumText = item.label
+          receiptHeaderForm.medicationType = item.value;
+          forms.purchaseinventoryList[index].itemType_enumText = item.label;
         }
-      })
+      });
     }
-    if(e.purposeLocationId){
-      receiptHeaderForm.purposeLocationId1 = e.purposeLocationId
-      receiptHeaderForm.purposeLocationId =  e.purposeLocationName?e.purposeLocationName:""
-      if(purposeTypeListOptions.value){
-        let purposeTypeList = purposeTypeListOptions.value.filter(k=> k.id==e.purposeLocationId)
-        receiptHeaderForm.purposeLocationId = purposeTypeList?purposeTypeList[0].name:''
+    if (e.purposeLocationId) {
+      receiptHeaderForm.purposeLocationId1 = e.purposeLocationId;
+      receiptHeaderForm.purposeLocationId = e.purposeLocationName ? e.purposeLocationName : '';
+      if (purposeTypeListOptions.value) {
+        let purposeTypeList = purposeTypeListOptions.value.filter(
+          (k) => k.id == e.purposeLocationId
+        );
+        receiptHeaderForm.purposeLocationId = purposeTypeList ? purposeTypeList[0].name : '';
       }
     }
-    if(e.partPercent){
-      forms.purchaseinventoryList[index].partPercent = Number(forms.purchaseinventoryList[index].partPercent).toFixed(4);
+    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
-    
-    if(e.unitList&&e.unitCode){
-      forms.purchaseinventoryList[index].unitList = e.unitList[0]   //计量单位回显数组
-      forms.purchaseinventoryList[index].unitCode = forms.purchaseinventoryList[index].measurementUnitCode_dictText;
-      forms.purchaseinventoryList[index].unitCode_dictText = forms.purchaseinventoryList[index].measurementUnitCode_dictText;
-      if(forms.purchaseinventoryList[index].measurementUnitCode == forms.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-        getMaxCountsAll(e,index,1)
-      }else{
-        forms.purchaseinventoryList[index].totalQuantity = forms.purchaseinventoryList[index].totalPurposeQuantity + forms.purchaseinventoryList[index].itemQuantity
+    forms.purchaseinventoryList[index].totalPurposeQuantity = forms.purchaseinventoryList[index]
+      .totalQuantity
+      ? forms.purchaseinventoryList[index].totalQuantity
+      : 0;
+
+    if (e.unitList && e.unitCode) {
+      forms.purchaseinventoryList[index].unitList = e.unitList[0]; //计量单位回显数组
+      forms.purchaseinventoryList[index].unitCode =
+        forms.purchaseinventoryList[index].measurementUnitCode_dictText;
+      forms.purchaseinventoryList[index].unitCode_dictText =
+        forms.purchaseinventoryList[index].measurementUnitCode_dictText;
+      if (
+        forms.purchaseinventoryList[index].measurementUnitCode ==
+        forms.purchaseinventoryList[index].unitList.unitCode
+      ) {
+        // 回显大单位
+        getMaxCountsAll(e, index, 1);
+      } else {
+        forms.purchaseinventoryList[index].totalQuantity =
+          forms.purchaseinventoryList[index].totalPurposeQuantity +
+          forms.purchaseinventoryList[index].itemQuantity;
       }
-      console.log(forms.purchaseinventoryList, e.unitList,"获取详情12");
+      console.log(forms.purchaseinventoryList, e.unitList, '获取详情12');
     }
     // else{
     //   if(!e.unitList&&e.unitCode){
@@ -1566,181 +1640,243 @@ function getDetailAll(){
     //     }
     //   }
     // }
-    if(e.price){
-      console.log(forms.purchaseinventoryList[index].measurementUnitCode,forms.purchaseinventoryList[index].unitList.minUnitCode,1)
-      if(forms.purchaseinventoryList[index].measurementUnitCode == forms.purchaseinventoryList[index].unitList.minUnitCode){
-        forms.purchaseinventoryList[index].price = forms.purchaseinventoryList[index].price / forms.purchaseinventoryList[index].partPercent;
-        forms.purchaseinventoryList[index].price = forms.purchaseinventoryList[index].price.toFixed(4);
-
-      }else{
-        if(forms.purchaseinventoryList[index].price>1){
-          forms.purchaseinventoryList[index].price = forms.purchaseinventoryList[index].price.toFixed(4);
+    if (e.price) {
+      console.log(
+        forms.purchaseinventoryList[index].measurementUnitCode,
+        forms.purchaseinventoryList[index].unitList.minUnitCode,
+        1
+      );
+      if (
+        forms.purchaseinventoryList[index].measurementUnitCode ==
+        forms.purchaseinventoryList[index].unitList.minUnitCode
+      ) {
+        forms.purchaseinventoryList[index].price =
+          forms.purchaseinventoryList[index].price / forms.purchaseinventoryList[index].partPercent;
+        forms.purchaseinventoryList[index].price =
+          forms.purchaseinventoryList[index].price.toFixed(4);
+      } else {
+        if (forms.purchaseinventoryList[index].price > 1) {
+          forms.purchaseinventoryList[index].price =
+            forms.purchaseinventoryList[index].price.toFixed(4);
         }
       }
       let purchaseItem = forms.purchaseinventoryList[index];
       if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
-        purchaseItem.totalPrice =
-          purchaseItem.price * purchaseItem.totalQuantity;
+        purchaseItem.totalPrice = purchaseItem.price * purchaseItem.totalQuantity;
         purchaseItem.totalPrice = purchaseItem.totalPrice.toFixed(4);
       }
       if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
-        purchaseItem.profitAmount =
-          purchaseItem.price * purchaseItem.itemQuantity;
+        purchaseItem.profitAmount = purchaseItem.price * purchaseItem.itemQuantity;
         purchaseItem.profitAmount = purchaseItem.profitAmount.toFixed(4);
       }
-
-    }else{
-      forms.purchaseinventoryList[index].price = 0
-      forms.purchaseinventoryList[index].totalPrice = 0
-      forms.purchaseinventoryList[index].profitAmount = 0  
+    } else {
+      forms.purchaseinventoryList[index].price = 0;
+      forms.purchaseinventoryList[index].totalPrice = 0;
+      forms.purchaseinventoryList[index].profitAmount = 0;
     }
 
-    forms.purchaseinventoryList[index].reasonCode = forms.purchaseinventoryList[index].reasonCode
-    if(forms.purchaseinventoryList[index].totalPurposeQuantity== forms.purchaseinventoryList[index].totalQuantity){
-      forms.purchaseinventoryList[index].itemQuantity = 0 
-      forms.purchaseinventoryList[index].profitAmount = 0
+    forms.purchaseinventoryList[index].reasonCode = forms.purchaseinventoryList[index].reasonCode;
+    if (
+      forms.purchaseinventoryList[index].totalPurposeQuantity ==
+      forms.purchaseinventoryList[index].totalQuantity
+    ) {
+      forms.purchaseinventoryList[index].itemQuantity = 0;
+      forms.purchaseinventoryList[index].profitAmount = 0;
     }
-  })
-  store.setCurrentDataPLPDAll({ purchaseinventoryList: forms.purchaseinventoryList});
+  });
+  store.setCurrentDataPLPDAll({ purchaseinventoryList: forms.purchaseinventoryList });
 }
-function getDetail(type){
-  form.purchaseinventoryList.map((e,index)=>{
-    if(type){  //编辑
-      e.isSave = true
-    }else{
-      e.isSave = false
+function getDetail(type) {
+  form.purchaseinventoryList.map((e, index) => {
+    if (type) {
+      //编辑
+      e.isSave = true;
+    } else {
+      e.isSave = false;
     }
-    form.purchaseinventoryList[index].statusMaxvalue =  false
-    e.volume = e.totalVolume
-    e.name = e.itemName
-    e.manufacturer = e.manufacturerText
-    if(e.purposeTypeEnum){
-      warehous_type.value.map(item=>{
-        if(item.value == e.purposeTypeEnum ){
-          receiptHeaderForm.purposeTypeEnum = item.label
+    form.purchaseinventoryList[index].statusMaxvalue = false;
+    e.volume = e.totalVolume;
+    e.name = e.itemName;
+    e.manufacturer = e.manufacturerText;
+    if (e.purposeTypeEnum) {
+      warehous_type.value.map((item) => {
+        if (item.value == e.purposeTypeEnum) {
+          receiptHeaderForm.purposeTypeEnum = item.label;
         }
-      })
-      handleChangePurposeTypeEnum(e.purposeTypeEnum,1)
+      });
+      handleChangePurposeTypeEnum(e.purposeTypeEnum, 1);
     }
-    
-    if(e.purposeLocationId){
-      receiptHeaderForm.purposeLocationId1 = e.purposeLocationId
-      receiptHeaderForm.purposeLocationId =  e.purposeLocationName?e.purposeLocationName:""
-      if(purposeTypeListOptions.value){
-        let purposeTypeList = purposeTypeListOptions.value.filter(k=> k.id==e.purposeLocationId)
-        receiptHeaderForm.purposeLocationId = purposeTypeList?purposeTypeList[0].name:''
-      }
-    }
-    if(e.itemType){
-      purchase_type.value.map(item=>{
-        if(item.value == e.itemType ){
-          // receiptHeaderForm.medicationType = item.label
-          receiptHeaderForm.medicationType = item.value
-          form.purchaseinventoryList[index].itemType_enumText = item.label
-        }
-      })
-    }
-    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
-    
-  
-    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)
-      }else{
-        form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
-      }
-      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;
-        console.log(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode,1)
-        if(form.purchaseinventoryList[index].measurementUnitCode == form.purchaseinventoryList[index].unitList.unitCode){  // 回显大单位
-          console.log(e,index,1,form.purchaseinventoryList[index].unitList)
-          getMaxCounts(e,index,1)
-        }else{
-          form.purchaseinventoryList[index].totalQuantity = form.purchaseinventoryList[index].totalPurposeQuantity + form.purchaseinventoryList[index].itemQuantity
-        }
-      }
-    }
-    if(e.price){
-      console.log(form.purchaseinventoryList[index].measurementUnitCode,form.purchaseinventoryList[index].unitList.minUnitCode,1)
-      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);
 
-      }else{
-        if(form.purchaseinventoryList[index].price>1){
-          form.purchaseinventoryList[index].price = form.purchaseinventoryList[index].price.toFixed(4);
+    if (e.purposeLocationId) {
+      receiptHeaderForm.purposeLocationId1 = e.purposeLocationId;
+      receiptHeaderForm.purposeLocationId = e.purposeLocationName ? e.purposeLocationName : '';
+      if (purposeTypeListOptions.value) {
+        let purposeTypeList = purposeTypeListOptions.value.filter(
+          (k) => k.id == e.purposeLocationId
+        );
+        receiptHeaderForm.purposeLocationId = purposeTypeList ? purposeTypeList[0].name : '';
+      }
+    }
+    if (e.itemType) {
+      purchase_type.value.map((item) => {
+        if (item.value == e.itemType) {
+          // receiptHeaderForm.medicationType = item.label
+          receiptHeaderForm.medicationType = item.value;
+          form.purchaseinventoryList[index].itemType_enumText = item.label;
+        }
+      });
+    }
+    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;
+
+    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);
+      } else {
+        form.purchaseinventoryList[index].totalQuantity =
+          form.purchaseinventoryList[index].totalPurposeQuantity +
+          form.purchaseinventoryList[index].itemQuantity;
+      }
+      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;
+        console.log(
+          form.purchaseinventoryList[index].measurementUnitCode ==
+            form.purchaseinventoryList[index].unitList.unitCode,
+          1
+        );
+        if (
+          form.purchaseinventoryList[index].measurementUnitCode ==
+          form.purchaseinventoryList[index].unitList.unitCode
+        ) {
+          // 回显大单位
+          console.log(e, index, 1, form.purchaseinventoryList[index].unitList);
+          getMaxCounts(e, index, 1);
+        } else {
+          form.purchaseinventoryList[index].totalQuantity =
+            form.purchaseinventoryList[index].totalPurposeQuantity +
+            form.purchaseinventoryList[index].itemQuantity;
+        }
+      }
+    }
+    if (e.price) {
+      console.log(
+        form.purchaseinventoryList[index].measurementUnitCode,
+        form.purchaseinventoryList[index].unitList.minUnitCode,
+        1
+      );
+      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);
+      } else {
+        if (form.purchaseinventoryList[index].price > 1) {
+          form.purchaseinventoryList[index].price =
+            form.purchaseinventoryList[index].price.toFixed(4);
         }
       }
       let purchaseItem = form.purchaseinventoryList[index];
       if (purchaseItem.price > 0 && purchaseItem.totalQuantity > 0) {
         form.purchaseinventoryList[index].totalPrice =
           purchaseItem.price * purchaseItem.totalQuantity;
-        form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
+        form.purchaseinventoryList[index].totalPrice =
+          form.purchaseinventoryList[index].totalPrice.toFixed(4);
       }
       if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
         form.purchaseinventoryList[index].profitAmount =
           purchaseItem.price * purchaseItem.itemQuantity;
-        form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
+        form.purchaseinventoryList[index].profitAmount =
+          form.purchaseinventoryList[index].profitAmount.toFixed(4);
       }
-
-    }else{
-      form.purchaseinventoryList[index].price = 0
-      form.purchaseinventoryList[index].totalPrice = 0
-      form.purchaseinventoryList[index].profitAmount = 0  
+    } else {
+      form.purchaseinventoryList[index].price = 0;
+      form.purchaseinventoryList[index].totalPrice = 0;
+      form.purchaseinventoryList[index].profitAmount = 0;
     }
     // stocktakingUnitId : item.unitCode === item.unitCode ? 1 : 2,
     // 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)
-   
+
     // const profitReasonOptionslabel = profitReasonOptions.value.filter(reasonItem => reasonItem.value ===  parseFloat(form.purchaseinventoryList[index].reasonCode))
     // 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].totalQuantity){
-      form.purchaseinventoryList[index].itemQuantity = 0 
-      form.purchaseinventoryList[index].profitAmount = 0
+    form.purchaseinventoryList[index].reasonCode = form.purchaseinventoryList[index].reasonCode;
+    if (
+      form.purchaseinventoryList[index].totalPurposeQuantity ==
+      form.purchaseinventoryList[index].totalQuantity
+    ) {
+      form.purchaseinventoryList[index].itemQuantity = 0;
+      form.purchaseinventoryList[index].profitAmount = 0;
     }
-  })
-  if(!type){  //编辑
-    store.setCurrentDataPLPD({ purchaseinventoryList: form.purchaseinventoryList, receiptHeaderForm: receiptHeaderForm });
+  });
+  if (!type) {
+    //编辑
+    store.setCurrentDataPLPD({
+      purchaseinventoryList: form.purchaseinventoryList,
+      receiptHeaderForm: receiptHeaderForm,
+    });
   }
 }
-function reasonCodeChange(row,index){
-  editBatchTransfer(index)
-  console.log(forms.purchaseinventoryList[index],form.purchaseinventoryList[index],"备注")
+function reasonCodeChange(row, index) {
+  editBatchTransfer(index);
+  console.log(forms.purchaseinventoryList[index], form.purchaseinventoryList[index], '备注');
 }
-function reasonBlur(row,index){
-  console.log(row,index,"备注")
-  editBatchTransfer(index)
-  console.log(forms.purchaseinventoryList[index],form.purchaseinventoryList[index],"备注")
+function reasonBlur(row, index) {
+  console.log(row, index, '备注');
+  editBatchTransfer(index);
+  console.log(forms.purchaseinventoryList[index], form.purchaseinventoryList[index], '备注');
 }
-function editBatchTransfer(index){
-  if(queryParams.value.pageNo==1){
-    forms.purchaseinventoryList[index] =  form.purchaseinventoryList[index]
-  }else{
-    let editIndex = (Number(queryParams.value.pageNo)-1)*Number(queryParams.value.pageSize)+index
-    forms.purchaseinventoryList[editIndex] =  form.purchaseinventoryList[index]
+function editBatchTransfer(index) {
+  if (queryParams.value.pageNo == 1) {
+    forms.purchaseinventoryList[index] = form.purchaseinventoryList[index];
+  } else {
+    let editIndex =
+      (Number(queryParams.value.pageNo) - 1) * Number(queryParams.value.pageSize) + index;
+    forms.purchaseinventoryList[editIndex] = form.purchaseinventoryList[index];
   }
 }
-function getBatchList(type){
+function getBatchList(type) {
   data.isEdit = false;
-  handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum,1)
-  let purposeLocationId= purposeTypeListOptions.value.filter(e=>{return e.name==receiptHeaderForm.purposeLocationId})
-  queryParams.value.sourceLocationId = (purposeLocationId&&purposeLocationId[0])?purposeLocationId[0].id:receiptHeaderForm.purposeLocationId
-  
+  handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum, 1);
+  let purposeLocationId = purposeTypeListOptions.value.filter((e) => {
+    return e.name == receiptHeaderForm.purposeLocationId;
+  });
+  queryParams.value.sourceLocationId =
+    purposeLocationId && purposeLocationId[0]
+      ? purposeLocationId[0].id
+      : receiptHeaderForm.purposeLocationId;
+
   // queryParams.value.sourceLocationId=receiptHeaderForm.sourceLocationId
   // queryParams.value.purposeLocationId=receiptHeaderForm.purposeLocationId
   // if(receiptHeaderForm.medicationType=='1'||receiptHeaderForm.medicationType=='2'){
@@ -1748,84 +1884,92 @@ function getBatchList(type){
   // }else{
   //   queryParams.value.medicationType=receiptHeaderForm.medicationType1
   // }
-  queryParams.value.medicationType=receiptHeaderForm.medicationType
+  queryParams.value.medicationType = receiptHeaderForm.medicationType;
   // console.log(queryParams.value,"queryParams.value")
-  if(!type){
+  if (!type) {
     getStocktakingReceiptBatch(queryParams.value).then((res) => {
-      form.purchaseinventoryList = res.data.records
-      total.value = res.data.total  // 分页
-      getDetail()
-      getAllBatchList()
-    })
-  }else{ // 切换页码
+      form.purchaseinventoryList = res.data.records;
+      total.value = res.data.total; // 分页
+      getDetail();
+      getAllBatchList();
+    });
+  } else {
+    // 切换页码
     getStocktakingReceiptBatch(queryParams.value).then((res) => {
-      form.purchaseinventoryList = res.data.records
-      total.value = res.data.total  // 分页
-      getDetail()
-    })
-    console.log(form.purchaseinventoryList[0].id,forms.purchaseinventoryList[0].id,"分页")
+      form.purchaseinventoryList = res.data.records;
+      total.value = res.data.total; // 分页
+      getDetail();
+    });
+    console.log(form.purchaseinventoryList[0].id, forms.purchaseinventoryList[0].id, '分页');
     // console.log(total.value,form.purchaseinventoryList,forms.purchaseinventoryList[k],"!212121213")
   }
 }
-function getAllBatchList(type){
-  if(type){
+function getAllBatchList(type) {
+  if (type) {
     data.isEdit = true;
-  }else{
+  } else {
     data.isEdit = false;
   }
-  if(receiptHeaderForm.purposeTypeEnum){
-    warehous_type.value.map(item=>{
-      if(item.label == receiptHeaderForm.purposeTypeEnum){
-        receiptHeaderForm.purposeTypeEnum = item.value
+  if (receiptHeaderForm.purposeTypeEnum) {
+    warehous_type.value.map((item) => {
+      if (item.label == receiptHeaderForm.purposeTypeEnum) {
+        receiptHeaderForm.purposeTypeEnum = item.value;
       }
-    })
-    handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum,1)
+    });
+    handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum, 1);
   }
-    
-  if(purposeTypeListOptions.value){
-    let purposeLocationId= purposeTypeListOptions.value.filter(e=>{return e.name==receiptHeaderForm.purposeLocationId})
-    queryParams.value.sourceLocationId = (purposeLocationId&&purposeLocationId[0])?purposeLocationId[0].id:receiptHeaderForm.purposeLocationId
+
+  if (purposeTypeListOptions.value) {
+    let purposeLocationId = purposeTypeListOptions.value.filter((e) => {
+      return e.name == receiptHeaderForm.purposeLocationId;
+    });
+    queryParams.value.sourceLocationId =
+      purposeLocationId && purposeLocationId[0]
+        ? purposeLocationId[0].id
+        : receiptHeaderForm.purposeLocationId;
   }
   // if(receiptHeaderForm.medicationType=='1'||receiptHeaderForm.medicationType=='2'){
   //   queryParams.value.medicationType=receiptHeaderForm.medicationType
   // }else{
   //   queryParams.value.medicationType=receiptHeaderForm.medicationType1
   // }
-  queryParams.value.medicationType=receiptHeaderForm.medicationType
-  console.log(queryParams.value,"queryParams.value")
-  if(total.value){
-    if(type==2){
+  queryParams.value.medicationType = receiptHeaderForm.medicationType;
+  console.log(queryParams.value, 'queryParams.value');
+  if (total.value) {
+    if (type == 2) {
       let queryParamss = {
-        busNo:receiptHeaderForm.busNo,
-        pageNo:1,
-        pageSize:total.value,
-        sourceLocationId:queryParams.value.sourceLocationId,
+        busNo: receiptHeaderForm.busNo,
+        pageNo: 1,
+        pageSize: total.value,
+        sourceLocationId: queryParams.value.sourceLocationId,
         // purposeLocationId:queryParams.value.purposeLocationId,
-        medicationType:queryParams.value.medicationType
-      }
+        medicationType: queryParams.value.medicationType,
+      };
       // 所有数据批量详情
       getstocktakingDetail(queryParamss).then((res) => {
-        forms.purchaseinventoryList = res.data.records?res.data.records:res.data
+        forms.purchaseinventoryList = res.data.records ? res.data.records : res.data;
         // total.value = res.data.total
-        getDetailAll()
-      })
-    }else{
+        getDetailAll();
+      });
+    } else {
       let queryParamss = {
-        pageNo:1,
-        pageSize:total.value,
-        sourceLocationId:queryParams.value.sourceLocationId,
+        pageNo: 1,
+        pageSize: total.value,
+        sourceLocationId: queryParams.value.sourceLocationId,
         // purposeLocationId:queryParams.value.purposeLocationId,
-        medicationType:queryParams.value.medicationType
-      }
-      console.log(queryParamss,"queryParamss",total.value)
-      getStocktakingReceiptBatch(queryParamss).then((res) => {
-        forms.purchaseinventoryList = res.data.records
-        // total.value = res.data.total  // 分页
-        getDetailAll()
-      }).catch(error => {
-        forms.purchaseinventoryList = form.purchaseinventoryList
-        console.error("请求失败", error);
-      })
+        medicationType: queryParams.value.medicationType,
+      };
+      console.log(queryParamss, 'queryParamss', total.value);
+      getStocktakingReceiptBatch(queryParamss)
+        .then((res) => {
+          forms.purchaseinventoryList = res.data.records;
+          // total.value = res.data.total  // 分页
+          getDetailAll();
+        })
+        .catch((error) => {
+          forms.purchaseinventoryList = form.purchaseinventoryList;
+          console.error('请求失败', error);
+        });
     }
   }
 }
@@ -1837,10 +1981,10 @@ function show() {
   reset();
   visible.value = true;
   purposeTypeListOptions.value = props.purposeTypeListOptions;
-  categoryListOptions.value = props.categoryListOptions
-  profitReasonOptions.value = props.profitReasonOptions
-  
-  console.log('categoryListOptions',categoryListOptions.value)
+  categoryListOptions.value = props.categoryListOptions;
+  profitReasonOptions.value = props.profitReasonOptions;
+
+  console.log('categoryListOptions', categoryListOptions.value);
   receiptHeaderForm.busNo = props.busNoAdd;
   // console.log(purchase_type.value, "purchase_type.value")
   // // 设置默认值为字典中的第一个值
@@ -1852,59 +1996,65 @@ function show() {
 function edit() {
   data.isAdding = false;
   data.isEdit = true;
-  console.log(props, "111111111111111111111111111111")
+  console.log(props, '111111111111111111111111111111');
   // reset();
   visible.value = true;
   purposeTypeListOptions.value = props.purposeTypeListOptions;
-  categoryListOptions.value = props.categoryListOptions
-  profitReasonOptions.value = props.profitReasonOptions
+  categoryListOptions.value = props.categoryListOptions;
+  profitReasonOptions.value = props.profitReasonOptions;
   receiptHeaderForm.busNo = props.editRow.supplyBusNo;
   receiptHeaderForm.supplierId = props.editRow.supplierId;
   receiptHeaderForm.practitionerId = props.editRow.practitionerId;
   receiptHeaderForm.occurrenceTime = formatDate(props.editRow.occurrenceTime);
   receiptHeaderForm.purposeTypeEnum = props.editRow.purposeTypeEnum_enumText;
   receiptHeaderForm.medicationType =
-    props.editRow.itemTable == "med_medication_definition" ? "1" : "2";
+    props.editRow.itemTable == 'med_medication_definition' ? '1' : '2';
   total.value = form.purchaseinventoryList.length;
   // handleChangeLocationType(props.editRow.purposeTypeEnum.toString());
   setTimeout(() => {
     form.purchaseinventoryList = props.item.map((item) => {
-      console.log('ddddddddddddddddddddd',item)
+      console.log('ddddddddddddddddddddd', item);
       return {
         ...item,
-        unitCodeList:[
-          {id:1,name:item.unitCode_dictText,unitName:item.unitCode,code:item.unitCode},
-          {id:2,name:item.minUnitCode_dictText,unitName:item.minUnitCode,code:item.minUnitCode}]
+        unitCodeList: [
+          { id: 1, name: item.unitCode_dictText, unitName: item.unitCode, code: item.unitCode },
+          {
+            id: 2,
+            name: item.minUnitCode_dictText,
+            unitName: item.minUnitCode,
+            code: item.minUnitCode,
+          },
+        ],
       };
     });
-    
-  console.log(form.purchaseinventoryList, "22222222222222222222")
+
+    console.log(form.purchaseinventoryList, '22222222222222222222');
   }, 100);
-  
+
   loading.value = false;
 }
 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;
     });
-  }  
- 
-  console.log(ids,"ids12121212121")
+  }
+
+  console.log(ids, 'ids12121212121');
 
   if (selectedRows.value[length - 1].isSave) {
     delProductStocktaking(ids).then((res) => {
       if (res.code == 200) {
-        proxy.$message.success("删除成功");
+        proxy.$message.success('删除成功');
       }
     });
   } else {
-    if (length > 1&&ids&&ids.length>0) {
+    if (length > 1 && ids && ids.length > 0) {
       delProductStocktaking(ids).then((res) => {
         if (res.code == 200) {
-          proxy.$message.success("删除成功");
+          proxy.$message.success('删除成功');
         }
       });
     }
@@ -1918,70 +2068,79 @@ function deleteSelectedRows() {
   // }else{
   //   data.isEdit = false
   // }
- 
+
   data.isAdding = false;
 }
 // 驳回
 function handleReject() {
   reject(route.query.supplyBusNo).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
+      proxy.$modal.msgSuccess('操作成功');
       store.clearCurrentDataPLPD();
       store.clearCurrentDataPLPDALL();
       // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'chkstockBatch'}});
+      router.replace({
+        path: '/aaaa/medicationmanagement/billapproval',
+        query: { type: 'chkstockBatch' },
+      });
     }
   });
 }
 function handelApply() {
-  pageLoading.value = true
-  productStocktakingApproved(route.query.supplyBusNo).then((res) => {
-    if (res.code == 200) {
-      proxy.$modal.msgSuccess("操作成功");
-      pageLoading.loading = false
-      store.clearCurrentDataPLPD();
-      store.clearCurrentDataPLPDALL();
-      // 跳转到审核页面
-      router.replace({ path: '/aaaa/medicationmanagement/billapproval',query:{type:'chkstockBatch'}});
-    }
-  }).catch(() =>{
-    pageLoading.loading = false
-  })
+  pageLoading.value = true;
+  productStocktakingApproved(route.query.supplyBusNo)
+    .then((res) => {
+      if (res.code == 200) {
+        proxy.$modal.msgSuccess('操作成功');
+        pageLoading.loading = false;
+        store.clearCurrentDataPLPD();
+        store.clearCurrentDataPLPDALL();
+        // 跳转到审核页面
+        router.replace({
+          path: '/aaaa/medicationmanagement/billapproval',
+          query: { type: 'chkstockBatch' },
+        });
+      }
+    })
+    .catch(() => {
+      pageLoading.loading = false;
+    });
 }
 /** 提交审核 */
 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 {
     submitApproval(receiptHeaderForm.busNo).then((res) => {
       if (res.code == 200) {
-        proxy.$modal.msgSuccess("提交审批成功");
+        proxy.$modal.msgSuccess('提交审批成功');
         tagsViewStore.delView(router.currentRoute.value);
         // 跳转到审核页面
         router.replace({ path: 'chkstockRecord' });
-        store.clearCurrentDataPLDB()
-        store.clearCurrentDataPLPDAll()
-        emit("refresh");
+        store.clearCurrentDataPLDB();
+        store.clearCurrentDataPLPDAll();
+        emit('refresh');
       }
     });
   }
 }
 
 function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0]
-  if(view.name== 'ChkstockBatch'){ //调拨单据号删除
-    sessionStorage.setItem('busNoplpd',"")
-  }  
+  const latestView = visitedViews.slice(-1)[0];
+  if (view.name == 'ChkstockBatch') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNoplpd', '');
+  }
   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('/');
     }
   }
 }
@@ -1990,30 +2149,38 @@ function toLastView(visitedViews, view) {
 function handleDelete(row) {
   const delId = row.id || ids.value;
   proxy.$modal
-    .confirm("是否确认删除以上数据?")
+    .confirm('是否确认删除以上数据?')
     .then(function () {
-      return delProductStocktaking({ ids: delId.join(",") });
+      return delProductStocktaking({ ids: delId.join(',') });
     })
     .then(() => {
-      proxy.$modal.msgSuccess("删除成功");
+      proxy.$modal.msgSuccess('删除成功');
     })
     .catch(() => {});
 }
 function handleCabinetChange(value) {
-  if(value){
-    freightListOptions.value = purposeTypeListOptions.value.filter(item => item.id === value)[0].children
+  if (value) {
+    freightListOptions.value = purposeTypeListOptions.value.filter(
+      (item) => item.id === value
+    )[0].children;
   } else {
-    freightListOptions.value = []
+    freightListOptions.value = [];
   }
 }
 function getStockReceiptTypeList() {
   data.isAdding = false;
   // 无论任何方式进到画面的默认处理
   getInit().then((response) => {
-    console.log('详情页查询下拉树response1111111',response)
+    console.log('详情页查询下拉树response1111111', response);
 
     // categoryListOptions.value = response.data.categoryListOptions; // 药品类型
+<<<<<<< HEAD
     profitReasonOptions.value =  response.data.profitReasonOptions; // 盈亏原因
+=======
+    profitReasonOptions.value = response.data.profitReasonOptions; // 盈亏原因
+    // receiptHeaderForm.purposeTypeEnum = warehous_type.value[0].value // 仓库类型默认值
+    // handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum)
+>>>>>>> upstream/develop
     // cabinetListOptionsBk.value = response.data.purposeTypeListOptions; // 盘点仓库列表（未过滤）
 
     // purposeTypeListOptions.value = cabinetListOptionsBk.value.filter(item => item.formEnum === receiptHeaderForm.purposeTypeEnum) // 盘点仓库列表
@@ -2025,84 +2192,106 @@ function getStockReceiptTypeList() {
 }
 // 计算总价
 function handleTotalPrice(index) {
-  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
+  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.totalQuantity > 0) {
+    form.purchaseinventoryList[index].totalPrice = purchaseItem.price * purchaseItem.totalQuantity;
     form.purchaseinventoryList[index].totalPrice =
-      purchaseItem.price * purchaseItem.totalQuantity;
-     form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
+      form.purchaseinventoryList[index].totalPrice.toFixed(4);
   }
   if (purchaseItem.price > 0 && purchaseItem.itemQuantity) {
+    form.purchaseinventoryList[index].profitAmount = purchaseItem.price * purchaseItem.itemQuantity;
     form.purchaseinventoryList[index].profitAmount =
-      purchaseItem.price * purchaseItem.itemQuantity;
-     form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
+      form.purchaseinventoryList[index].profitAmount.toFixed(4);
   }
-  if(form.purchaseinventoryList[index].itemQuantity==0){
-    form.purchaseinventoryList[index].profitAmount = 0
+  if (form.purchaseinventoryList[index].itemQuantity == 0) {
+    form.purchaseinventoryList[index].profitAmount = 0;
   }
-  if(form.purchaseinventoryList[index].totalQuantity==0){
-    form.purchaseinventoryList[index].totalPrice = 0
+  if (form.purchaseinventoryList[index].totalQuantity == 0) {
+    form.purchaseinventoryList[index].totalPrice = 0;
   }
-  editBatchTransfer(index)
+  editBatchTransfer(index);
 }
 //实盘数量变更
-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){
+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
+  ) {
+    const integerPart = Math.floor(rowData.oldtotalPurposeQuantity / rowData.partPercent); // 获取整数部分
+    const decimalPart = rowData.oldtotalPurposeQuantity / rowData.partPercent - integerPart; // 获取小数部分
+    console.log(integerPart, decimalPart, 1221212121);
+    if (decimalPart) {
+      let zhengshu = rowData.totalPurposeQuantity.split(
+        form.purchaseinventoryList[index].unitList.unitCode_dictText
+      )[0];
+      let xiaoshu = rowData.totalPurposeQuantity.split(
+        form.purchaseinventoryList[index].unitList.unitCode_dictText
+      )[1];
+      if (xiaoshu) {
+        let xiaoshuzhi = xiaoshu.split(
+          form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+        )[0];
 
-    const integerPart = Math.floor(rowData.oldtotalPurposeQuantity/rowData.partPercent); // 获取整数部分
-    const decimalPart = (rowData.oldtotalPurposeQuantity/rowData.partPercent) - integerPart; // 获取小数部分
-    console.log(integerPart,decimalPart,1221212121)
-    if(decimalPart){
-      let zhengshu = rowData.totalPurposeQuantity.split(form.purchaseinventoryList[index].unitList.unitCode_dictText)[0]
-      let xiaoshu = rowData.totalPurposeQuantity.split(form.purchaseinventoryList[index].unitList.unitCode_dictText)[1]
-      if(xiaoshu){
-        let xiaoshuzhi = xiaoshu.split(form.purchaseinventoryList[index].unitList.minUnitCode_dictText)[0]
-       
-        form.purchaseinventoryList[index].itemQuantity = 
-        (parseFloat(zhengshu) - parseFloat(rowData.totalQuantity))
-        + form.purchaseinventoryList[index].unitList.unitCode_dictText
-        + xiaoshuzhi
-        + form.purchaseinventoryList[index].unitList.minUnitCode_dictText
+        form.purchaseinventoryList[index].itemQuantity =
+          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.totalQuantity))
-          + (rowData.price/rowData.partPercent) * xiaoshuzhi
-          form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
+          form.purchaseinventoryList[index].lllstatus = true;
+          form.purchaseinventoryList[index].profitAmount =
+            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.totalQuantity - rowData.totalPurposeQuantity 
-        if (rowData.price > 0 && rowData.itemQuantity &&rowData.unitList.minUnitCode==rowData.unitCode) {
-          form.purchaseinventoryList[index].profitAmount =
-            rowData.price * rowData.itemQuantity;
-          form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
-        }
+    } else {
+      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;
+        form.purchaseinventoryList[index].profitAmount =
+          form.purchaseinventoryList[index].profitAmount.toFixed(4);
+      }
     }
-  }else{
-    form.purchaseinventoryList[index].itemQuantity = rowData.totalQuantity - rowData.totalPurposeQuantity 
+  } else {
+    form.purchaseinventoryList[index].itemQuantity =
+      rowData.totalQuantity - rowData.totalPurposeQuantity;
   }
-  if (rowData.price > 0 && rowData.itemQuantity &&!form.purchaseinventoryList[index].lllstatus) {
+  if (rowData.price > 0 && rowData.itemQuantity && !form.purchaseinventoryList[index].lllstatus) {
+    form.purchaseinventoryList[index].profitAmount = rowData.price * rowData.itemQuantity;
     form.purchaseinventoryList[index].profitAmount =
-      rowData.price * rowData.itemQuantity;
-     form.purchaseinventoryList[index].profitAmount = form.purchaseinventoryList[index].profitAmount.toFixed(4);
+      form.purchaseinventoryList[index].profitAmount.toFixed(4);
   }
   if (rowData.price > 0 && rowData.totalQuantity > 0) {
+    form.purchaseinventoryList[index].totalPrice = rowData.price * rowData.totalQuantity;
     form.purchaseinventoryList[index].totalPrice =
-      rowData.price * rowData.totalQuantity;
-     form.purchaseinventoryList[index].totalPrice = form.purchaseinventoryList[index].totalPrice.toFixed(4);
+      form.purchaseinventoryList[index].totalPrice.toFixed(4);
   }
-  if(form.purchaseinventoryList[index].itemQuantity==0){
-    form.purchaseinventoryList[index].profitAmount =0
+  if (form.purchaseinventoryList[index].itemQuantity == 0) {
+    form.purchaseinventoryList[index].profitAmount = 0;
   }
-  editBatchTransfer(index)
+  editBatchTransfer(index);
 }
 // 切换仓库类型获取药房/药库列表   目的仓库切换
+<<<<<<< HEAD
 function handleChangePurposeTypeEnum(value,type) {
   // 确保value是数字类型
   const numValue = Number(value);
@@ -2126,6 +2315,26 @@ function handleChangePurposeTypeEnum(value,type) {
       console.error('获取仓库列表失败:', error);
       purposeTypeListOptions.value = [];
       freightListOptions.value = [];
+=======
+function handleChangePurposeTypeEnum(value, type) {
+  if (value == 16) {
+    getPharmacyList().then((res) => {
+      purposeTypeListOptions.value = res.data;
+      if (!route.query.supplyBusNo && !type) {
+        receiptHeaderForm.purposeLocationId = '';
+        receiptHeaderForm.purposeLocationId1 = '';
+      }
+      // getinitValue()
+    });
+  } else if (value == 11) {
+    getDispensaryList().then((res) => {
+      purposeTypeListOptions.value = res.data;
+      if (!route.query.supplyBusNo && !type) {
+        receiptHeaderForm.purposeLocationId = '';
+        receiptHeaderForm.purposeLocationId1 = '';
+      }
+      // getinitValue()
+>>>>>>> upstream/develop
     });
   } else if (numValue === 17) {
       // 处理耗材库类型
@@ -2147,55 +2356,68 @@ function handleChangePurposeTypeEnum(value,type) {
   }
 }
 // 获取默认值
-function getinitValue(){
-  if (purposeTypeListOptions.value.length > 0) { // 判断是否有盘点仓库
-    receiptHeaderForm.purposeLocationId = purposeTypeListOptions.value[0].id // 盘点仓库默认值
-    if (purposeTypeListOptions.value[0].children&&purposeTypeListOptions.value[0].children.length > 0) { // 判断盘点仓库内是否有货位
-      freightListOptions.value = purposeTypeListOptions.value[0].children
-      receiptHeaderForm.purposeLocation = purposeTypeListOptions.value[0].children[0].name
+function getinitValue() {
+  if (purposeTypeListOptions.value.length > 0) {
+    // 判断是否有盘点仓库
+    receiptHeaderForm.purposeLocationId = purposeTypeListOptions.value[0].id; // 盘点仓库默认值
+    if (
+      purposeTypeListOptions.value[0].children &&
+      purposeTypeListOptions.value[0].children.length > 0
+    ) {
+      // 判断盘点仓库内是否有货位
+      freightListOptions.value = purposeTypeListOptions.value[0].children;
+      receiptHeaderForm.purposeLocation = purposeTypeListOptions.value[0].children[0].name;
     }
   }
 }
 function getbusNo() {
-  if(route.query.supplyBusNo||(forms.purchaseinventoryList&&forms.purchaseinventoryList[0]&&forms.purchaseinventoryList[0].id)){  // 编辑
-    store.clearCurrentDataPLPD()
+  if (
+    route.query.supplyBusNo ||
+    (forms.purchaseinventoryList &&
+      forms.purchaseinventoryList[0] &&
+      forms.purchaseinventoryList[0].id)
+  ) {
+    // 编辑
+    store.clearCurrentDataPLPD();
     // store.clearCurrentDataPLPDALL();
     data.isEdit = true;
-    receiptHeaderForm.busNo = route.query.supplyBusNo?route.query.supplyBusNo:receiptHeaderForm.busNo
-    viewStatus.value = route.query.view
-    console.log(queryParams.value,"queryParams.value")
-    queryParams.value.busNo = receiptHeaderForm.busNo
+    receiptHeaderForm.busNo = route.query.supplyBusNo
+      ? route.query.supplyBusNo
+      : receiptHeaderForm.busNo;
+    viewStatus.value = route.query.view;
+    console.log(queryParams.value, 'queryParams.value');
+    queryParams.value.busNo = receiptHeaderForm.busNo;
     getstocktakingDetail(queryParams.value).then((res) => {
-      console.log(res.data.records?res.data.records:res.data,1212121)
-      form.purchaseinventoryList = res.data.records?res.data.records:res.data
-      receiptHeaderForm.occurrenceTime = formatDate(res.data.records[0].occurrenceTime)
-      total.value = res.data.total
-      getDetail(1)
-      getAllBatchList(2)
-    })
-    sessionStorage.setItem('busNoplpd', "")
-  }else{ //新增
+      console.log(res.data.records ? res.data.records : res.data, 1212121);
+      form.purchaseinventoryList = res.data.records ? res.data.records : res.data;
+      receiptHeaderForm.occurrenceTime = formatDate(res.data.records[0].occurrenceTime);
+      total.value = res.data.total;
+      getDetail(1);
+      getAllBatchList(2);
+    });
+    sessionStorage.setItem('busNoplpd', '');
+  } else {
+    //新增
     data.isEdit = false;
-    if(!sessionStorage.getItem('busNoplpd')){
-      store.clearCurrentDataPLPD()
+    if (!sessionStorage.getItem('busNoplpd')) {
+      store.clearCurrentDataPLPD();
       // store.clearCurrentDataPLPDALL();
       getDetailInit().then((response) => {
-        console.log(response,'response',response.data)
+        console.log(response, 'response', response.data);
         receiptHeaderForm.busNo = response.data.busNo;
-        sessionStorage.setItem('busNoplpd', receiptHeaderForm.busNo)
+        sessionStorage.setItem('busNoplpd', receiptHeaderForm.busNo);
         // busNoAdd.value = response.data.busNo; // 单据号新增
-      })
-    }else{
-      receiptHeaderForm.busNo = sessionStorage.getItem('busNoplpd')
+      });
+    } else {
+      receiptHeaderForm.busNo = sessionStorage.getItem('busNoplpd');
     }
   }
 }
 function handleTraceNo(value, row, index) {
-  forms.purchaseinventoryList[index].traceNo = value
+  forms.purchaseinventoryList[index].traceNo = value;
 }
-getStockReceiptTypeList();// 详情页查询下拉树结构
-getbusNo();// 单据号取得
-
+getStockReceiptTypeList(); // 详情页查询下拉树结构
+getbusNo(); // 单据号取得
 </script>
 <style scoped>
 .custom-tree-node {
@@ -2216,4 +2438,4 @@ getbusNo();// 单据号取得
 .custom-tooltip {
   white-space: pre-line;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/template.json b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/template.json
new file mode 100644
index 00000000..c523d384
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/components/template.json
@@ -0,0 +1,449 @@
+{
+  "panels": [
+    {
+      "index": 0,
+      "name": 1,
+      "paperType": "自定义",
+      "height": 130,
+      "width": 210,
+      "paperHeader": 0,
+      "paperFooter": 365.6692913385827,
+      "paperNumberDisabled": true,
+      "paperNumberContinue": true,
+      "expandCss": "",
+      "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": {},
+      "printElements": [
+        {
+          "options": {
+            "left": 222,
+            "top": 12,
+            "height": 12,
+            "width": 115.5,
+            "title": "长春大学医院盘点单",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 19.5,
+            "top": 33,
+            "height": 9.75,
+            "width": 120,
+            "title": "日期",
+            "field": "occurrenceTime",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 222,
+            "top": 33,
+            "height": 9.75,
+            "width": 120,
+            "title": "单据号",
+            "field": "busNo",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 465,
+            "top": 33,
+            "height": 9.75,
+            "width": 120,
+            "title": "机构：长春大学医院",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 19.5,
+            "top": 57,
+            "height": 9.75,
+            "width": 120,
+            "title": "盘点仓库",
+            "field": "purposeLocationName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 19.5,
+            "top": 84,
+            "height": 36,
+            "width": 570,
+            "title": "undefined+beforeDragIn",
+            "field": "purchaseinventoryList",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "columns": [
+              [
+                {
+                  "title": "项目名",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 50.418660151829066,
+                  "field": "name",
+                  "checked": true,
+                  "columnId": "name",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "规格",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 47.38277249096388,
+                  "field": "volume",
+                  "checked": true,
+                  "columnId": "volume",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "厂家/产地",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 70.82692033621548,
+                  "field": "manufacturer",
+                  "checked": true,
+                  "columnId": "manufacturer",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "盘点单位",
+                  "titleSync": false,
+                  "align": "center",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 62.494476949595715,
+                  "field": "measurementUnitCode_dictText",
+                  "checked": true,
+                  "columnId": "measurementUnitCode_dictText",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "单价",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }",
+                  "width": 47.779659918016016,
+                  "field": "price",
+                  "checked": true,
+                  "columnId": "price",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "盈亏数量",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 60.04350865342028,
+                  "field": "itemQuantity",
+                  "checked": true,
+                  "columnId": "itemQuantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "盈亏金额",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }",
+                  "width": 60.03571725956876,
+                  "field": "profitAmount",
+                  "checked": true,
+                  "columnId": "profitAmount",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "产品批号",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 56.38575853120875,
+                  "field": "lotNumber",
+                  "checked": true,
+                  "columnId": "lotNumber",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "盈亏类型",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 56.36601841060319,
+                  "field": "reasonCode_dictText",
+                  "checked": true,
+                  "columnId": "reasonCode_dictText",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "盈亏原因",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 58.266507298578894,
+                  "field": "reason",
+                  "checked": true,
+                  "columnId": "reason",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "盘前库存",
+                  "titleSync": false,
+                  "align": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 51.08786300584732,
+                  "field": "totalPurposeQuantity",
+                  "checked": false,
+                  "columnId": "totalPurposeQuantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "实盘数量",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 53.074934501634054,
+                  "field": "totalQuantity",
+                  "checked": false,
+                  "columnId": "totalQuantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "金额",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value + ' 元'; }",
+                  "width": 39.04544357631049,
+                  "field": "totalPrice",
+                  "checked": false,
+                  "columnId": "totalPrice",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "仓库",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 40.041954542099724,
+                  "field": "purposeLocationName",
+                  "checked": false,
+                  "columnId": "purposeLocationName",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "生产日期",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 63.089377997062755,
+                  "field": "startTime",
+                  "checked": false,
+                  "columnId": "startTime",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "有效期至",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 59.05673483929025,
+                  "field": "endTime",
+                  "checked": false,
+                  "columnId": "endTime",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "发票号",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 51.706448638859854,
+                  "field": "invoiceNo",
+                  "checked": false,
+                  "columnId": "invoiceNo",
+                  "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": 480,
+            "top": 130.5,
+            "height": 12,
+            "width": 109.5,
+            "title": "盈亏合计",
+            "field": "totalAmount",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0,
+            "formatter": "function(title,value,options,templateData,target,paperNo){\n  return value + ' 元'\n}"
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 261.24609375,
+            "top": 130.74609375,
+            "height": 12,
+            "width": 109.5,
+            "title": "制单人",
+            "field": "name",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
index eccb979a..ac35da84 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
@@ -35,6 +35,7 @@
         <el-button type="primary" plain icon="Plus" @click="handleSave">批量保存</el-button>
       </el-col>
     </el-row>
+    <el-button type="primary" plain icon="Printer" @click="handlePrint"> 打印单据 </el-button>
     <el-form
       :model="receiptHeaderForm"
       ref="receiptHeaderRef"
@@ -633,6 +634,8 @@ import { useRoute } from 'vue-router';
 import { ref, reactive, watch, onMounted, onUnmounted, toRefs, defineEmits, getCurrentInstance } from 'vue';
 import { useStore } from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
+import templateJson from './components/template';
+import { hiprint } from 'vue-plugin-hiprint';
 import { debounce } from 'lodash-es';
 const tagsViewStore = useTagsViewStore();
 const store = useStore();
@@ -1367,6 +1370,39 @@ function handleLocationClick(purposeLocationId, itemId, index, lotNumber) {
   });
 }
 
+function handlePrint() {
+  const result = [];
+  // let supplierName = supplierListOptions.value.filter((item) => {
+  //   return item.value == receiptHeaderForm.supplierId;
+  // })[0].label;
+  // const totalAmount = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
+  //   return accumulator + (Number(currentRow.totalPrice) || 0);
+  // }, 0);
+  form.purchaseinventoryList = form.purchaseinventoryList.map((item) => {
+    return {
+      ...item,
+      price: Number(item.price).toFixed(2),
+      profitAmount: Number(item.profitAmount).toFixed(2),
+      reasonCode_dictText: profit_reason.value.filter((k) => k.value == item.reasonCode)[0]?.label,
+    };
+  });
+  result.push({
+    // supplierName: supplierName,
+    purposeLocationName: form.purchaseinventoryList[0].purposeLocationName,
+    name: userStore.name,
+    totalAmount: totalAmount.value.toFixed(2),
+    ...receiptHeaderForm,
+    purchaseinventoryList: form.purchaseinventoryList,
+  });
+  console.log(result, '345678987654');
+  const printElements = templateJson;
+  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+  hiprintTemplate.print2(result, {
+    printer: 'EPSON LQ-80KFII',
+    title: '打印标题',
+  }); //开始打印
+}
+
 // 单位处理
 function handleUnitCodeChange(row, index, value) {
   // 防止点击和已选一样的问题
@@ -1677,8 +1713,8 @@ function getMaxCounts(row, index, counts) {
 }
 
 function handleSave(row, index) {
-    if (form.purchaseinventoryList.length === 0) {
-       proxy.$message.success('保存成功！');
+  if (form.purchaseinventoryList.length === 0) {
+    proxy.$message.success('保存成功！');
     return;
   }
   rowList.value = [];
@@ -2504,7 +2540,7 @@ function totalSourceQuantityChange(rowData, index, value) {
           // 计算盈亏金额
           if (rowData.price > 0) {
             form.purchaseinventoryList[index].lllstatus = true;
-            const profitAmount = 
+            const profitAmount =
               // 修复：正确计算盈亏金额 - 实盘数量减去盘前库存整数部分
               rowData.price * (totalQuantityNum - parseFloat(zhengshu)) +
               (rowData.price / partPercent) * parseFloat(xiaoshuzhi);
@@ -2529,7 +2565,7 @@ function totalSourceQuantityChange(rowData, index, value) {
   // 确保在所有情况下都正确计算盈亏金额
   if (rowData.price > 0 && !form.purchaseinventoryList[index].lllstatus) {
     // 处理字符串类型的itemQuantity
-    const itemQuantityNum = 
+    const itemQuantityNum =
       typeof form.purchaseinventoryList[index].itemQuantity === 'string'
         ? parseFloat(form.purchaseinventoryList[index].itemQuantity) || 0
         : form.purchaseinventoryList[index].itemQuantity || 0;
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/components/api.js
new file mode 100644
index 00000000..dcd6cd55
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/components/api.js
@@ -0,0 +1,129 @@
+import request from '@/utils/request';
+import {parseStrEmpty} from '@/utils/openhis';
+
+// 查询盘点列表
+export function getStockTakeList (query) {
+  return request ({
+    url: '/nurse-station/orgdevice-stocktake/summary-from',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 盘点编辑页列表
+export function getstocktakingDetail (busNo) {
+  return request ({
+    url: '/inventory-manage/stocktaking/stocktaking-receipt',
+    method: 'get',
+    params: {busNo}, // 确保参数正确传递
+  });
+}
+
+// 添加/编辑入库单据
+export function addProductStocktaking (data) {
+  return request ({
+    url: '/inventory-manage/stocktaking/product-stocktaking',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 查询盘点列表初始化查询区数据
+export function getInit () {
+  return request ({
+    url: '/inventory-manage/stocktaking/init',
+    method: 'get',
+  });
+}
+
+// 查询盘点详情初始化查询区数据
+export function getDetailInit () {
+  return request ({
+    url: '/inventory-manage/stocktaking/detail-init',
+    method: 'get',
+  });
+}
+
+// 生成批量盘点
+export function getStocktakingReceiptBatch () {
+  return request ({
+    url: '/inventory-manage/stocktaking/stocktaking-receipt-batch',
+    method: 'get',
+  });
+}
+//保存批量盘点
+export function addBatch (data) {
+  return request ({
+    url: '/inventory-manage/stocktaking/stocktaking-receipt-addBatch',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 删除单据
+export function delProductStocktaking (param) {
+  return request ({
+    url: '/inventory-manage/stocktaking/product-stocktaking?supplyRequestIds=' +
+      param,
+    method: 'delete',
+  });
+}
+
+// 提交审批
+export function submitApproval (busNo) {
+  return request ({
+    url: '/inventory-manage/stocktaking/submit-approval',
+    method: 'put',
+    data: busNo,
+  });
+}
+
+// 撤回审批
+export function withdrawApproval (busNo) {
+  return request ({
+    url: '/inventory-manage/stocktaking/withdraw-approval',
+    method: 'put',
+    data: busNo,
+  });
+}
+
+// 获取药品目录
+export function getMedicineList (queryParams) {
+  return request ({
+    url: '/app-common/inventory-item',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+// 获取药品目录
+export function getCount (queryParams) {
+  return request ({
+    url: '/inventory-manage/purchase/inventory-item-info',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+// 获取药房列表
+export function getPharmacyList () {
+  return request ({
+    url: '/app-common/pharmacy-list',
+    method: 'get',
+  });
+}
+
+// 获取药库列表
+export function getDispensaryList () {
+  return request ({
+    url: '/app-common/cabinet-list',
+    method: 'get',
+  });
+}
+
+export function stocktakingReceiptAuto () {
+  return request ({
+    url: '/inventory-manage/stocktaking/stocktaking-receipt-auto',
+    method: 'get',
+  });
+}
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/components/medicineList.vue
new file mode 100644
index 00000000..89b2cf2c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/components/medicineList.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <el-table
+      ref="medicineRef"
+      height="400"
+      :data="medicineList"
+      @cell-click="clickRow"
+    >
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="name"
+        width="300"
+      />
+      <el-table-column
+        label="项目类型"
+        align="center"
+        prop="itemType_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" prop="dose" />
+      <el-table-column
+        label="剂量单位"
+        align="center"
+        prop="doseUnitCode_dictText"
+      /> -->
+      <el-table-column label="生产厂家" align="center" prop="manufacturer" />
+       <el-table-column
+        label="编码"
+        align="center"
+        prop="ybNo"
+      />
+    </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: "",
+  },
+  itemType: {
+    type: String,
+    default: "",
+  },
+  purposeLocationId:{
+    type: String,
+    default: "",
+  },
+  purposeLocationId1:{
+    type: String,
+    default: "",
+  },
+});
+const emit = defineEmits(["selectRow"]);
+const queryParams = ref({
+  itemType: props.itemType,
+  orgLocationId:props.purposeLocationId,
+  orgLocationId1:props.purposeLocationId1,
+  purchaseFlag:0
+});
+const medicineList = ref([]);
+
+// 节流函数
+const throttledGetList = throttle(
+  () => {
+    getList();
+  },
+  300,
+  { leading: true, trailing: true }
+);
+
+watch(
+  () => props,
+  (newValue) => {
+    queryParams.value.searchKey = newValue.searchKey
+    queryParams.value.itemType = newValue.itemType
+    queryParams.value.orgLocationId = newValue.sourceLocationId
+    queryParams.value.orgLocationId1 = newValue.sourceLocationId1
+    throttledGetList();
+  },
+  { immdiate: true, deep: true }
+);
+
+getList();
+function getList() {
+  if(route.query.supplyBusNo){ // 编辑
+    queryParams.value.itemType =  queryParams.value.itemType;
+    queryParams.value.orgLocationId = queryParams.value.orgLocationId1
+  }
+  delete queryParams.value.orgLocationId1
+  getMedicineList(queryParams.value).then((res) => {
+    medicineList.value = res.data;
+  });
+}
+
+function clickRow(row) {
+  emit("selectRow", row);
+}
+</script>
+      
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue
new file mode 100644
index 00000000..fab25abe
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue
@@ -0,0 +1,178 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="项目名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入项目名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库类型" prop="purposeTypeEnum">
+        <el-select
+          v-model="queryParams.purposeTypeEnum"
+          placeholder="请选择"
+          clearable
+          filterable
+          style="width: 200px"
+          @change="handleChangePurposeTypeEnum"
+        >
+          <el-option
+            v-for="item in warehous_type"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="盘点仓库" prop="purposeLocationId">
+        <el-select
+          v-model="queryParams.purposeLocationId"
+          placeholder="请选择"
+          clearable
+          filterable
+          style="width: 200px"
+          @change="handleCabinetChange(receiptHeaderForm.purposeLocationId)"
+        >
+          <el-option
+            v-for="item in [
+              { id: 1, name: '仓库1' },
+              { id: 2, name: '仓库2' },
+            ]"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="货位" prop="purposeLocation">
+        <el-select
+          v-model="queryParams.purposeLocation"
+          placeholder="请选择"
+          clearable
+          filterable
+          style="width: 200px"
+        >
+          <el-option
+            v-for="item in [
+              { id: 1, name: '货位1' },
+              { id: 2, name: '货位2' },
+            ]"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </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-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 250px)"
+    >
+      <el-table-column
+        label="项目"
+        align="center"
+        key="name"
+        prop="name"
+        width="200"
+        fixed
+      ></el-table-column>
+      <el-table-column label="规格" align="center" prop="totalVolume" />
+      <el-table-column label="厂家/产地" align="center" prop="manufacturer" show-overflow-tooltip />
+      <el-table-column label="产品批号" align="center" prop="lotNumber" />
+      <el-table-column label="单价" align="center" key="unit" prop="unitPrice" />
+      <el-table-column label="发放数量" align="center" prop="dispenseQuantity" />
+      <el-table-column label="库存数量" align="center" prop="quantity" />
+      <el-table-column label="盈亏数量" align="center" prop="itemQuantity">
+        <template #default="scope">
+          <el-input v-model="scope.row.itemQuantity" :input-style="{ textAlign: 'center' }" type="number" />
+        </template>
+      </el-table-column>
+      <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="partPercent" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="Check"
+            @click="handleSave(scope.row)"
+            v-hasPermi="['chkstock:partDeptDevice:edit']"
+            >保存
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script setup>
+import { ref, reactive, toRaw, computed, watch, onMounted } from 'vue';
+const { proxy } = getCurrentInstance();
+import { getStockTakeList } from './components/api.js';
+const { warehous_type } = proxy.useDict('warehous_type');
+const dataList = ref([]);
+const queryParams = reactive({
+  // pageNo: 1,
+  // pageSize: 10,
+});
+const loading = ref(false);
+const showSearch = ref(true);
+const total = ref(0);
+// 获取列表
+const getList = () => {
+  loading.value = true;
+  getStockTakeList(queryParams.value).then((res) => {
+    loading.value = false;
+    dataList.value = res.data;
+    total.value = res.data.length;
+  });
+};
+// 搜索
+const handleQuery = () => {
+  getList();
+};
+// 重置
+const resetQuery = () => {
+  queryParams.value = {};
+  handleQuery();
+};
+// 重置
+const reset = () => {};
+
+// 多选
+const handleSelectionChange = (selection) => {};
+// 保存
+const handleSave = (row) => {
+  console.log(row);
+  // 校验盈亏数量
+  if (row.itemQuantity == '' || row.itemQuantity == null) {
+    proxy.$modal.msgWarning('盈亏数量不能为空');
+    return;
+  }
+  proxy.$modal
+    .confirm('确定保存吗？', '保存', {
+      confirmButtonText: '保存',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      proxy.$modal.msgSuccess('保存成功');
+      getList();
+    })
+    .catch(() => {});
+};
+const handleChangePurposeTypeEnum = (val) => {};
+const handleCabinetChange = (val) => {};
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/components/api.js
new file mode 100644
index 00000000..abd8dd96
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/components/api.js
@@ -0,0 +1,89 @@
+import request from '@/utils/request';
+
+// 查询调价审核列表
+export function getPriceAdjustmentPage (query) {
+  // 创建请求参数对象，确保使用后端期望的参数名
+  const requestParams = {
+    // 映射pageNum到pageNo，因为后端API期望使用pageNo
+    pageNo: query.pageNum || query.current || query.page || 1,
+    // 映射pageSize到pageSize，保持一致
+    pageSize: query.pageSize || query.size || query.limit || 10,
+    // 保留其他查询参数
+    ...Object.entries(query).reduce((acc, [key, value]) => {
+      if (!['pageNum', 'current', 'page', 'pageSize', 'size', 'limit'].includes(key)) {
+        acc[key] = value;
+      }
+      return acc;
+    }, {})
+  };
+  
+  return request ({
+    url: '/change/price/list/getPage',
+    method: 'get',
+    params: requestParams,
+  });
+}
+
+// 查询调价申请详情
+export function getPriceAdjustmentDetail (query) {
+  return request({
+    url: '/change/price/list/searchSupplyRequestInfo',
+    method: 'post',
+    params: query
+  });
+}
+
+// 作废价格调整申请
+export function cancelSupplyRequestData (query) {
+  return request({
+    url: '/change/price/list/cancelChangePriceData',
+    method: 'post',
+    params: query
+  });
+}
+
+// 查询挂号调价详情
+export function searchSupplyRequestByHealth (query) {
+  return request({
+    url: '/change/price/list/searchChangePriceDataByHealth',
+    method: 'post',
+    params: query
+  });
+}
+
+// 查询诊疗调价详情
+export function searchSupplyRequestByActivity (query) {
+  return request({
+    url: '/change/price/list/searchChangePriceDataByActivity',
+    method: 'post',
+    params: query || {}
+  });
+}
+
+// 查询耗材调价详情
+export function searchSupplyRequestByDevice (query) {
+  return request({
+    url: '/change/price/list/searchChangePriceDataByDevice',
+    method: 'post',
+    params: query
+  });
+}
+
+// 查询药品调价详情
+export function searchSupplyRequestByMed(query) {
+  return request({
+    url: '/change/price/list/searchChangePriceDataByMed',
+    method: 'post',
+    params: query || {}
+  });
+}
+
+// 提审价格调整申请
+export function submitApprovalForPriceAdjustment (query) {
+  return request({
+    url: '/change/price/list/updateStatusByApproval',
+    method: 'post',
+    params: query
+  });
+}
+
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/components/detailDialog.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/components/detailDialog.vue
new file mode 100644
index 00000000..11ae6da7
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/components/detailDialog.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="'价格调整详情'"
+    width="90%"
+    :close-on-click-modal="false"
+    destroy-on-close
+  >
+    <div class="detail-container">
+      <div class="detail-content" v-if="itemList.length > 0">
+        <el-table :data="itemList" style="width: 100%" size="small" border>
+          <!-- 挂号调价单特殊显示 -->
+          <el-table-column  label="科室" align="center" prop="orgName"  v-if="categoryType.includes('挂号调价')"/>
+          <el-table-column
+            label="号源"
+            align="center"
+            prop="name"
+            v-if="categoryType.includes('挂号调价')"
+          />
+          <el-table-column label="项目名称" align="center" prop="itemName" v-else />
+          <el-table-column label="当前进货价" align="center" prop="originBuyingPrice">
+            <template #default="scope">
+              <el-tag type="danger" size="small">
+                {{ scope.row.originBuyingPrice ? scope.row.originBuyingPrice + ' 元' : '-' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="调后进货价" align="center" prop="newBuyingPrice">
+            <template #default="scope">
+              <el-tag type="success" size="small">
+                {{ scope.row.newBuyingPrice ? scope.row.newBuyingPrice + ' 元' : '-' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="当前零售价" align="center" prop="originRetailPrice">
+            <template #default="scope">
+              <el-tag type="danger" size="small">
+                {{ scope.row.originRetailPrice ? scope.row.originRetailPrice + ' 元' : '-' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="调后零售价" align="center" prop="newRetailPrice">
+            <template #default="scope">
+              <el-tag type="success" size="small">
+                {{ scope.row.newRetailPrice ? scope.row.newRetailPrice + ' 元' : '-' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="进货价盈负差" align="center" prop="differenceBuyingPrice">
+            <template #default="scope">
+              {{ scope.row.differenceBuyingPrice ? scope.row.differenceBuyingPrice + ' 元' : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="影响库存数量" align="center" prop="itemQuantity">
+            <template #default="scope">
+              {{ scope.row.itemQuantity ? scope.row.itemQuantity + (scope.row.label || '') : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="调后零售价盈负差" align="center" prop="differenceRetailPrice">
+            <template #default="scope">
+              {{ scope.row.differenceRetailPrice ? scope.row.differenceRetailPrice + ' 元' : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="调价原因" align="center" prop="reason" />
+        </el-table>
+        <div class="creator-info">
+          <span class="creator-label">制单人：{{ props.createName || '-' }}</span>
+        </div>
+      </div>
+      <div v-else class="empty-tip">暂无调价项目数据</div>
+    </div>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">关闭</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { number } from 'echarts';
+import { ref, computed, watch, toRaw, isProxy } from 'vue';
+
+// 定义props
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  detailData: {
+    type: [Array, Object],
+    default: () => [],
+  },
+
+  categoryType: {
+    type: String,
+    default: '',
+  },
+  createName: {
+    type: String,
+    default: '',
+  },
+});
+// 定义事件
+const emit = defineEmits(['update:visible', 'close']);
+
+// 响应式数据
+const dialogVisible = ref(false);
+
+// 计算属性：获取需要显示的数据列表
+const itemList = computed(() => {
+  const data = props.detailData;
+  console.log('data', data);
+  return toRaw(data);
+});
+
+// 监听visible变化
+watch(
+  () => props.visible,
+  (newVal) => {
+    dialogVisible.value = newVal;
+  }
+);
+
+// 监听dialogVisible变化
+watch(dialogVisible, (newVal) => {
+  emit('update:visible', newVal);
+});
+
+// 关闭对话框
+const closeDialog = () => {
+  dialogVisible.value = false;
+  emit('close');
+};
+</script>
+
+<style scoped>
+.detail-container {
+  padding: 10px 0;
+}
+
+.creator-info {
+  text-align: left;
+  padding: 10px 0;
+  border-top: 1px solid #ebeef5;
+  margin-top: 10px;
+}
+
+.creator-label {
+  font-size: 14px;
+  color: #606266;
+}
+
+.empty-tip {
+  text-align: center;
+  padding: 40px 0;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue
new file mode 100644
index 00000000..dc468722
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentApprovalManagement/index.vue
@@ -0,0 +1,315 @@
+<template>
+  <div class="app-container">
+    <el-table
+      v-loading="loading"
+      :data="adjustmentList"
+      tooltip-effect="dark"
+      :show-overflow-tooltip="true"
+      style="width: 100%"
+    >
+      <el-table-column label="单据编号" align="center" prop="busNo" min-width="180" />
+      <el-table-column
+        label="调价类型"
+        align="center"
+        prop="categoryEnum_enumText"
+        min-width="120"
+      />
+      <el-table-column label="审核状态" align="center" prop="statusEnum" min-width="100">
+        <template #default="scope">
+          <el-tag :type="getStatusTagType(scope.row.statusEnum)">
+            {{ scope.row.statusEnum_enumText || '-' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="制单人" align="center" prop="applicantId_dictText" min-width="120" />
+      <el-table-column label="制单时间" align="center" prop="createTime" min-width="180">
+        <template #default="scope">
+          {{ parseTime(scope.row.createTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="approverId_dictText" min-width="120" />
+      <el-table-column label="审核日期" align="center" prop="approvalTime" min-width="180">
+        <template #default="scope">
+          {{ scope.row.approvalTime ? parseTime(scope.row.approvalTime) : '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" min-width="180">
+        <template #default="scope">
+          <el-button size="small" link @click="handleDetail(scope.row)">详情</el-button>
+          <template v-if="scope.row.statusEnum === 1">
+            <el-button
+              size="small"
+              link
+              type="success"
+              @click="handleSubmitApproval(scope.row)"
+              style="margin-left: 5px"
+              >提审</el-button
+            >
+            <el-button
+              size="small"
+              link
+              type="danger"
+              @click="handleCancelApproval(scope.row)"
+              style="margin-left: 5px"
+              >作废</el-button
+            >
+          </template>
+          <template v-else>
+            <el-button size="small" link disabled></el-button>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="handlePagination"
+    />
+    <!-- 详情弹窗组件 -->
+    <DetailDialog
+      v-model:visible="detailDialogVisible"
+      :detail-data="selectedRow"
+      :category-type="categoryType"
+      :create-name="createName"
+      @close="handleDetailClose"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { parseTime } from '@/utils/openhis';
+import Pagination from '@/components/Pagination';
+import {
+  getPriceAdjustmentPage,
+  cancelSupplyRequestData,
+  searchSupplyRequestByHealth,
+  searchSupplyRequestByActivity,
+  searchSupplyRequestByDevice,
+  searchSupplyRequestByMed,
+  submitApprovalForPriceAdjustment,
+} from './components/api';
+
+import DetailDialog from './components/detailDialog.vue';
+
+// 表格数据
+const adjustmentList = ref([]);
+const loading = ref(false);
+const total = ref(0);
+const activeName = ref('1'); // 当前激活的标签页
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  chargeItemContext: '', // 用于区分不同类型的调价
+});
+
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const selectedRow = ref({});
+const categoryType = ref('');
+const createName = ref('');
+// 状态标签类型
+const getStatusTagType = (status) => {
+  const typeMap = {
+    1: 'warning', // 待审核
+    2: 'success', // 已审核
+    3: 'danger', // 已拒绝
+  };
+  return typeMap[status] || 'info';
+};
+
+// 处理分页事件
+const handlePagination = (params) => {
+  // 将分页组件的参数映射到查询参数
+  queryParams.pageNum = params.page;
+  queryParams.pageSize = params.limit;
+  getList();
+};
+
+// 处理标签页切换
+const handleClick = (tab) => {
+  // 更新激活标签页状态
+  activeName.value = tab.paneName;
+  // 设置当前查询类型
+  queryParams.chargeItemContext = tab.paneName;
+  // 重置页码
+  queryParams.pageNum = 1;
+
+  // 重新获取对应类型的数据
+  getList();
+};
+
+// 查询数据
+const getList = async () => {
+  loading.value = true;
+  try {
+    // 确保设置当前查询类型参数
+    queryParams.chargeItemContext = activeName.value;
+
+    // 调用后端API获取对应类型的调价数据
+    const response = await getPriceAdjustmentPage(queryParams);
+console.log('调价审核列表响应数据:', response);
+    // 处理返回的数据
+    if (response && response.code === 200) {
+      // 直接从records字段获取数据
+      adjustmentList.value = response.data?.records || [];
+      total.value = response.data?.total || 0;
+    } else {
+      ElMessage.error(response?.msg || '获取调价审核列表失败');
+      adjustmentList.value = [];
+      total.value = 0;
+    }
+  } catch (error) {
+    ElMessage.error('获取数据异常，请稍后重试');
+    console.error('获取调价审核列表异常:', error);
+    adjustmentList.value = [];
+    total.value = 0;
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 操作按钮处理函数
+const handleDetail = async (row) => {
+  // 保存当前行的调价类型
+  categoryType.value = row.typeEnum_enumText || '';
+  // 调用详情API获取数据
+  try {
+    // 显示加载状态
+    loading.value = true;
+
+    // 准备API参数
+    const params = {
+      busNo: row.busNo,
+    };
+    console.log('查询详情参数:', params);
+    console.log('查询详情参数:', row);
+    // 根据categoryEnum选择不同的API接口
+    let response;
+    if (row.itemCategoryEnum === 49) {
+      // 挂号
+      response = await searchSupplyRequestByHealth(params);
+    } else if (row.itemCategoryEnum === 48) {
+      // 诊疗
+      response = await searchSupplyRequestByActivity(params);
+    } else if (row.itemCategoryEnum === 47) {
+      // 耗材
+      response = await searchSupplyRequestByDevice(params);
+    } else if (row.itemCategoryEnum === 46) {
+      // 药品
+      response = await searchSupplyRequestByMed(params);
+    }
+
+    if (response && response.code === 200) {
+      // 日志记录原始返回数据
+
+      // 准备显示数据
+      createName.value = row.applicantId_dictText || '-';
+      // 设置selectedRow
+      selectedRow.value = response.data;
+      // 显示弹窗
+      detailDialogVisible.value = true;
+    } else {
+      ElMessage.error(response?.msg || '获取详情数据失败');
+    }
+  } catch (error) {
+    ElMessage.error('获取详情数据失败');
+    console.error('获取详情数据异常:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 关闭详情弹窗处理
+const handleDetailClose = () => {
+  // 重置选中的行数据和类型
+  selectedRow.value = {};
+  categoryType.value = '';
+};
+
+// 处理提审审核
+const handleSubmitApproval = async (row) => {
+  try {
+    // 弹出确认对话框
+    await ElMessageBox.confirm('确定要提审该价格调整记录吗？', '确认提审', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'info',
+    });
+
+    // 调用后端提审接口
+    const response = await submitApprovalForPriceAdjustment({ busNo: row.busNo });
+
+    if (response && response.code === 200) {
+      ElMessage.success('提审成功');
+      // 重新加载列表数据
+      getList();
+    } else {
+      ElMessage.error(response?.msg || '提审失败');
+    }
+  } catch (error) {
+    // 用户取消操作不会触发错误提示
+    if (error !== 'cancel') {
+      ElMessage.error('提审失败');
+      console.error('提审价格调整记录异常:', error);
+    }
+  }
+};
+
+// 处理作废审核
+const handleCancelApproval = async (row) => {
+  try {
+    // 弹出确认对话框
+    await ElMessageBox.confirm('确定要作废该价格调整记录吗？', '确认作废', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    });
+
+    // 调用后端作废接口
+    const response = await cancelSupplyRequestData({ busNo: row.busNo });
+
+    if (response && response.code === 200) {
+      ElMessage.success('作废成功');
+      // 重新加载列表数据
+      getList();
+    } else {
+      ElMessage.error(response?.msg || '作废失败');
+    }
+  } catch (error) {
+    // 用户取消操作不会触发错误提示
+    if (error !== 'cancel') {
+      ElMessage.error('作废失败');
+      console.error('作废价格调整记录异常:', error);
+    }
+  }
+};
+
+// 生命周期 - 加载
+onMounted(() => {
+  // 设置初始查询类型为药品调价
+  queryParams.chargeItemContext = activeName.value;
+  getList();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+
+:deep(.el-tabs__content) {
+  height: auto;
+}
+
+:deep(.demo-tabs > .el-tabs__content) {
+  color: #6b778c;
+  font-size: 14px;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/components/api.js
new file mode 100644
index 00000000..aaa2d096
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/components/api.js
@@ -0,0 +1,80 @@
+import request from '@/utils/request';
+
+
+// 查询调价申请详情
+export function getPriceAdjustmentDetail (query) {
+  return request({
+    url: '/change/price/list/searchSupplyRequestInfo',
+    method: 'post',
+    params: query
+  });
+}
+
+
+
+// 查询挂号调价详情
+export function searchSupplyRequestByHealth (query) {
+  return request({
+    url: '/inventory-examine-page/searchSupplyRequestByHealth',
+    method: 'post',
+    params: query
+  });
+}
+
+// 查询诊疗调价详情
+export function searchSupplyRequestByActivity (query) {
+  return request({
+    url: '/inventory-examine-page/searchSupplyRequestByActivity',
+    method: 'post',
+    params: query
+  });
+}
+
+// 查询耗材调价详情
+export function searchSupplyRequestByDevice (query) {
+  return request({
+    url: '/inventory-examine-page/searchSupplyRequestByDevice',
+    method: 'post',
+    params: query
+  });
+}
+
+// 查询药品调价详情
+export function searchSupplyRequestByMed (query) {
+  return request({
+    url: '/inventory-examine-page/searchSupplyRequestByMed',
+    method: 'post',
+    params: query
+  });
+}
+
+
+
+
+
+// 获取审核状态选项数据
+export function getExamineStatusOptions() {
+  return request({
+    url: '/inventory-examine-page/init',
+    method: 'get'
+  });
+}
+
+// 驳回价格调整申请
+export function rejectPriceAdjustment(busNo) {
+  return request({
+    url: '/inventory-examine-page/updateExamineByRejected',
+    method: 'post',
+    params: { busNo }
+  });
+}
+
+// 审批通过价格调整申请
+export function updateExamineByApproved(busNo) {
+  return request({
+    url: '/inventory-examine-page/updateExamineByApproved',
+    method: 'post',
+    params: { busNo }
+  });
+}
+
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/components/detailDialog.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/components/detailDialog.vue
new file mode 100644
index 00000000..7b6610d1
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/components/detailDialog.vue
@@ -0,0 +1,196 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="'价格调整详情'"
+    width="90%"
+    :close-on-click-modal="false"
+    destroy-on-close
+  >
+    <div class="detail-container">
+      <div class="detail-content" v-if="itemList.length > 0">
+        <el-table :data="itemList" style="width: 100%" size="small" border>
+          <!-- 挂号调价单特殊显示 -->
+          <template v-if="categoryType.includes('挂号调价')">
+            <el-table-column label="科室" align="center" prop="orgName" min-width="150" />
+            <el-table-column label="号源" align="center" prop="name" min-width="200" />
+            <el-table-column
+              label="当前进货价"
+              align="center"
+              prop="originBuyingPrice"
+              min-width="100"
+            />
+            <el-table-column
+              label="调后进货价"
+              align="center"
+              prop="newBuyingPrice"
+              min-width="100"
+            />
+            <el-table-column
+              label="当前零售价"
+              align="center"
+              prop="originRetailPrice"
+              min-width="100"
+            />
+            <el-table-column
+              label="调后零售价"
+              align="center"
+              prop="newRetailPrice"
+              min-width="100"
+            />
+            <el-table-column label="原因" align="center" prop="reason" min-width="200" />
+          </template>
+          <!-- 其他调价类型标准显示 -->
+          <template v-else>
+            <el-table-column label="项目编码" align="center" prop="targetId" min-width="180" />
+            <el-table-column label="项目名称" align="center" prop="chargeName" min-width="200" />
+            <el-table-column label="规格" align="center" prop="volume" min-width="120" />
+            <el-table-column
+              label="当前进货价"
+              align="center"
+              prop="originBuyingPrice"
+              min-width="100"
+            />
+            <el-table-column
+              label="调后进货价"
+              align="center"
+              prop="newBuyingPrice"
+              min-width="100"
+            />
+            <el-table-column
+              label="当前零售价"
+              align="center"
+              prop="originRetailPrice"
+              min-width="100"
+            />
+            <el-table-column
+              label="调后零售价"
+              align="center"
+              prop="newRetailPrice"
+              min-width="100"
+            />
+            <el-table-column label="调价原因" align="center" prop="reason" min-width="200" />
+          </template>
+        </el-table>
+        <div class="creator-info">
+          <span class="creator-label">制单人：{{ detailData?.createName || '-' }}</span>
+        </div>
+      </div>
+      <div v-else class="empty-tip">暂无调价项目数据</div>
+    </div>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <!-- 当状态为驳回或同意时，不显示审核和驳回按钮 -->
+        <template
+          v-if="
+            !detailData.statusEnum_enumText ||
+            !['驳回', '同意'].includes(detailData.statusEnum_enumText)
+          "
+        >
+          <el-button type="primary" :plain="true" @click="handleApprove">审核</el-button>
+          <el-button type="danger" :plain="true" @click="handleReject">驳回</el-button>
+        </template>
+        <el-button :plain="true" @click="closeDialog">关闭</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { rejectPriceAdjustment } from './api';
+
+// 定义props
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+  detailData: {
+    type: Object,
+    default: () => ({}),
+  },
+  categoryType: {
+    type: String,
+    default: '',
+  },
+});
+
+// 定义事件
+const emit = defineEmits(['update:visible', 'close']);
+
+// 响应式数据
+const dialogVisible = ref(false);
+
+// 计算属性：获取需要显示的数据列表
+const itemList = computed(() => {
+  console.log('detailData:', props.detailData);
+
+  if (!props.detailData) return [];
+  // 优先使用items字段（从index.vue传递的结构）
+  if (Array.isArray(props.detailData.items)) {
+    return props.detailData.items;
+  }
+
+  // 如果detailData本身是数组
+  if (Array.isArray(props.detailData)) {
+    return props.detailData;
+  }
+
+  return [];
+});
+
+// 监听visible变化
+watch(
+  () => props.visible,
+  (newVal) => {
+    dialogVisible.value = newVal;
+  }
+);
+
+// 监听dialogVisible变化
+watch(dialogVisible, (newVal) => {
+  emit('update:visible', newVal);
+});
+
+// 关闭对话框
+const closeDialog = () => {
+  dialogVisible.value = false;
+  emit('close');
+};
+
+// 处理审核通过
+const handleApprove = () => {
+  emit('approve', props.detailData);
+};
+
+// 处理驳回
+const handleReject = () => {
+  // 直接触发事件，由父组件处理API调用和状态管理
+  emit('reject', props.detailData);
+};
+</script>
+
+<style scoped>
+.detail-container {
+  padding: 10px 0;
+}
+
+.creator-info {
+  text-align: left;
+  padding: 10px 0;
+  border-top: 1px solid #ebeef5;
+  margin-top: 10px;
+}
+
+.creator-label {
+  font-size: 14px;
+  color: #606266;
+}
+
+.empty-tip {
+  text-align: center;
+  padding: 40px 0;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue
new file mode 100644
index 00000000..15180847
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentFormApproval/index.vue
@@ -0,0 +1,551 @@
+<template>
+  <div class="app-container">
+    <!-- 查询条件区域 -->
+    <div class="query-form">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="审批状态">
+            <el-select
+              v-model="queryParams.statusEnum"
+              placeholder="请选择审批状态"
+              clearable
+              filterable
+              @focus="loadExamineStatusOptions"
+            >
+              <el-option
+                v-for="option in examineStatusOptions"
+                :key="option.value"
+                :label="option.label"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="申请日期">
+            <el-date-picker
+              v-model="queryParams.applicantTime"
+              type="date"
+              placeholder="请选择日期"
+              value-format="YYYY-MM-DD"
+              format="YYYY-MM-DD"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <div class="query-buttons">
+            <el-button plain type="primary" @click="handleSearch">查询</el-button>
+            <el-button plain type="primary" @click="handleReset">重置</el-button>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-table
+      v-loading="loading"
+      :data="adjustmentList"
+      tooltip-effect="dark"
+      :show-overflow-tooltip="true"
+      style="width: 100%"
+    >
+      <el-table-column label="单据编号" align="center" prop="busNo" min-width="180" />
+      <el-table-column label="调价类型" align="center" prop="categoryEnum_enumText" min-width="120" />
+      <el-table-column label="审核状态" align="center" prop="statusEnum" min-width="100">
+        <template #default="scope">
+          <el-tag :type="getStatusTagType(scope.row.statusEnum)">
+            {{ scope.row.statusEnum_enumText || '-' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="制单人" align="center" prop="applicantId_dictText" min-width="120" />
+      <el-table-column label="申请日期" align="center" prop="applicantTime" min-width="180">
+        <template #default="scope">
+          {{ parseTime(scope.row.applicantTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="approverId_dictText" min-width="120" />
+      <el-table-column label="审核日期" align="center" prop="approvalTime" min-width="180">
+        <template #default="scope">
+          {{ scope.row.approvalTime ? parseTime(scope.row.approvalTime) : '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" min-width="180">
+        <template #default="scope">
+          <el-button size="small" type="primary" plain @click="handleDetail(scope.row)">
+            {{
+              ['驳回', '同意'].includes(scope.row.statusEnum_enumText) ? '查看详情' : '查看并审核'
+            }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="handlePagination"
+    />
+    <!-- 详情弹窗组件 -->
+    <DetailDialog
+      v-model:visible="detailDialogVisible"
+      :detail-data="selectedRow"
+      :category-type="categoryType"
+      @close="handleDetailClose"
+      @approve="handleApprove"
+      @reject="handleReject"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { parseTime } from '@/utils/openhis';
+import Pagination from '@/components/Pagination';
+import request from '@/utils/request';
+//import { getPriceAdjustmentPage, getPriceAdjustmentDetail, cancelPriceAdjustment } from './components/api';
+import {
+  getPriceAdjustmentDetail,
+  searchSupplyRequestByHealth,
+  searchSupplyRequestByActivity,
+  searchSupplyRequestByDevice,
+  searchSupplyRequestByMed,
+  getExamineStatusOptions,
+  updateExamineByApproved,
+  rejectPriceAdjustment,
+} from './components/api';
+
+import DetailDialog from './components/detailDialog.vue';
+
+// 表格数据
+const adjustmentList = ref([]);
+const loading = ref(false);
+const total = ref(0);
+const activeName = ref('1'); // 当前激活的标签页
+// 审核状态选项 - 初始为空数组，后续会通过API加载
+const examineStatusOptions = ref([]);
+const optionsLoading = ref(false);
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  statusEnum: undefined, // 审核状态
+  applicantTime: undefined, // 申请日期
+});
+
+// 详情弹窗相关
+const detailDialogVisible = ref(false);
+const selectedRow = ref({});
+const categoryType = ref('');
+
+// 状态标签类型
+const getStatusTagType = (status) => {
+  const typeMap = {
+    1: 'warning', // 待审核
+    2: 'primary', // 审核中
+    3: 'success', // 同意
+    4: 'danger', // 驳回
+  };
+  return typeMap[status] || 'info';
+};
+
+// 处理分页事件
+const handlePagination = (params) => {
+  // 将分页组件的参数映射到查询参数
+  queryParams.pageNum = params.page;
+  queryParams.pageSize = params.limit;
+  getList();
+};
+
+// 查询数据
+const getList = async () => {
+  loading.value = true;
+  try {
+    // 构造符合后端要求的请求参数
+    const requestParams = {
+      statusEnum: queryParams.statusEnum,
+      pageNo: queryParams.pageNum,
+      pageSize: queryParams.pageSize,
+    };
+
+    // 根据后端要求的格式处理日期参数
+    if (queryParams.applicantTime) {
+      const dateStr = queryParams.applicantTime;
+      // requestParams.applicantTime = dateStr; // 原始日期值
+      requestParams.applicantTimeSTime = `${dateStr} 00:00:00`; // 当天开始时间
+      requestParams.applicantTimeETime = `${dateStr} 23:59:59`; // 当天结束时间
+      console.log('applicantTime', requestParams.applicantTime);
+      console.log('applicantTimeSTime', requestParams.applicantTimeSTime);
+      console.log('applicantTimeETime', requestParams.applicantTimeETime);
+    }
+
+    // 调用新的后端API接口
+    const response = await request({
+      url: '/inventory-examine-page/getPageByExamine',
+      method: 'get',
+      params: requestParams,
+    });
+
+    // 处理返回的数据
+    if (response && response.code === 200) {
+      // 直接从records字段获取数据
+      adjustmentList.value = response.data?.records || [];
+      // 检查total字段是否正确获取，增加更多调试日志
+      total.value = response.data?.total || response.data?.totalCount || 0;
+    } else {
+      ElMessage.error(response?.msg || '获取调价审核列表失败');
+      adjustmentList.value = [];
+      total.value = 0;
+    }
+  } catch (error) {
+    ElMessage.error('获取数据异常，请稍后重试');
+    adjustmentList.value = [];
+    total.value = 0;
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 操作按钮处理函数
+const handleDetail = async (row) => {
+  // 保存当前行的调价类型
+  categoryType.value = row.categoryEnum_enumText || '';
+
+  // 调用详情API获取数据
+  try {
+    // 显示加载状态
+    loading.value = true;
+
+    // 准备API参数
+    const params = {
+      busNo: row.busNo,
+    };
+
+    // 根据itemCategoryEnum选择不同的API接口
+    let response;
+    if (row.itemCategoryEnum === 49) {
+      // 挂号
+      response = await searchSupplyRequestByHealth(params);
+    } else if (row.itemCategoryEnum === 48) {
+      // 诊疗
+      response = await searchSupplyRequestByActivity(params);
+    } else if (row.itemCategoryEnum === 47) {
+      // 耗材
+      response = await searchSupplyRequestByDevice(params);
+    } else if (row.itemCategoryEnum === 46) {
+      // 药品
+      response = await searchSupplyRequestByMed(params);
+    }
+
+    if (response && response.code === 200) {
+      // 日志记录原始返回数据
+
+      // 准备显示数据
+      let items = [];
+
+      // 根据API实际返回格式处理数据
+      if (typeof response.data === 'object' && response.data !== null) {
+        // 首先尝试获取data数组（根据截图API返回格式）
+        if (Array.isArray(response.data.data)) {
+          items = response.data.data;
+        } else if (Array.isArray(response.data.items)) {
+          items = response.data.items;
+        } else if (Array.isArray(response.data)) {
+          items = response.data;
+        } else {
+          // 如果只是单个对象，包装成数组
+          items = [response.data];
+        }
+      } else if (Array.isArray(response.data)) {
+        items = response.data;
+      }
+
+      // 转换数据格式以便显示
+      const formattedItems = items.map((item) => {
+        // 基础字段映射
+        const baseFields = {
+          targetId: item.targetId || item.busNo || item.itemId || item.code || item.id || '-',
+          chargeName: item.chargeName || item.itemName || item.name || '-',
+          volume: item.totalVolume || item.spec || item.specification || '-',
+          price: item.price || item.newprice || item.newPrice || item.afterPrice || '-',
+          reason: item.reason || item.sreason || item.adjustReason || item.remark || '-',
+          orgName: item.orgName || item.org || '-',
+          // 额外字段，用于挂号调价单显示
+          name: item.name || item.chargeName || item.itemName || '-',
+          originPrice: item.originPrice || '-',
+          retailPrice: item.retailPrice || '-',
+          originBuyingPrice: item.originBuyingPrice || '-',
+          newBuyingPrice: item.newBuyingPrice || '-',
+          originRetailPrice: item.originRetailPrice || '-',
+          newRetailPrice: item.newRetailPrice || '-',
+        };
+        return baseFields;
+      });
+
+      // 设置selectedRow，确保格式一致
+      selectedRow.value = {
+        items: formattedItems,
+        createName: row.applicantId_dictText || '-',
+        busNo: row.busNo, // 添加busNo字段，用于后续的审核和驳回操作
+        statusEnum_enumText: row.statusEnum_enumText, // 添加状态字段，用于控制按钮显示
+      };
+
+      // 显示弹窗
+      detailDialogVisible.value = true;
+    } else {
+      ElMessage.error(response?.msg || '获取详情数据失败');
+    }
+  } catch (error) {
+    ElMessage.error('获取详情数据失败');
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 关闭详情弹窗处理
+const handleDetailClose = () => {
+  // 重置选中的行数据和类型
+  selectedRow.value = {};
+  categoryType.value = '';
+};
+
+// 处理审批通过事件
+const handleApprove = async () => {
+  try {
+    // 获取当前选中行的业务编号
+    const busNo = selectedRow.value.busNo;
+
+    // 调用审核通过API
+    const response = await updateExamineByApproved(busNo);
+
+    if (response && response.code === 200) {
+      ElMessage.success('审核通过成功');
+      // 关闭详情弹窗
+      detailDialogVisible.value = false;
+      // 刷新页面数据
+      getList();
+    } else {
+      ElMessage.error(response?.msg || '审核通过失败');
+    }
+  } catch (error) {
+    ElMessage.error('审核通过失败');
+  }
+};
+
+// 处理驳回事件
+const handleReject = async () => {
+  try {
+    // 获取当前选中行的业务编号
+    const busNo = selectedRow.value.busNo;
+
+    // 调用驳回API
+    const response = await rejectPriceAdjustment(busNo);
+
+    if (response && response.code === 200) {
+      ElMessage.success('驳回成功');
+      // 关闭详情弹窗
+      detailDialogVisible.value = false;
+      // 延迟一点时间再刷新，确保弹窗完全关闭
+      setTimeout(async () => {
+        await getList();
+      }, 300);
+    } else {
+      ElMessage.error(response?.msg || '驳回失败');
+    }
+  } catch (error) {
+    ElMessage.error('驳回失败');
+  }
+};
+
+// 处理查询
+const handleSearch = () => {
+  queryParams.pageNum = 1; // 重置页码
+  getList();
+};
+
+// 加载审核状态选项
+const loadExamineStatusOptions = async () => {
+  // 如果已经加载过，不再重复加载
+  if (examineStatusOptions.value.length > 0) {
+    return;
+  }
+
+  optionsLoading.value = true;
+  try {
+    const response = await getExamineStatusOptions();
+    // 先清空选项数组
+    examineStatusOptions.value = [];
+
+    if (response && response.code === 200 && response.data) {
+      // 1. 首先检查是否有supplyStatusOptions字段
+      if (response.data.supplyStatusOptions) {
+        if (Array.isArray(response.data.supplyStatusOptions)) {
+          // supplyStatusOptions是数组
+          examineStatusOptions.value = response.data.supplyStatusOptions.map((item) => ({
+            value: item.code || item.key || item.value,
+            label: item.name || item.label || item.value,
+          }));
+        } else if (typeof response.data.supplyStatusOptions === 'object') {
+          // supplyStatusOptions是对象
+          examineStatusOptions.value = Object.entries(response.data.supplyStatusOptions).map(
+            ([key, value]) => ({
+              value: key,
+              label: value,
+            })
+          );
+        }
+      }
+      // 2. 如果没有supplyStatusOptions字段，但response.data本身是数组
+      else if (Array.isArray(response.data)) {
+        examineStatusOptions.value = response.data.map((item) => {
+          // 处理可能的JSON字符串格式
+          if (typeof item === 'string') {
+            try {
+              const parsed = JSON.parse(item);
+              return {
+                value: parsed.value || parsed.code || parsed.key,
+                label: parsed.label || parsed.name || parsed.value,
+              };
+            } catch (e) {
+              return {
+                value: item,
+                label: item,
+              };
+            }
+          }
+          return {
+            value: item.value || item.code || item.key,
+            label: item.label || item.name || item.value,
+          };
+        });
+      }
+      // 3. 如果response.data是对象
+      else if (typeof response.data === 'object') {
+        examineStatusOptions.value = Object.entries(response.data).map(([key, value]) => ({
+          value: key,
+          label: value,
+        }));
+      }
+
+      // 确保选项格式正确
+      if (examineStatusOptions.value.length === 0) {
+        // 如果没有数据，添加默认的选项
+        examineStatusOptions.value = [
+          { value: '', label: '全部' },
+          { value: '1', label: '待审核' },
+          { value: '2', label: '已审核' },
+          { value: '3', label: '已拒绝' },
+        ];
+      } else {
+        // 在选项开头添加"全部"选项
+        examineStatusOptions.value.unshift({ value: '', label: '全部' });
+      }
+    } else {
+      // 如果API调用失败，使用默认选项
+      examineStatusOptions.value = [
+        { value: '', label: '全部' },
+        { value: '1', label: '待审核' },
+        { value: '2', label: '已审核' },
+        { value: '3', label: '已拒绝' },
+      ];
+    }
+  } catch (error) {
+    // 错误情况下使用默认选项
+    examineStatusOptions.value = [
+      { value: '', label: '全部' },
+      { value: '1', label: '待审核' },
+      { value: '2', label: '已审核' },
+      { value: '3', label: '已拒绝' },
+    ];
+  } finally {
+    optionsLoading.value = false;
+  }
+};
+
+// 处理重置
+const handleReset = () => {
+  // 重置查询参数
+  queryParams.statusEnum = undefined;
+  queryParams.applicantTime = undefined;
+  queryParams.pageNum = 1;
+  getList();
+};
+
+// 生命周期 - 加载
+onMounted(() => {
+  // 初始加载审核状态选项
+  loadExamineStatusOptions();
+  getList();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+
+.query-form {
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 8px;
+  margin-bottom: 20px;
+  border: 1px solid #ebeef5;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+}
+
+.query-buttons {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  height: 100%;
+}
+
+/* 确保表单元素垂直居中对齐 */
+:deep(.el-form-item) {
+  margin-bottom: 0;
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+
+/* 确保标签和输入框垂直居中 */
+:deep(.el-form-item__label-wrap) {
+  display: flex;
+  align-items: center;
+}
+
+:deep(.el-form-item__content) {
+  display: flex;
+  align-items: center;
+}
+
+:deep(.el-tabs__content) {
+  height: auto;
+}
+
+:deep(.demo-tabs > .el-tabs__content) {
+  color: #6b778c;
+  font-size: 14px;
+}
+
+:deep(.el-table) {
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+}
+
+:deep(.el-table__header-wrapper) {
+  border-radius: 8px 8px 0 0;
+  overflow: hidden;
+}
+
+:deep(.el-table__body-wrapper) {
+  border-radius: 0 0 8px 8px;
+  overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/api.js b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/api.js
index 97c3c217..b6108deb 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/api.js
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/api.js
@@ -1,9 +1,8 @@
 import request from '@/utils/request';
-
 // 查询费用定价信息列表
 export function listDefinition (query) {
   return request ({
-    url: '/dict-dictionary/definition/charge-item-info',
+    url: '/change/price/list/getPage',
     method: 'get',
     params: query,
   });
@@ -14,21 +13,75 @@ export function initOption (query) {
   return request ({
     url: '/dict-dictionary/definition/init',
     method: 'get',
-    params: query,
+    data: query,
   });
 }
 // 获取药品列表
 export function getMedicineList (query) {
+  // 确保 query 对象存在
+  const params = {
+    ...query
+  };
+  
+  // 根据categoryEnum值选择不同的接口
+  let url = '/change/price/searchKeyWordDataList';
+  if (query?.categoryEnum === 24) {
+    // 药品
+    url = '/change/price/searchKeyWordDataListByMed';
+  } else if (query?.categoryEnum === 25) {
+    // 耗材
+    url = '/change/price/searchKeyWordDataListByDevice';
+  } else if (query?.categoryEnum === 26) {
+    // 诊疗
+    url = '/change/price/searchKeyWordDataListByActivity';
+  }
+  
   return request ({
-    url: '/doctor-station/advice/advice-base-info',
-    method: 'get',
-    params: query,
+    url: url,
+    method: 'post',
+    params: params, 
+  });
+}
+
+// 获取药品列表 - 药品专用接口
+export function getMedicineListByMed(query) {
+  return request({
+    url: '/change/price/searchKeyWordDataListByMed',
+    method: 'post',
+    params: query || {},
+    headers: {
+      repeatSubmit: false // 禁用重复提交检查
+    }
+  });
+}
+
+// 获取耗材列表 - 耗材专用接口
+export function getMedicineListByDevice(query) {
+  return request({
+    url: '/change/price/searchKeyWordDataListByDevice',
+    method: 'post',
+    params: query || {},
+    headers: {
+      repeatSubmit: false // 禁用重复提交检查
+    }
+  });
+}
+
+// 获取诊疗列表 - 诊疗专用接口
+export function getMedicineListByActivity(query) {
+  return request({
+    url: '/change/price/searchKeyWordDataListByActivity',
+    method: 'post',
+    params: query || {},
+    headers: {
+      repeatSubmit: false // 禁用重复提交检查
+    }
   });
 }
 // 修改费用定价信息
 export function updateDefinition (data) {
   return request ({
-    url: `/dict-dictionary/definition/update-charge-item?id=${data.id}&price=${data.price}`,
+    url: '/dict-dictionary/definition/update-charge-item?id=${data.id}&price=${data.price}',
     method: 'put',
   });
 }
@@ -48,11 +101,79 @@ export function getDetail (id) {
     method: 'get',
   });
 }
-// 供应商查询
-export function getSupplierList (query) {
-  return request ({
-    url: '/change/price/searchAllSupply',
+
+
+// 提交价格调整数据
+export function commitChangePriceData(data) {
+  return request({
+    url: '/change/price/commitChangePriceData',
+    method: 'post',
+    data: data // 直接提交数组作为body
+  });
+}
+
+// 提交审核价格调整数据
+export function commitExamineChangePriceData(data) {
+  return request({
+    url: '/change/price/submitExamineChangePriceData',
+    method: 'post',
+    data: data // 直接提交数组作为body
+  });
+}
+
+// 查询所有科室数据
+export function searchAllOrgData() {
+  return request({
+    url: '/change/price/searchAllOrgData',
+    method: 'post'
+  });
+}
+
+//根据所选科室数据查询当前科室下所有类型数据
+export function searchHealthData(query) {
+  return request({
+    url: '/change/price/searchHealthData',
+    method: 'post',
+    params: query
+  });
+}
+// 验证药品
+export function checkMedApprovalExist(itemId) {
+  return request({
+    url: '/change/price/checkMedApprovalExist',
+    method: 'post',
+    params: { itemId }
+  });
+}
+
+export function checkDeviceApprovalExist(itemId) {
+  return request({
+    url: '/change/price/checkDeviceApprovalExist',
+    method: 'post',
+    params: { itemId }
+  });
+}
+
+export function checkActivityApprovalExist(itemId) {
+  return request({
+    url: '/change/price/checkActivityApprovalExist',
+    method: 'post',
+    params: { itemId }
+  });
+}
+
+export function checkHealthApprovalExist(itemId) {
+  return request({
+    url: '/change/price/checkHealthApprovalExist',
+    method: 'post',
+    params: { itemId }
+  });
+}
+
+// 查询调价控制开关状态接口
+export function getInitAdjustPriceSwitchState() {
+  return request({
+    url: '/change/price/getAdjustPriceSwitchState',
     method: 'get',
-    params: query,
   });
 }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue
index 6efa2c69..ca964bfc 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/components/medicineList.vue
@@ -1,16 +1,22 @@
 <template>
   <div>
     <el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
-      <el-table-column label="项目编码" align="center" prop="adviceDefinitionId" />
-      <el-table-column label="项目名称" align="center" prop="adviceName" />
-      <el-table-column label="当前价格" align="center" prop="retailPrice" />  
-      <el-table-column label="规格" align="center" prop="volume" />
+      <el-table-column label="项目编码" align="center" prop="busNo" />
+      <el-table-column label="项目名称" align="center" prop="name" />
+      <el-table-column
+        v-if="categoryEnum !== 26"
+        label="当前进货价"
+        align="center"
+        prop="originBuyingPrice"
+      />
+      <el-table-column label="当前零售价" align="center" prop="originRetailPrice" />
+      <el-table-column v-if="categoryEnum !== 26" label="规格" align="center" prop="volume" />
     </el-table>
   </div>
 </template>
         
 <script setup>
-import { getMedicineList } from './api';
+import { getMedicineListByMed, getMedicineListByDevice, getMedicineListByActivity } from './api';
 import { watch } from 'vue';
 import { throttle } from 'lodash-es';
 
@@ -23,51 +29,86 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  categoryEnum: {
+    type: Number,
+    default: 24, // 默认值为0，表示药品类别
+  },
 });
 // 选择药品
 const emit = defineEmits(['selectRow']);
 // 查询参数
 const queryParams = ref({
   searchKey: props.searchKey,
-  // supplierId: props.supplierId,
+  categoryEnum: props.categoryEnum, // 使用props传入的categoryCode
 });
 // 药品列表
 const medicineList = ref([]);
 
-// 节流函数
+// 是否正在请求中，防止重复请求
+const isRequesting = ref(false);
+
+const loadding = ref(false);
+// 获取药品列表
+const getList = async (query) => {
+  // 防止重复请求
+  if (isRequesting.value) {
+    return;
+  }
+
+  const params = query || queryParams.value;
+  console.log('queryParams', queryParams.value);
+  loadding.value = true;
+  isRequesting.value = true;
+
+  let apiPromise;
+  // 根据categoryEnum值选择不同的API函数
+  if (params.categoryEnum === 24) {
+    // 药品
+    apiPromise = getMedicineListByMed(params);
+  } else if (params.categoryEnum === 25) {
+    // 耗材
+    apiPromise = getMedicineListByDevice(params);
+  } else if (params.categoryEnum === 26) {
+    // 诊疗
+    apiPromise = getMedicineListByActivity(params);
+  }
+
+  try {
+    const res = await apiPromise;
+    // 检查响应数据结构，API返回的data是直接数组而不是带records属性的对象
+    medicineList.value = Array.isArray(res.data) ? res.data : res.data.data || [];
+  } catch (error) {
+    medicineList.value = [];
+  } finally {
+    loadding.value = false;
+    isRequesting.value = false;
+  }
+};
+
+// 节流函数 - 使用防抖更合适，避免频繁请求
 const throttledGetList = throttle(
   () => {
     getList();
   },
-  300,
-  { leading: true, trailing: true }
+  500,
+  { leading: true, trailing: false }
 );
 
-// 获取药品列表
-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;
+  () => [props.searchKey, props.categoryEnum],
+  ([newSearchKey, newCategoryEnum]) => {
+    queryParams.value.searchKey = newSearchKey;
+    queryParams.value.categoryEnum = newCategoryEnum; // 直接使用数字类型
     throttledGetList();
   },
   { immediate: true, deep: true }
 );
-
-// 获取药品列表
-getList();
 </script>
       
 <style scoped>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue
index cc368508..363174b9 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/priceAdjustmentManagement/index.vue
@@ -9,22 +9,19 @@
     >
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane label="药品调价" name="1">
-          <!-- <el-form-item label="供应商" prop="supplierId">
-            <el-select v-model="queryParams.supplierId" placeholder="请选择" clearable filterable>
-              <el-option
-                v-for="item in supplierIDList"
-                :key="item.supplyId"
-                :label="item.supplyName"
-                :value="item.supplyId"
-              ></el-option>
-            </el-select>
-          </el-form-item> -->
           <el-form-item label="申请人" prop="applicationName" label-width="100px">
             <el-input v-model="applicationName" placeholder="" disabled />
           </el-form-item>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+              <el-button
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                :disabled="!isAdjustPrice"
+                >新增</el-button
+              >
             </el-col>
             <el-col :span="1.5">
               <el-button
@@ -43,15 +40,24 @@
                 plain
                 icon="Check"
                 @click="handleSave"
-                v-if="definitionList.length > 0"
+                v-if="definitionList1.length > 0"
                 >保存</el-button
               >
+              <el-button
+                type="success"
+                plain
+                icon="Check"
+                @click="handleSubmitForReview(definitionList1)"
+                v-if="definitionList1.length > 0"
+                style="margin-left: 10px"
+                >提审</el-button
+              >
             </el-col>
           </el-row>
           <el-table
             v-if="refreshTable"
             v-loading="loading"
-            :data="definitionList"
+            :data="definitionList1"
             tooltip-effect="dark"
             :show-overflow-tooltip="true"
             ref="tableRef"
@@ -59,15 +65,24 @@
             style="width: 100% !important"
           >
             <el-table-column type="selection" width="40" align="center" fixed="left" />
-            <el-table-column label="名称" prop="itemName" align="center">
+            <el-table-column label="名称" prop="name" align="center">
               <template #default="scope">
-                <PopoverList @search="handleSearch" :width="1000" :modelValue="scope.row.itemName">
+                <span v-if="scope.row.isEdit == undefined || !scope.row.isEdit">{{
+                  scope.row.name
+                }}</span>
+                <PopoverList
+                  v-else
+                  @search="handleSearch"
+                  :width="1000"
+                  :modelValue="scope.row.name"
+                >
                   <template #popover-content>
                     <medicineList
                       ref="medicineListRef"
                       @selectRow="(row) => selectRow(row, scope.$index)"
                       :searchKey="medicineSearchKey"
                       :supplierId="queryParams.supplierId"
+                      :categoryEnum="24"
                     />
                   </template>
                 </PopoverList>
@@ -79,27 +94,37 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="规格" prop="totalVolume" align="center">
+            <el-table-column label="规格" prop="volume" align="center">
               <template #default="scope">
-                {{ scope.row.totalVolume ? scope.row.totalVolume : '-' }}
+                {{ scope.row.volume ? scope.row.volume : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="当前价格" prop="retailPrice" align="center">
+            <el-table-column label="当前进货价" prop="originBuyingPrice" align="center">
               <template #default="scope">
-                {{ scope.row.retailPrice ? scope.row.retailPrice : '-' }}
+                {{ scope.row.originBuyingPrice ? scope.row.originBuyingPrice : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="调后价格" prop="afterPrice" align="center">
+            <el-table-column label="调后进货价" prop="newBuyingPrice" align="center">
               <template #default="scope">
-                <el-input v-model="scope.row.afterPrice" type="number" step="0.01" />
+                <el-input v-model="scope.row.newBuyingPrice" type="number" step="0.01" />
               </template>
             </el-table-column>
-            <el-table-column label="调价理由" prop="price" align="center">
+            <el-table-column label="当前零售价" prop="originRetailPrice" align="center">
+              <template #default="scope">
+                {{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="调后零售价" prop="newRetailPrice" align="center">
+              <template #default="scope">
+                <el-input v-model="scope.row.newRetailPrice" type="numbefr" step="0.01" />
+              </template>
+            </el-table-column>
+            <el-table-column label="调价理由" prop="reason" align="center">
               <template #default="scope">
                 <el-input
                   type="textarea"
-                  v-model="scope.row.adjustReason"
-                  rows="1"
+                  v-model="scope.row.reason"
+                  :rows="1"
                   maxlength="255"
                   autosize
                 />
@@ -115,74 +140,124 @@
           />
         </el-tab-pane>
         <el-tab-pane label="耗材调价" name="2">
+          <el-form-item label="申请人" prop="applicationName" label-width="100px">
+            <el-input v-model="applicationName" placeholder="" disabled />
+          </el-form-item>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+              <el-button
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                :disabled="!isAdjustPrice"
+                >新增</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="Delete"
+                @click="handleDelete"
+                v-if="selectedRows.length > 0"
+              >
+                删除选中行
+              </el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="Check"
+                @click="handleSave"
+                v-if="definitionList2.length > 0"
+                >保存</el-button
+              >
+              <el-button
+                type="success"
+                plain
+                icon="Check"
+                @click="handleSubmitForReview(definitionList2)"
+                v-if="definitionList2.length > 0"
+                style="margin-left: 10px"
+                >提审</el-button
+              >
             </el-col>
           </el-row>
           <el-table
             v-if="refreshTable"
             v-loading="loading"
-            :data="definitionList"
+            :data="definitionList2"
             tooltip-effect="dark"
             :show-overflow-tooltip="true"
             ref="tableRef"
             @selection-change="handleSelectionChange"
+            style="width: 100% !important"
           >
             <el-table-column type="selection" width="40" align="center" fixed="left" />
-            <el-table-column label="编码" width="200" prop="chargeName" align="center">
+            <el-table-column label="名称" prop="name" align="center">
               <template #default="scope">
-                {{ scope.row.chargeName ? scope.row.chargeName : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="名称" width="200" prop="orgId_dictText" align="center">
-              <template #default="scope">
-                <PopoverList @search="handleSearch" :width="1000" :modelValue="scope.row.itemName">
+                <span v-if="scope.row.isEdit == undefined || !scope.row.isEdit">{{
+                  scope.row.name
+                }}</span>
+                <PopoverList
+                  v-else
+                  @search="handleSearch"
+                  :width="1000"
+                  :modelValue="scope.row.name"
+                >
                   <template #popover-content>
                     <medicineList
                       ref="medicineListRef"
                       @selectRow="(row) => selectRow(row, scope.$index)"
-                      :searchKey="medicineSearchKey"
+                      :searchKey="deviceSearchKey"
                       :supplierId="queryParams.supplierId"
+                      :categoryEnum="25"
                     />
                   </template>
                 </PopoverList>
               </template>
             </el-table-column>
-            <el-table-column label="规格" width="200" prop="typeCode_dictText" align="center">
+            <el-table-column label="编码" prop="busNo" align="center">
               <template #default="scope">
-                {{ scope.row.typeCode_dictText ? scope.row.typeCode_dictText : '-' }}
+                {{ scope.row.busNo ? scope.row.busNo : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="当前价格" width="200" prop="ybType_dictText" align="center">
+            <el-table-column label="规格" prop="volume" align="center">
               <template #default="scope">
-                {{ scope.row.ybType_dictText ? scope.row.ybType_dictText : '-' }}
+                {{ scope.row.volume ? scope.row.volume : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="调后价格" width="200" prop="price" align="center">
+            <el-table-column label="当前进货价" prop="originBuyingPrice" align="center">
               <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
+                {{ scope.row.originBuyingPrice ? scope.row.originBuyingPrice : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="调价理由" width="200" prop="price" align="center">
+            <el-table-column label="调后进货价" prop="newBuyingPrice" align="center">
               <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
+                <el-input v-model="scope.row.newBuyingPrice" type="number" step="0.01" />
               </template>
             </el-table-column>
-            <el-table-column label="调整时间" width="200" prop="price" align="center">
+            <el-table-column label="当前零售价" prop="originRetailPrice" align="center">
               <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
+                {{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
               </template>
             </el-table-column>
-            <el-table-column
-              min-width="290"
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-              fixed="right"
-            >
+            <el-table-column label="调后零售价" prop="newRetailPrice" align="center">
               <template #default="scope">
-                <el-button link type="primary" @click="handleUpdate(scope.row)">修改</el-button>
+                <el-input v-model="scope.row.newRetailPrice" type="numbefr" step="0.01" />
+              </template>
+            </el-table-column>
+            <el-table-column label="调价理由" prop="reason" align="center">
+              <template #default="scope">
+                <el-input
+                  type="textarea"
+                  v-model="scope.row.reason"
+                  :rows="1"
+                  maxlength="255"
+                  autosize
+                />
               </template>
             </el-table-column>
           </el-table>
@@ -195,65 +270,110 @@
           />
         </el-tab-pane>
         <el-tab-pane label="诊疗调价" name="3">
+          <el-form-item label="申请人" prop="applicationName" label-width="100px">
+            <el-input v-model="applicationName" placeholder="" disabled />
+          </el-form-item>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+              <el-button
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                :disabled="!isAdjustPrice"
+                >新增</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="Delete"
+                @click="handleDelete"
+                v-if="selectedRows.length > 0"
+              >
+                删除选中行
+              </el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="Check"
+                @click="handleSave"
+                v-if="definitionList3.length > 0"
+                >保存</el-button
+              >
+              <el-button
+                type="success"
+                plain
+                icon="Check"
+                @click="handleSubmitForReview(definitionList3)"
+                v-if="definitionList3.length > 0"
+                style="margin-left: 10px"
+                >提审</el-button
+              >
             </el-col>
           </el-row>
           <el-table
             v-if="refreshTable"
             v-loading="loading"
-            :data="definitionList"
+            :data="definitionList3"
             tooltip-effect="dark"
             :show-overflow-tooltip="true"
             ref="tableRef"
             @selection-change="handleSelectionChange"
+            style="width: 100% !important"
           >
             <el-table-column type="selection" width="40" align="center" fixed="left" />
-            <el-table-column label="编码" width="200" prop="chargeName" align="center">
+            <el-table-column label="名称" prop="name" align="center">
               <template #default="scope">
-                {{ scope.row.chargeName ? scope.row.chargeName : '-' }}
+                <span v-if="scope.row.isEdit == undefined || !scope.row.isEdit">{{
+                  scope.row.name
+                }}</span>
+                <PopoverList
+                  v-else
+                  @search="handleSearch"
+                  :width="1000"
+                  :modelValue="scope.row.name"
+                >
+                  <template #popover-content>
+                    <medicineList
+                      ref="medicineListRef"
+                      @selectRow="(row) => selectRow(row, scope.$index)"
+                      :searchKey="medicineSearchKey"
+                      :supplierId="queryParams.supplierId"
+                      :categoryEnum="26"
+                    />
+                  </template>
+                </PopoverList>
               </template>
             </el-table-column>
-            <el-table-column label="名称" width="200" prop="orgId_dictText" align="center">
+            <el-table-column label="编码" prop="busNo" align="center">
               <template #default="scope">
-                {{ scope.row.orgId_dictText ? scope.row.orgId_dictText : '-' }}
+                {{ scope.row.busNo ? scope.row.busNo : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="规格" width="200" prop="typeCode_dictText" align="center">
+
+            <el-table-column label="当前零售价" prop="originRetailPrice" align="center">
               <template #default="scope">
-                {{ scope.row.typeCode_dictText ? scope.row.typeCode_dictText : '-' }}
+                {{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="当前价格" width="200" prop="ybType_dictText" align="center">
+            <el-table-column label="调后零售价" prop="newRetailPrice" align="center">
               <template #default="scope">
-                {{ scope.row.ybType_dictText ? scope.row.ybType_dictText : '-' }}
+                <el-input v-model="scope.row.newRetailPrice" type="numbefr" step="0.01" />
               </template>
             </el-table-column>
-            <el-table-column label="调后价格" width="200" prop="price" align="center">
+            <el-table-column label="调价理由" prop="reason" align="center">
               <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="调价理由" width="200" prop="price" align="center">
-              <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="调整时间" width="200" prop="price" align="center">
-              <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              min-width="290"
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-              fixed="right"
-            >
-              <template #default="scope">
-                <el-button link type="primary" @click="handleUpdate(scope.row)">修改</el-button>
+                <el-input
+                  type="textarea"
+                  v-model="scope.row.reason"
+                  :rows="1"
+                  maxlength="255"
+                  autosize
+                />
               </template>
             </el-table-column>
           </el-table>
@@ -266,65 +386,132 @@
           />
         </el-tab-pane>
         <el-tab-pane label="挂号调价" name="4">
+          <el-form-item label="申请人" prop="applicationName" label-width="100px">
+            <el-input v-model="applicationName" placeholder="" disabled />
+          </el-form-item>
           <el-row :gutter="10" class="mb8">
+            <!-- <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                :disabled="!isAdjustPrice"
+                >新增</el-button
+              >
+            </el-col> -->
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+              <el-button
+                type="danger"
+                plain
+                icon="Delete"
+                @click="handleDelete"
+                v-if="selectedRows.length > 0"
+              >
+                删除选中行
+              </el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="Check"
+                @click="handleSave"
+                v-if="definitionList4.length > 0"
+                >保存</el-button
+              >
+              <el-button
+                type="success"
+                plain
+                icon="Check"
+                @click="handleSubmitForReview(definitionList4)"
+                v-if="definitionList4.length > 0"
+                style="margin-left: 10px"
+                >提审</el-button
+              >
             </el-col>
           </el-row>
+
+          <!-- 科室下拉框单独显示 -->
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="6">
+              <el-form-item label="选择科室" label-width="80px">
+                <el-select
+                  v-model="selectedOrgId"
+                  placeholder="请选择科室"
+                  clearable
+                  style="width: 200px"
+                  @change="handleSelectOrg"
+                  filterable
+                  :disabled="!isAdjustPrice"
+                >
+                  <el-option
+                    v-for="org in orgDataList"
+                    :key="org.orgId"
+                    :label="org.orgName"
+                    :value="org.orgId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-table
             v-if="refreshTable"
             v-loading="loading"
-            :data="definitionList"
+            :data="definitionList4"
             tooltip-effect="dark"
             :show-overflow-tooltip="true"
             ref="tableRef"
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="40" align="center" fixed="left" />
-            <el-table-column label="编码" width="200" prop="chargeName" align="center">
+            <el-table-column label="名称" prop="orgName" align="center">
               <template #default="scope">
-                {{ scope.row.chargeName ? scope.row.chargeName : '-' }}
+                <span>
+                  {{ scope.row.orgName ? scope.row.orgName : '-' }}
+                </span>
               </template>
             </el-table-column>
-            <el-table-column label="名称" width="200" prop="orgId_dictText" align="center">
+            <el-table-column label="类型" min-width="120" align="center">
               <template #default="scope">
-                {{ scope.row.orgId_dictText ? scope.row.orgId_dictText : '-' }}
+                <el-select
+                  v-model="scope.row.targetId"
+                  placeholder="请选择类型"
+                  clearable
+                  style="width: 100px"
+                  v-if="scope.row.isEdit && scope.row.orgId"
+                  @change="handleTypeChange(scope.row)"
+                >
+                  <el-option
+                    v-for="item in healthDataList"
+                    :key="item.targetId"
+                    :label="item.name"
+                    :value="item.targetId"
+                  />
+                </el-select>
+                <span v-else>{{ scope.row.name }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="规格" width="200" prop="typeCode_dictText" align="center">
+            <el-table-column label="当前零售价" prop="originRetailPrice" align="center">
               <template #default="scope">
-                {{ scope.row.typeCode_dictText ? scope.row.typeCode_dictText : '-' }}
+                {{ scope.row.originRetailPrice ? scope.row.originRetailPrice : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="当前价格" width="200" prop="ybType_dictText" align="center">
+            <el-table-column label="调后零售价" prop="newRetailPrice" align="center">
               <template #default="scope">
-                {{ scope.row.ybType_dictText ? scope.row.ybType_dictText : '-' }}
+                <el-input v-model="scope.row.newRetailPrice" type="numbefr" step="0.01" />
               </template>
             </el-table-column>
-            <el-table-column label="调后价格" width="200" prop="price" align="center">
+            <el-table-column label="调价理由" prop="reason" align="center">
               <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="调价理由" width="200" prop="price" align="center">
-              <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="调整时间" width="200" prop="price" align="center">
-              <template #default="scope">
-                {{ scope.row.price ? thousandNumber(scope.row.price) : '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              min-width="290"
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-              fixed="right"
-            >
-              <template #default="scope">
-                <el-button link type="primary" @click="handleUpdate(scope.row)">修改</el-button>
+                <el-input
+                  type="textarea"
+                  v-model="scope.row.reason"
+                  :rows="1"
+                  maxlength="255"
+                  autosize
+                />
               </template>
             </el-table-column>
           </el-table>
@@ -338,63 +525,53 @@
         </el-tab-pane>
       </el-tabs>
     </el-form>
-    <el-dialog :title="title" v-model="openDetails" width="600px" append-to-body>
-      <el-table
-        v-loading="detailLoading"
-        :data="definitionDetailList"
-        tooltip-effect="dark"
-        :show-overflow-tooltip="true"
-      >
-        <el-table-column label="条件" prop="conditionCode_enumText" align="center">
-          <template #default="scope">
-            {{ scope.row.conditionCode_enumText ? scope.row.conditionCode_enumText : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="价格" width="200" prop="amount" align="center">
-          <template #default="scope">
-            {{ scope.row.amount ? scope.row.amount : '-' }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-    <edit
-      :title="title"
-      :open="open"
-      :formData="form"
-      @submit="submitForm"
-      @update:open="handleOpenChange"
-      @update:form="handleFormChange"
-    />
   </div>
 </template>
 <script setup>
-import { listDefinition, initOption, updateDefinition, getSupplierList } from './components/api';
+import {
+  listDefinition,
+  initOption,
+  commitChangePriceData,
+  commitExamineChangePriceData,
+  searchAllOrgData,
+  searchHealthData,
+  checkMedApprovalExist,
+  checkDeviceApprovalExist,
+  checkActivityApprovalExist,
+  getInitAdjustPriceSwitchState,
+} from './components/api';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
 import medicineList from './components/medicineList.vue';
-import { thousandNumber } from '@/utils/his.js';
 import useUserStore from '@/store/modules/user';
+import { ref, watch } from 'vue';
+import { da } from 'element-plus/es/locales.mjs';
 const activeName = ref('1');
+const router = useRouter();
 const showSearch = ref(true);
 const loading = ref(true);
-const detailLoading = ref(true);
 const refreshTable = ref(true);
-const definitionList = ref([]);
-const definitionDetailList = ref([]);
+const definitionList1 = ref([]);
+const definitionList2 = ref([]);
+const definitionList3 = ref([]);
+const definitionList4 = ref([]);
 const total = ref(0);
 const tableRef = ref(null);
 const selectedRows = ref([]);
+// 挂号调价相关数据
+const orgDataList = ref([]); // 科室数据列表
+const healthDataList = ref([]); // 类型数据列表
+// 选中的科室ID
+const selectedOrgId = ref(null);
+const orgLoading = ref(false); // 科室数据加载状态
+const healthLoading = ref(false); // 类型数据加载状态
 // 获取 pinia 中用户信息
 const userInfo = useUserStore();
 // 申请人
 const applicationName = ref(userInfo.nickName);
 const { proxy } = getCurrentInstance();
 const options = ref([]);
-const title = ref('');
-const open = ref(false);
-const openDetails = ref(false);
 
 const data = reactive({
-  form: {},
   queryParams: {
     search: '',
     definitionType: '',
@@ -408,60 +585,36 @@ const data = reactive({
 const { queryParams, form } = toRefs(data);
 // 切换tab
 const handleClick = (tab, event) => {
-  console.log(tab, event);
   activeName.value = tab.props.name;
   queryParams.value.pageNo = 1;
+  reset();
   handleInit();
-  // getList();
 };
 
 /** 查询委托单信息列表 */
 function getList() {
   loading.value = true;
   queryParams.value.chargeItemContext = activeName.value;
-  listDefinition(queryParams.value).then((response) => {
-    definitionList.value = response.data.records;
-    total.value = response.data.total;
-    loading.value = false;
-  });
+  listDefinition(queryParams.value)
+    .then((response) => {
+      if (Array.isArray(response.data)) {
+        definitionList1.value = response.data;
+        total.value = response.data.length;
+      } else {
+        definitionList1.value = response.data.records || [];
+        total.value = response.data.total || 0;
+      }
+      loading.value = false;
+    })
+    .catch((error) => {
+      loading.value = false;
+    });
 }
 
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNo = 1;
-  getList();
-}
-
-// 表单重置
-function reset() {
-  form.value = {
-    id: null,
-    itemNo: null,
-    chargeName: null,
-    totalVolume: null,
-    unitCode: null,
-    partPercent: null,
-    conditionYbCode: null,
-    price: null,
-    amount: null,
-    partMinUnitCode: null,
-    partConditionPrice: null,
-    partPrice: null,
-    description: null,
-    statusEnum: null,
-    itemId: null,
-  };
-  proxy.resetForm('einfoRef');
-}
 // 品名搜索
 const medicineSearchKey = ref('');
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset();
-  form.value = row;
-  open.value = true;
-  title.value = '修改项目定价';
-}
+const deviceSearchKey = ref('');
+
 /** 搜索按钮操作 */
 function handleInit() {
   queryParams.value.definitionType = activeName.value;
@@ -472,14 +625,6 @@ function handleInit() {
   });
 }
 
-const handleOpenChange = (value) => {
-  open.value = value;
-};
-
-const handleFormChange = (newForm) => {
-  form.value = { ...newForm };
-};
-
 // 表格多选与删除
 function handleSelectionChange(selection) {
   selectedRows.value = selection || [];
@@ -490,7 +635,26 @@ function handleDelete() {
     proxy.$message.warning('请选择要删除的行');
     return;
   }
-  definitionList.value = definitionList.value.filter((row) => !selectedRows.value.includes(row));
+
+  // 根据当前激活的标签页删除对应列表中的选中行
+  if (activeName.value === '1') {
+    definitionList1.value = definitionList1.value.filter(
+      (row) => !selectedRows.value.includes(row)
+    );
+  } else if (activeName.value === '2') {
+    definitionList2.value = definitionList2.value.filter(
+      (row) => !selectedRows.value.includes(row)
+    );
+  } else if (activeName.value === '3') {
+    definitionList3.value = definitionList3.value.filter(
+      (row) => !selectedRows.value.includes(row)
+    );
+  } else if (activeName.value === '4') {
+    definitionList4.value = definitionList4.value.filter(
+      (row) => !selectedRows.value.includes(row)
+    );
+  }
+
   selectedRows.value = [];
   nextTick(() => {
     tableRef.value && tableRef.value.clearSelection && tableRef.value.clearSelection();
@@ -503,117 +667,344 @@ function handleSearch(keyword) {
   medicineSearchKey.value = keyword || '';
 }
 function selectRow(row, index) {
-  console.log('选中行数据：', row);
-  if (!definitionList.value[index]) return;
-  // 根据业务字段同步选中行信息
-  definitionList.value[index] = {
-    ...definitionList.value[index],
-    itemId: row.id,
-    itemName: row.itemName || row.name || '',
-    ...row,
-  };
+  // 根据当前激活的标签页更新对应列表的数据
+  if (activeName.value === '1' && definitionList1.value[index]) {
+    //验证当前药品是否已经提交申请
+    checkMedApprovalExist(row.targetId).then((res) => {
+      if (res.code !== 200) {
+        proxy.$message.warning('【该药品已存在未审核的调价申请，请勿重复添加】' + res.msg);
+        return;
+      } else {
+        // 药品调价
+        definitionList1.value[index] = {
+          ...definitionList1.value[index],
+          ...row,
+        };
+      }
+    });
+  }
+  if (activeName.value === '2' && definitionList2.value[index]) {
+    checkDeviceApprovalExist(row.targetId).then((res) => {
+      if (res.code !== 200) {
+        proxy.$message.warning('【该耗材已存在未审核的调价申请，请勿重复添加】' + res.msg);
+        return;
+      } else {
+        // 耗材调价
+        definitionList2.value[index] = {
+          ...definitionList2.value[index],
+          ...row,
+        };
+      }
+    });
+  }
+  if (activeName.value === '3' && definitionList3.value[index]) {
+    checkActivityApprovalExist(row.targetId).then((res) => {
+      if (res.code !== 200) {
+        proxy.$message.warning('【该诊疗已存在未审核的调价申请，请勿重复添加】' + res.msg);
+        return;
+      } else {
+        // 诊疗调价
+        definitionList3.value[index] = {
+          ...definitionList3.value[index],
+          ...row,
+        };
+      }
+    });
+  }
+  // 强制刷新，确保保存按钮状态正确更新
+  nextTick(() => {
+    refreshTable.value = false;
+    setTimeout(() => {
+      refreshTable.value = true;
+    }, 0);
+  });
+}
+
+// 获取科室数据
+async function loadOrgData() {
+  if (orgDataList.value.length === 0) {
+    orgLoading.value = true;
+    try {
+      const response = await searchAllOrgData();
+      if (response && response.code === 200 && response.data && Array.isArray(response.data)) {
+        orgDataList.value = response.data;
+      } else {
+        proxy.$message.warning('获取科室数据失败');
+        orgDataList.value = [];
+      }
+    } catch (error) {
+      proxy.$message.error('获取科室数据失败，请重试');
+      orgDataList.value = [];
+    } finally {
+      orgLoading.value = false;
+    }
+  }
+}
+
+// 获取类型数据
+async function loadHealthData(orgId) {
+  if (!orgId) return;
+  healthLoading.value = true;
+  try {
+    const response = await searchHealthData({ orgId });
+    if (response && response.code === 200 && response.data && Array.isArray(response.data)) {
+      healthDataList.value = response.data;
+    } else {
+      proxy.$message.warning('获取类型数据失败');
+      healthDataList.value = [];
+    }
+  } catch (error) {
+    proxy.$message.error('获取类型数据失败，请重试');
+    healthDataList.value = [];
+  } finally {
+    healthLoading.value = false;
+  }
+}
+
+// 科室下拉框选择处理函数
+function handleSelectOrg(orgId) {
+  // 清空列表
+  definitionList4.value = [];
+  if (orgId) {
+    // 加载该科室的挂号类型数据
+    loadHealthData(orgId).then(() => {
+      // 为每个类型创建一行数据并追加到列表
+      definitionList4.value = [...healthDataList.value];
+    });
+  }
+}
+
+// 类型选择变化处理
+function handleTypeChange(row) {
+  if (row.targetId) {
+    const selectedItem = healthDataList.value.find((item) => item.targetId === row.targetId);
+    if (selectedItem) {
+      row.orgName = selectedItem.orgName;
+      row.originRetailPrice = selectedItem.price;
+    }
+  }
 }
 
 // 新增按钮操作
 function handleAdd() {
-  // if (!queryParams.value.supplierId) {
-  //   proxy.$message.error('请选择供应商！');
-  //   return;
-  // }
-  reset();
-  // 新增一行
-  definitionList.value.push({
-    id: null,
-    itemNo: null,
-    chargeName: null,
-    totalVolume: null,
-    unitCode: null,
-    partPercent: null,
-    conditionYbCode: null,
-    price: null,
-    amount: null,
-    partMinUnitCode: null,
-    partConditionPrice: null,
-    partPrice: null,
-    description: null,
-    statusEnum: null,
-    itemId: null,
-  });
+  // 根据当前激活的标签页决定向哪个列表添加新行
+  const newRow = {
+    isEdit: true,
+  };
+  if (activeName.value === '1') {
+    // 药品调价
+    definitionList1.value.push(newRow);
+  } else if (activeName.value === '2') {
+    // 耗材调价
+    definitionList2.value.push(newRow);
+  } else if (activeName.value === '3') {
+    definitionList3.value.push(newRow);
+  } else if (activeName.value === '4') {
+    let orgName = '';
+    if (definitionList4.value.length !== 0) {
+      orgName = definitionList4.value[0].orgName;
+    }
+    // 挂号调价 - 直接添加新行
+    definitionList4.value.push({
+      ...newRow,
+      // 挂号调价特殊字段
+      orgId: selectedOrgId.value,
+      orgName,
+    });
+  }
 }
+// 保存按钮操作校验
+function validateList(currentList, categoryType) {
+  let isValid = true;
+  for (let i = 0; i < currentList.length; i++) {
+    const row = currentList[i] || {};
+    const rowIndex = i + 1;
+    console.log(categoryType);
+    if (categoryType !== 2 && categoryType !== 3) {
+      if (!row.newBuyingPrice || row.newBuyingPrice <= 0) {
+        proxy.$message.error(`第${rowIndex}行：请输入正确的调后进货价`);
+        isValid = false;
+        break;
+      }
+    }
 
-/** 提交按钮 */
-function submitForm(form) {
-  updateDefinition(form).then((response) => {
-    proxy.$modal.msgSuccess('操作成功');
-    open.value = false;
-    getList();
-  });
+    if (!row.newRetailPrice || row.newRetailPrice <= 0) {
+      proxy.$message.error(`第${rowIndex}行：请输入正确的调后零售价`);
+      isValid = false;
+      break;
+    }
+    if (!row.reason || String(row.reason).trim() === '') {
+      proxy.$message.error(`第${rowIndex}行：请输入调价理由`);
+      isValid = false;
+      break;
+    }
+  }
+  return isValid;
 }
-
 // 保存前校验与保存
 function handleSave() {
-  console.log(queryParams.value.supplierId, 'queryParams.value.supplierId');
-  // 供应商必选
-  if (!queryParams.value.supplierId) {
-    proxy.$message.error('请选择供应商');
-    return;
+  let currentList = [];
+  let categoryType = 0;
+
+  // 根据当前激活的标签页选择对应的数据列表和类别类型
+  if (activeName.value === '1') {
+    currentList = definitionList1.value;
+    categoryType = 0; // 药品
+  } else if (activeName.value === '2') {
+    currentList = definitionList2.value;
+    categoryType = 1; // 耗材
+  } else if (activeName.value === '3') {
+    currentList = definitionList3.value;
+    categoryType = 2; // 诊疗
+  } else if (activeName.value === '4') {
+    currentList = definitionList4.value;
+    categoryType = 3; // 挂号
   }
+
   // 至少一行
-  if (!definitionList.value || !definitionList.value.length) {
+  if (!currentList || !currentList.length) {
     proxy.$message.warning('请先新增行再保存');
     return;
   }
+
   // 按行校验
-  for (let i = 0; i < definitionList.value.length; i++) {
-    const row = definitionList.value[i] || {};
-    const rowIndex = i + 1;
-    // 名称/项目必填
-    if (!row.itemId && !row.itemName) {
-      proxy.$message.error(`第${rowIndex}行：请选择名称`);
-      return;
-    }
-    // 调后价格校验（数字且>=0）
-    const priceNum = Number(row.afterPrice);
-    if (!Number.isFinite(priceNum) || priceNum < 0) {
-      proxy.$message.error(`第${rowIndex}行：请输入有效的调后价格（>=0）`);
-      return;
-    }
-    // 与当前价格相同给出提示（但不强制）
-    if (Number(row.retailPrice) === priceNum) {
-      proxy.$message.warning(`第${rowIndex}行：调后价格与当前价格相同`);
-    }
-    // 调价理由必填
-    if (!row.adjustReason || String(row.adjustReason).trim() === '') {
-      proxy.$message.error(`第${rowIndex}行：请输入调价理由`);
-      return;
-    }
-    // 调整时间必选
-    if (!row.adjustTime) {
-      proxy.$message.error(`第${rowIndex}行：请选择调整时间`);
-      return;
-    }
-    // 价格规范化为两位小数（不改变展示，仅在保存前处理）
-    row.afterPrice = Number(priceNum.toFixed(2));
+  let isValid = validateList(currentList, categoryType);
+
+  if (!isValid) {
+    return;
   }
-  // 所有校验通过
-  proxy.$message.success('校验通过');
-  // TODO: 在此调用保存接口（当前仅打印）
-  console.log('保存数据：', definitionList.value);
+
+  // 构造请求数据
+  let requestData = (currentList || []).map((item) => {
+    return {
+      itemId: item.targetId,
+      categoryType,
+      newBuyingPrice: item.newBuyingPrice,
+      newRetailPrice: item.newRetailPrice,
+      reason: item.reason,
+      unitCode: item.unitCode,
+    };
+  });
+
+  // 调用保存接口
+  commitChangePriceData(requestData)
+    .then((res) => {
+      if (res && res.code === 200) {
+        proxy.$message.success('保存成功');
+        // 重置数据
+        reset();
+        // 强制刷新表格状态
+        refreshTable.value = false;
+        setTimeout(() => {
+          refreshTable.value = true;
+        }, 0);
+      } else {
+        proxy.$message.error(res?.message || '保存失败');
+      }
+    })
+    .catch((error) => {
+      console.error('保存接口调用失败:', error);
+      proxy.$message.error('保存失败，请重试');
+    });
 }
-// 供应商列表
-const supplierIDList = ref([]);
-// 获取供应商列表
-function getSupplierIDList() {
+
+// 提交审核前校验与保存
+function handleSubmitForReview(dataList) {
+  let currentList = dataList;
+  let categoryType = 0;
+
+  // 根据当前激活的标签页设置类别类型
+  if (activeName.value === '1') {
+    categoryType = 0; // 药品
+  } else if (activeName.value === '2') {
+    categoryType = 1; // 耗材
+  } else if (activeName.value === '3') {
+    categoryType = 2; // 诊疗
+  } else if (activeName.value === '4') {
+    categoryType = 3; // 挂号
+  }
+
+  // 至少一行
+  if (!currentList || !currentList.length) {
+    proxy.$message.warning('请先新增行再提审');
+    return;
+  }
+
+  // 按行校验
+  let isValid = validateList(currentList, categoryType);
+
+  if (!isValid) {
+    proxy.$message.success('校验未通过');
+    return;
+  }
+
+  // 所有校验通过
+
+  // 构造请求数据
+  let requestData = (currentList || []).map((item) => {
+    return {
+      itemId: item.targetId,
+      categoryType,
+      newBuyingPrice: item.newBuyingPrice,
+      newRetailPrice: item.newRetailPrice,
+      reason: item.reason,
+      unitCode: item.unitCode,
+    };
+  });
+  // 调用提审接口
+  commitExamineChangePriceData(requestData)
+    .then((res) => {
+      if (res && res.code === 200) {
+        proxy.$message.success('提审成功');
+        // 重置数据
+        reset();
+        // 强制刷新表格状态
+        refreshTable.value = false;
+        //保存成功后跳转到审核管理页面
+        router.push(
+          '/medicationmanagement/priceAdjustmentManagement/priceAdjustmentApprovalManagement'
+        );
+        setTimeout(() => {
+          refreshTable.value = true;
+        }, 0);
+      } else {
+        proxy.$message.error(res?.message || '提审失败');
+      }
+    })
+    .catch((error) => {
+      proxy.$message.error('提审失败，请重试');
+    });
+}
+function reset() {
+  definitionList1.value = [];
+  definitionList2.value = [];
+  definitionList3.value = [];
+  definitionList4.value = [];
+  selectedRows.value = [];
+}
+const isAdjustPrice = ref(true);
+function getAdjustPriceSwitchState() {
   loading.value = true;
-  getSupplierList().then((res) => {
-    supplierIDList.value = res.data;
-    loading.value = false;
+  getInitAdjustPriceSwitchState().then((res) => {
+    // true 可以调价
+    // false 不可以调价
+    isAdjustPrice.value = res.data;
   });
 }
+getAdjustPriceSwitchState();
 handleInit();
 // 获取供应商列表
-getSupplierIDList();
 //getList();
+
+// 监听activeName变化，当切换到挂号调价标签时加载科室数据
+watch(
+  () => activeName.value,
+  (newVal) => {
+    if (newVal === '4') {
+      loadOrgData();
+    }
+  }
+);
 </script>
 <style lang="scss" scoped>
 :deep(.demo-tabs > .el-tabs__content) {
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/templateJson.json b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/templateJson.json
index 47cdd5ff..928a36ed 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/templateJson.json
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/templateJson.json
@@ -33,7 +33,7 @@
             "top": 13.5,
             "height": 12,
             "width": 75,
-            "title": "医院",
+            "title": "长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 12,
@@ -84,7 +84,7 @@
             "top": 33,
             "height": 9.75,
             "width": 120,
-            "title": "机构：医院",
+            "title": "机构：长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "qrCodeLevel": 0
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
index 22ddc882..b6bcfbd2 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/index.vue
@@ -54,7 +54,7 @@
           placeholder=""
           clearable
           filterable
-          :disabled="viewStatus == 'view'"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
           style="width: 150px"
         >
           <el-option
@@ -70,7 +70,7 @@
           v-model="receiptHeaderForm.occurrenceTime"
           value-format="YYYY-MM-DD HH:mm:ss"
           type="datetime"
-          :disabled="viewStatus == 'view'"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
         />
       </el-form-item>
       <el-form-item label="供应商：" prop="supplierId">
@@ -80,7 +80,8 @@
           clearable
           filterable
           style="width: 150px"
-          :disabled="viewStatus == 'view'"
+          :disabled="viewStatus == 'view' || viewStatus == 'apply'"
+          v-if="viewStatus != 'apply' && viewStatus != 'view'"
         >
           <el-option
             v-for="supplier in supplierListOptions"
@@ -89,6 +90,13 @@
             :value="supplier.value"
           />
         </el-select>
+        <el-input
+          placeholder="供应商名称"
+          v-model="receiptHeaderForm.supplierName"
+          clearable
+          disabled
+          v-else-if="viewStatus == 'view' || viewStatus == 'apply'"
+        />
       </el-form-item>
       <el-form-item label="药品类型：" prop="medicationType">
         <el-select
@@ -209,17 +217,17 @@
               <el-table-column
                 label="厂家/产地"
                 align="center"
-                key="manufacturer"
-                prop="manufacturer"
+                key="manufacturerText"
+                prop="manufacturerText"
                 :show-overflow-tooltip="true"
                 width="160"
               >
                 <template #default="scope">
                   <el-form-item
-                    :prop="`purchaseinventoryList.${scope.$index}.manufacturer`"
-                    :rules="tableRules.manufacturer"
+                    :prop="`purchaseinventoryList.${scope.$index}.manufacturerText`"
+                    :rules="tableRules.manufacturerText"
                   >
-                    <el-input v-model="scope.row.manufacturer" placeholder="" disabled />
+                    <el-input v-model="scope.row.manufacturerText" placeholder="" disabled />
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -503,6 +511,7 @@
                     <el-input
                       v-model="scope.row.invoiceNo"
                       placeholder=""
+                      style="text-align: center !important"
                       :disabled="viewStatus == 'view'"
                     />
                   </el-form-item>
@@ -632,7 +641,6 @@ import {
   getPharmacyList,
   getCount,
   getDispensaryList,
-  getMedicineList,
   getInitBusNo,
   purchaseInventoryApproved,
   reject,
@@ -682,7 +690,6 @@ const multiple = ref(true);
 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);
@@ -698,6 +705,7 @@ const forms = reactive({
 const receiptHeaderForm = reactive({
   busNo: undefined,
   occurrenceTime: formatDate(new Date()),
+  practitionerId: userUserStore.practitionerId,
 });
 
 const data = reactive({
@@ -724,11 +732,7 @@ const data = reactive({
     statusEnum_enumText: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
     unitCode: [{ required: true, message: '计量单位不能为空', trigger: 'blur' }],
     purposeLocationId: [{ required: true, message: '目的仓库不能为空', trigger: 'blur' }],
-    // purposeLocationStoreId: [
-    //   { required: true, message: "货位不能为空", trigger: "blur" },
-    // ],
     lotNumber: [{ required: true, message: '产品批号不能为空', trigger: 'change' }],
-    // traceNo: [{ required: true, message: "追溯码不能为空", trigger: "blur" }],
     startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
     endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
     price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
@@ -761,7 +765,6 @@ const saveRowObject = ref({});
 watch(
   () => store.currentData,
   (newVlaue) => {
-    console.log(newVlaue, '11212121212121');
     if (newVlaue) {
       editData.value.editRow = newVlaue?.editRow;
       editData.value.item = newVlaue?.item;
@@ -803,26 +806,6 @@ watch(
   { immediate: true }
 );
 onMounted(() => {
-  document.addEventListener("click", handleClickOutside);
-  
-  // 获取源仓库列表（假设 getPharmacyList 返回仓库数据）
-  getPharmacyList({ type: 'source' }).then(res => {
-    if (res.code === 200) {
-      sourceTypeListOptions.value = res.data; // 格式需为 [{id, name}, ...]
-    }
-  });
-
-  // 获取目的仓库列表
-  getPharmacyList({ type: 'purpose' }).then(res => {
-    if (res.code === 200) {
-      purposeTypeListOptions.value = res.data;
-    }
-  });
-  
-  // 初始化默认仓库数据，使用药房类型(16)
-  handleChangeLocationType(16);
-  
-  console.log(route, '!1212');
   if (route.query.view) {
     viewStatus.value = route.query.view;
     // 查看模式下，不要清空store数据，让watch监听器自然处理
@@ -844,42 +827,138 @@ onUnmounted(() => {
 });
 
 function addNewRow() {
+  // 先校验表头表单
   proxy.$refs['receiptHeaderRef'].validate((valid) => {
     if (valid) {
-      // if (data.isAdding) {
-      //   proxy.$message.warning('请先保存当前行后再新增！');
-      //   return;
-      // }
-      const newRow = {
-        rowKey: Date.now(),
-        id: '',
-        itemTable: '',
-        itemQuantity: '',
-        itemId: '',
-        unitCode: '',
-        remake: '',
-        supplierId: '',
-        purposeTypeEnum: '',
-        // 使用表头的仓库作为新增行默认值，减少重复选择
-        purposeLocationId: receiptHeaderForm.purposeLocationId || null,
-        purposeLocationStoreId: null,
-        practitionerId: '',
-        traceNo: '',
-        invoiceNo: '',
-        startTime: '',
-        endTime: '',
-        price: '',
-        totalPrice: '',
-        sellPrice: '',
-        minSellPrice: '',
-        // locationInventoryList: [], // 库房列表
-        unitList: {}, // 单位列表
-        isEditing: true, // 标记当前行是否正在编辑
-        error: false, // 新增 error 字段
-        isSave: false, // 当前行是否保存
-      };
-      form.purchaseinventoryList.push(newRow);
-      data.isAdding = true; // 设置标志位为 true，表示有未保存的
+      // 检查表格中是否有未保存的行
+      const unsavedRows = form.purchaseinventoryList.filter((row) => !row.isSave);
+
+      if (unsavedRows.length > 0) {
+        // 校验表格中未保存的行
+        proxy.$refs['formRef'].validate((tableValid) => {
+          if (!tableValid) {
+            proxy.$message.warning('请先完善当前行的必填信息后再添加新行');
+            return;
+          }
+
+          // 手动检查未保存行的必填字段
+          const invalidRows = [];
+          unsavedRows.forEach((row, index) => {
+            const rowIndex = form.purchaseinventoryList.indexOf(row);
+            const errors = [];
+
+            // 检查必填字段
+            if (!row.itemId || !row.name) {
+              errors.push('项目');
+            }
+            if (!row.volume) {
+              errors.push('规格');
+            }
+            if (!row.unitCode) {
+              errors.push('计量单位');
+            }
+            if (!row.purposeLocationId) {
+              errors.push('仓库');
+            }
+            if (!row.itemQuantity || row.itemQuantity === '' || row.itemQuantity === 0) {
+              errors.push('采购数量');
+            }
+            if (!row.lotNumber) {
+              errors.push('产品批号');
+            }
+            if (!row.startTime) {
+              errors.push('生产日期');
+            }
+            if (!row.endTime) {
+              errors.push('有效期至');
+            }
+            if (!row.price || row.price === '' || row.price === 0) {
+              errors.push('采购单价');
+            }
+            if (!row.invoiceNo || row.invoiceNo === '') {
+              errors.push('发票号');
+            }
+            if (!row.totalPrice || row.totalPrice === '' || row.totalPrice === 0) {
+              errors.push('合计金额');
+            }
+
+            if (errors.length > 0) {
+              invalidRows.push({
+                rowIndex: rowIndex + 1,
+                errors: errors.join('、'),
+              });
+            }
+          });
+
+          if (invalidRows.length > 0) {
+            const errorMsg = invalidRows
+              .map((item) => `第${item.rowIndex}行缺少：${item.errors}`)
+              .join('；');
+            proxy.$message.warning(errorMsg + '，请完善后再添加新行');
+            return;
+          }
+
+          // 所有校验通过，允许新增
+          const newRow = {
+            rowKey: Date.now(),
+            id: '',
+            itemTable: '',
+            itemQuantity: '',
+            itemId: '',
+            unitCode: '',
+            remake: '',
+            supplierId: '',
+            purposeTypeEnum: '',
+            purposeLocationId: null,
+            purposeLocationStoreId: null,
+            practitionerId: '',
+            traceNo: '',
+            invoiceNo: '-',
+            startTime: '',
+            endTime: '',
+            price: '',
+            totalPrice: '',
+            sellPrice: '',
+            minSellPrice: '',
+            unitList: {}, // 单位列表
+            isEditing: true, // 标记当前行是否正在编辑
+            error: false, // 新增 error 字段
+            isSave: false, // 当前行是否保存
+          };
+          form.purchaseinventoryList.push(newRow);
+          data.isAdding = true; // 设置标志位为 true，表示有未保存的
+        });
+      } else {
+        // 没有未保存的行，直接新增
+        const newRow = {
+          rowKey: Date.now(),
+          id: '',
+          itemTable: '',
+          itemQuantity: '',
+          itemId: '',
+          unitCode: '',
+          remake: '',
+          supplierId: '',
+          purposeTypeEnum: '',
+          purposeLocationId: null,
+          purposeLocationStoreId: null,
+          practitionerId: '',
+          traceNo: '',
+          invoiceNo: '-',
+          startTime: '',
+          endTime: '',
+          price: '',
+          totalPrice: '',
+          sellPrice: '',
+          minSellPrice: '',
+          unitList: {}, // 单位列表
+          isEditing: true, // 标记当前行是否正在编辑
+          error: false, // 新增 error 字段
+          isSave: false, // 当前行是否保存
+        };
+        form.purchaseinventoryList.push(newRow);
+        data.isAdding = true; // 设置标志位为 true，表示有未保存的
+      }
     }
   });
 }
@@ -899,36 +978,9 @@ function handleBlur(row, index) {
   row.supplierId = receiptHeaderForm.supplierId;
   row.purposeTypeEnum = receiptHeaderForm.purposeTypeEnum;
 }
-const handleMouseEnter = (row, column, cell, event) => {
-  // console.log('鼠标移入行', row);
-};
+const handleMouseEnter = (row, column, cell, event) => {};
 
-const handleMouseLeave = (row, column, cell, event) => {
-  // handleBlur(row)
-  // if(row.id){ // 编辑
-  //   let rows = JSON.parse(JSON.stringify(saveRowObject.value))
-  //   delete rows.unitList
-  //   let rowss= JSON.parse(JSON.stringify(row))
-  //   delete rowss.unitList
-  //   let purchaseinventoryIndex = form.purchaseinventoryList.findIndex(k=>k.id==row.id)
-  //   if(!areObjectsEqual(rowss,rows)){
-  //     handleSave(rowss,purchaseinventoryIndex)
-  //   }
-  // }else{
-  //   let rows = JSON.parse(JSON.stringify(saveRowObject.value))
-  //   delete rows.unitList
-  //   let rowss= JSON.parse(JSON.stringify(row))
-  //   delete rowss.unitList
-  //   console.log(form.purchaseinventoryList.length,form.purchaseinventoryList,"211111111")
-  //   if(form.purchaseinventoryList.length==1){
-  //     handleSave(row,0)
-  //   }else if(form.purchaseinventoryList.length>1&&saveRowObject.value){
-  //     if(!areObjectsEqual(rowss,rows)){
-  //       handleSave(rowss,form.purchaseinventoryList.length-1)
-  //     }
-  //   }
-  // }
-};
+const handleMouseLeave = (row, column, cell, event) => {};
 
 // 点击行时记录当前行
 function handleRowClick(row) {
@@ -942,66 +994,9 @@ function handleRowClick(row) {
   } else {
     currentIndex.value = form.purchaseinventoryList.length - 1;
   }
-  // handleBlur(row);
-  // if (row.id) {
-  //   // 编辑
-  //   let purchaseinventoryIndex = form.purchaseinventoryList.findIndex((k) => k.id == row.id);
-  //   let rows = JSON.parse(JSON.stringify(forms.purchaseinventoryList[purchaseinventoryIndex]));
-  //   delete rows.unitList;
-  //   let rowss = JSON.parse(JSON.stringify(row));
-  //   delete rowss.unitList;
 
-  //   console.log(
-  //     purchaseinventoryIndex,
-  //     '编辑',
-  //     forms.purchaseinventoryList[purchaseinventoryIndex],
-  //     rowss,
-  //     rows
-  //   );
-  //   if (!areObjectsEqual(rowss, rows)) {
-  //     handleSave(rowss, purchaseinventoryIndex);
-  //   }
-  // } else {
-  //   let rows = JSON.parse(JSON.stringify(saveRowObject.value));
-  //   delete rows.unitList;
-  //   let rowss = JSON.parse(JSON.stringify(row));
-  //   delete rowss.unitList;
-
-  //   console.log(form.purchaseinventoryList.length, form.purchaseinventoryList, '211111111');
-  //   if (form.purchaseinventoryList.length == 1) {
-  //     handleSave(row, 0);
-  //   } else if (form.purchaseinventoryList.length > 1 && saveRowObject.value) {
-  //     if (!areObjectsEqual(rowss, rows)) {
-  //       handleSave(rowss, form.purchaseinventoryList.length - 1);
-  //     }
-  //   }
-  // }
   currentRow.value = row;
 }
-function areObjectsEqual(obj1, obj2) {
-  const keys1 = Object.keys(obj1);
-  const keys2 = Object.keys(obj2);
-  if (keys1.length !== keys2.length) {
-    return false;
-  }
-  for (let key of keys1) {
-    if (obj1[key] !== obj2[key]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-// 监听表格外的点击事件
-// function handleClickOutside(event) {
-//   if (tableRef.value && !tableRef.value.$el.contains(event.target)) {
-//     if (currentRow.value) {
-//       // handleSave(currentRow.value);
-//       currentRow.value = null; // 清空当前行
-//     }
-//   }
-// }
-
 function saveRow(row, index) {
   form.purchaseinventoryList[index] = row;
   addPurchaseinventory(row).then((response) => {
@@ -1060,12 +1055,12 @@ function selectRow(rowValue, index) {
   form.purchaseinventoryList[index].volume = rowValue.volume;
   form.purchaseinventoryList[index].minUnitCode = rowValue.minUnitCode;
   form.purchaseinventoryList[index].unitCode = rowValue.unitCode;
-  form.purchaseinventoryList[index].manufacturer = rowValue.manufacturer;
+  form.purchaseinventoryList[index].manufacturerText = rowValue.manufacturerText;
   form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
+  form.purchaseinventoryList[index].invoiceNo = '-';
   form.purchaseinventoryList[index].price = (rowValue.purchaseAmount || 0).toFixed(2);
   price.value = (rowValue.purchaseAmount || 0).toFixed(2);
   form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
-  // form.purchaseinventoryList[index].locationInventoryList = locationList.value;
   unitMap.value['unitCode'] = rowValue.unitCode;
   unitMap.value['minUnitCode'] = rowValue.minUnitCode;
   unitMap.value['currentCode'] = rowValue.unitCode;
@@ -1092,9 +1087,7 @@ function handleLocationClick(item, row, index) {
           row.unitList.unitCode_dictText,
           row.unitList.minUnitCode_dictText
         ) || 0;
-      // form.purchaseinventoryList[index].price = (res.data[0].price || 0).toFixed(2);
-      // price.value = (res.data[0].price || 0).toFixed(2);
-      // form.purchaseinventoryList[index].traceNo = res.data[0].traceNo || '';
+
       form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
       form.purchaseinventoryList[index].startTime = formatDateymd(res.data[0].productionDate) || '';
       form.purchaseinventoryList[index].endTime = formatDateymd(res.data[0].expirationDate) || '';
@@ -1106,10 +1099,6 @@ function handleLocationClick(item, row, index) {
         : '';
     }
   });
-  // form.purchaseinventoryList[index].purposeLocationStoreId =
-  //   item.locationStoreId;
-  // form.purchaseinventoryList[index].locationStoreName = item.locationStoreName;
-  //
 }
 
 // 处理总数量不整时显示的情况,例 10盒2片
@@ -1234,21 +1223,13 @@ function handleUnitCodeChange(row, index, value) {
     unitMap.value['unitCode'] != value &&
     unitMap.value['currentCode'] == unitMap.value['unitCode']
   ) {
-    console.log(1212121, row, index, value);
     // 总库存数
     form.purchaseinventoryList[index].quantity = totalQuantity;
-    // // 采购数量
-    // form.purchaseinventoryList[index].itemQuantity =
-    //   form.purchaseinventoryList[index].itemQuantity * row.partPercent || 0;
-    // // 采购单价
-    // form.purchaseinventoryList[index].price = (price.value / row.partPercent).toFixed(4);
+
     // 采购数量
     form.purchaseinventoryList[index].itemQuantity = undefined;
-    // 采购单价
-    // form.purchaseinventoryList[index].price = undefined;
   } else {
     //大单位
-    console.log(12121212, row, index, value);
     form.purchaseinventoryList[index].quantity =
       handleTotalQuantity(
         totalQuantity,
@@ -1256,11 +1237,8 @@ function handleUnitCodeChange(row, index, value) {
         row.unitList.unitCode_dictText,
         row.unitList.minUnitCode_dictText
       ) || 0;
-    // form.purchaseinventoryList[index].itemQuantity =
-    //   form.purchaseinventoryList[index].itemQuantity / row.partPercent || 0;
-    // form.purchaseinventoryList[index].price = price.value;
+
     form.purchaseinventoryList[index].itemQuantity = undefined;
-    // form.purchaseinventoryList[index].price = undefined;
   }
   form.purchaseinventoryList[index].totalPrice = undefined;
   unitMap.value['currentCode'] = value;
@@ -1323,74 +1301,22 @@ function handleSave(row, index) {
 }
 function addPurchaseinventorys(rowList) {
   addPurchaseinventory(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) => {
-        console.log(row, 'res.data');
         form.purchaseinventoryList[index].id = res.data[index];
         form.purchaseinventoryList[index].isSave = true;
       });
-      // forms.purchaseinventoryList[index] = JSON.parse(
-      //   JSON.stringify(form.purchaseinventoryList[index])
-      // );
-      // currentEditRow.value = {};
-      // currentIndex.value = -1;
-      // saveRowObject.value = JSON.parse(JSON.stringify(row));
-      console.log(saveRowObject.value, '!@121211');
     }
   });
 }
 
 function handleTraceNoInput(value, row) {
   row.traceNo = value.concat(',');
-  // row.traceNo = row.traceNo.startsWith(',') ? row.traceNo.substring(1) : row.traceNo;
 }
 
-// function handleSave(row, index) {
-//   handleBlur(row);
-//   proxy.$refs['receiptHeaderRef'].validate((valid) => {
-//     if (valid) {
-//       proxy.$refs['formRef'].validate((valid) => {
-//         if (valid) {
-//           if (row.itemQuantity == 0) {
-//             proxy.$message.warning('采购数量不能为0！');
-//             return;
-//           }
-//           addPurchaseinventory(row).then((res) => {
-//             // 当前行没有id视为首次新增
-//             if (!row.id) {
-//               data.isAdding = false; // 允许新增下一行
-//             }
-//             if (res.data) {
-//               proxy.$message.success('保存成功！');
-//               form.purchaseinventoryList[index].id = res.data;
-//               form.purchaseinventoryList[index].isSave = true;
-//               // form.purchaseinventoryList[index].isEditing = false;
-//               forms.purchaseinventoryList[index] = JSON.parse(
-//                 JSON.stringify(form.purchaseinventoryList[index])
-//               );
-//               currentEditRow.value = {};
-//               currentIndex.value = -1;
-//               saveRowObject.value = JSON.parse(JSON.stringify(row));
-//               // saveRowObject.value = JSON.parse(JSON.stringify(form.purchaseinventoryList[index]))
-//               console.log(saveRowObject.value, '!@121211');
-//             }
-//           });
-//         }
-//       });
-//     }
-//   });
-//   // 保存逻辑...
-// }
-
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  console.log(selection, 'selection');
-  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
   ids.value = selection.map((item) => item.id);
   selectedRows.value = selection;
   single.value = selection.length != 1;
@@ -1442,148 +1368,15 @@ function handlePrintPreview() {
   const simpleData = {
     supplierName: supplierName || '',
     totalAmount: totalAmount.toFixed(2),
-    receiptNumber: receiptHeaderForm.receiptNumber || '',
-    receiptDate: receiptHeaderForm.receiptDate || '',
-    organizationName: receiptHeaderForm.organizationName || '',
-    // 重新添加药品清单数组，但确保格式安全
-    purchaseinventoryList: Array.isArray(form.purchaseinventoryList) ? form.purchaseinventoryList.map(item => ({
-      id: item.id || '',
-      name: item.name || '',
-      itemQuantity: item.itemQuantity || 0,
-      price: item.price || 0,
-      totalPrice: item.totalPrice || 0,
-      // 保留其他可能需要的字段
-      ...item
-    })) : []
-  };
-  
-  console.log('简化后的预览数据:', simpleData);
-  
-  try {
-    // 直接使用templateJson创建打印
-    // 避免复杂的模板创建和数据处理逻辑
-    setTimeout(() => {
-      try {
-        // 最简单的方式使用hiprint - 直接调用print2方法
-        // 只传递必要的数据，不传递复杂嵌套的数组
-        const printOptions = {
-          preview: true,
-          title: '药品采购入库清单',
-          printer: ''
-        };
-        
-        // 方法1: 尝试直接使用templateJson
-        console.log('尝试直接使用templateJson');
-        if (typeof hiprint.template !== 'undefined' && typeof hiprint.template.print === 'function') {
-          hiprint.template.print(templateJson, simpleData, printOptions);
-        }
-        // 方法2: 尝试创建简单模板
-        else if (typeof hiprint.PrintTemplate === 'function') {
-          console.log('尝试使用PrintTemplate');
-          const template = new hiprint.PrintTemplate({template: templateJson});
-          template.print(simpleData, printOptions);
-        }
-        // 方法3: 最直接的方式
-        else {
-          console.log('尝试最直接的打印方式');
-          hiprint.print(templateJson, simpleData, printOptions);
-        }
-        
-        ElMessage.success('正在生成单据预览，请等待...');
-      } catch (e) {
-        console.error('预览执行失败:', e);
-        ElMessage.error('预览功能执行失败，请稍后重试');
-      }
-    }, 50);
-  } catch (error) {
-    console.error('预览准备失败:', error);
-    ElMessage.error('预览失败，请检查配置');
-  }
-}
-
-// 打印单据函数 - 简化实现，与预览函数保持一致
-function handlePrint() {
-  // 检查是否存在数据
-  if (!form.purchaseinventoryList || form.purchaseinventoryList.length === 0) {
-    ElMessage.warning('没有数据可打印');
-    return;
-  }
-  
-  // 检查是否所有必填字段都已填写
-  const hasEmptyFields = form.purchaseinventoryList.some(row => {
-    return !row.name || !row.itemQuantity || !row.price || !row.totalPrice;
+    ...receiptHeaderForm,
+    purchaseinventoryList: form.purchaseinventoryList,
   });
-  
-  if (hasEmptyFields) {
-    ElMessage.warning('请确保所有药品信息完整后再打印');
-    return;
-  }
-  
-  // 安全获取供应商名称
-  let supplierName = '';
-  if (supplierListOptions.value && receiptHeaderForm.supplierId) {
-    const filteredSuppliers = supplierListOptions.value.filter((item) => {
-      return item.value == receiptHeaderForm.supplierId;
-    });
-    supplierName = filteredSuppliers.length > 0 ? filteredSuppliers[0].label : '';
-  }
-  
-  // 计算总金额
-  const totalAmount = form.purchaseinventoryList.reduce((accumulator, currentRow) => {
-    return accumulator + (Number(currentRow.totalPrice) || 0);
-  }, 0);
-  
-  // 重新构建包含药品清单的数据结构
-  const simpleData = {
-    supplierName: supplierName || '',
-    totalAmount: totalAmount.toFixed(2),
-    receiptNumber: receiptHeaderForm.receiptNumber || '',
-    receiptDate: receiptHeaderForm.receiptDate || '',
-    organizationName: receiptHeaderForm.organizationName || '',
-    // 重新添加药品清单数组，但确保格式安全
-    purchaseinventoryList: Array.isArray(form.purchaseinventoryList) ? form.purchaseinventoryList.map(item => ({
-      id: item.id || '',
-      name: item.name || '',
-      itemQuantity: item.itemQuantity || 0,
-      price: item.price || 0,
-      totalPrice: item.totalPrice || 0,
-      // 保留其他可能需要的字段
-      ...item
-    })) : []
-  };
-  
-  try {
-    // 使用与预览函数相同的简化打印逻辑
-    setTimeout(() => {
-      try {
-        const printOptions = {
-          preview: false, // 直接打印模式
-          title: '药品采购入库清单',
-          printer: ''
-        };
-        
-        // 尝试多种可能的API调用方式
-        if (typeof hiprint.template !== 'undefined' && typeof hiprint.template.print === 'function') {
-          hiprint.template.print(templateJson, simpleData, printOptions);
-        }
-        else if (typeof hiprint.PrintTemplate === 'function') {
-          const template = new hiprint.PrintTemplate({template: templateJson});
-          template.print(simpleData, printOptions);
-        }
-        else {
-          hiprint.print(templateJson, simpleData, printOptions);
-        }
-        
-        ElMessage.success('打印请求已发送');
-      } catch (e) {
-        console.error('打印执行失败:', e);
-        ElMessage.error('打印执行失败，请稍后重试');
-      }
-    }, 50);
-  } catch (error) {
-    console.error('打印失败:', error);
-    ElMessage.error('打印失败，请检查配置');
-  }
+  const printElements = templateJson;
+  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+  hiprintTemplate.print2(result, {
+    printer: 'EPSON LQ-80KFII',
+    title: '打印标题',
+  }); //开始打印
 }
 
 function deleteSelectedRows() {
@@ -1651,47 +1444,20 @@ function show() {
       receiptHeaderForm.busNo = res.data.busNo;
     }  
   });
-  // supplierListOptions.value = props.supplierListOptions;
-  // itemTypeOptions.value = props.itemTypeOptions;
-  // practitionerListOptions.value = props.practitionerListOptions;
-  // receiptHeaderForm.busNo = props.busNoAdd;
-  // console.log(purchase_type.value, "purchase_type.value")
-  // // 设置默认值为字典中的第一个值
-  // if (purchase_type.value.length > 0) {
-  //   form.value.medicationType = purchase_type.value[0].value;
-  // }
 }
 // 显示弹框
 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;
-    // 确保数据存在
-  if (!editData.value.item || editData.value.item.length === 0) {
-    proxy.$message.warning('没有可编辑的数据');
-    return;
-  }
   receiptHeaderForm.value = editData.value.item.length > 0 ? editData.value.item[0] : {};
   receiptHeaderForm.busNo = editData.value.editRow.supplyBusNo;
-  // 修改这里：优先从详情数据中获取供应商ID，如果不存在则从列表数据中获取
-  receiptHeaderForm.supplierId = (editData.value.item[0] && editData.value.item[0].supplierId) || editData.value.editRow.supplierId;
+  receiptHeaderForm.supplierId = editData.value.editRow.supplierId;
+  receiptHeaderForm.supplierName = editData.value.item[0].supplierName;
   receiptHeaderForm.practitionerId = editData.value.editRow.practitionerId;
-  console.log(editData.value.editRow, editData.value, 'editData.value.editRow');
   receiptHeaderForm.occurrenceTime = editData.value.item[0].occurrenceTime
     ? formatDate(editData.value.item[0].occurrenceTime)
     : formatDate(new Date());
-  console.log(editData.value.item[0].occurrenceTime);
-  console.log(
-    editData.value.editRow.purposeTypeEnum,
-    editData.value,
-    'editData.value.editRow.purposeTypeEnum'
-  );
-
   //仓库类型
   receiptHeaderForm.purposeTypeEnum = editData.value.editRow.purposeTypeEnum
     ? editData.value.editRow.purposeTypeEnum.toString()
@@ -1710,13 +1476,8 @@ function edit() {
         ...item,
         name: item.itemName,
         volume: item.totalVolume,
-        manufacturer: item.supplierName,
+        // manufacturerText: item.supplierName,
         quantity: item.totalQuantity,
-        // 确保仓库字段回显
-        purposeLocationId: item.purposeLocationId || editData.value.editRow?.purposeLocationId || null,
-        locationStoreName: item.locationStoreName || '',
-        purposeLocationStoreId: item.purposeLocationStoreId || null,
-        // locationInventoryList: locationList.value,
         startTime: formatDateymd(item.startTime),
         endTime: formatDateymd(item.endTime),
         applyTime: formatDate(item.applyTime),
@@ -1725,8 +1486,6 @@ function edit() {
     });
   }, 100);
 
-  console.log(form.purchaseinventoryList, 'purchaseinventoryList.value');
-  console.log(receiptHeaderForm, 'receiptHeaderForm');
   loading.value = false;
   // 使用 Promise 确保数据加载完成
   Promise.resolve().then(() => {
@@ -1794,23 +1553,7 @@ function handelApply() {
       pageLoading.value = false;
     });
 }
-function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0];
-  if (latestView) {
-    router.push(latestView.fullPath);
-  } else {
-    if (view.name === 'Dashboard') {
-      router.replace({ path: '/redirect' + view.fullPath });
-    } else {
-      router.push('/');
-    }
-  }
-}
-/** 取消按钮 */
-function cancel() {
-  open.value = false;
-  reset();
-}
+
 /** 提交审核 */
 function submitAudit() {
   let length = form.purchaseinventoryList.length;
@@ -1832,29 +1575,6 @@ function submitAudit() {
     });
   }
 }
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset();
-  form.value = JSON.parse(JSON.stringify(row));
-  form.value.fwTypeCode = form.value.typeCode;
-  open.value = true;
-  title.value = '编辑';
-}
-
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const delId = row.id || ids.value;
-  data.isAdding = false;
-  proxy.$modal
-    .confirm('是否确认删除以上数据?')
-    .then(function () {
-      return delPurchaseinventory({ ids: delId.join(',') });
-    })
-    .then(() => {
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
-}
 function handleClickOutside() {
   if (
     currentIndex.value != -1 &&
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
index 04e084fc..352e8583 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/index.vue
@@ -17,7 +17,14 @@
         />
       </el-form-item>
       <el-form-item label="审批状态：" prop="statusEnum">
-        <el-select v-model="queryParams.statusEnum" placeholder="" clearable style="width: 150px">
+        <el-select
+          v-model="queryParams.statusEnum"
+          placeholder=""
+          clearable
+          allow-create
+          filterable
+          style="width: 150px"
+        >
           <el-option
             v-for="supplyStatus in supplyStatusOptions"
             :key="supplyStatus.value"
@@ -27,7 +34,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="单据类型：" prop="typeEnum">
-        <el-select v-model="queryParams.typeEnum" placeholder="" clearable style="width: 150px">
+        <el-select
+          v-model="queryParams.typeEnum"
+          placeholder=""
+          clearable
+          filterable
+          style="width: 150px"
+        >
           <el-option
             v-for="item in supplyTypeOptions"
             :key="item.value"
@@ -37,7 +50,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="供应商：" prop="supplierId">
-        <el-select v-model="queryParams.supplierId" placeholder="" clearable style="width: 150px">
+        <el-select
+          v-model="queryParams.supplierId"
+          placeholder=""
+          filterable
+          clearable
+          style="width: 150px"
+        >
           <el-option
             v-for="supplier in supplierListOptions"
             :key="supplier.value"
@@ -51,6 +70,7 @@
           v-model="queryParams.practitionerId"
           placeholder=""
           clearable
+          filterable
           style="width: 150px"
         >
           <el-option
@@ -77,48 +97,23 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:add']" -->
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="openAddInventoryReceiptDialog"
-          
+        <el-button type="primary" plain icon="Plus" @click="openAddInventoryReceiptDialog"
           >添加记录</el-button
         >
       </el-col>
       <el-col :span="1.5">
-         <!-- v-hasPermi="['monitor:job:remove']" -->
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-         
+        <!-- v-hasPermi="['monitor:job:remove']" -->
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           >删除</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-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
       </el-col>
-        <!-- v-hasPermi="['system:user:export']" -->
+      <!-- v-hasPermi="['system:user:export']" -->
       <el-col :span="1.5">
-        <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>
 
@@ -209,12 +204,8 @@
         class-name="small-padding fixed-width"
       >
         <template #default="scope">
-            <!-- v-hasPermi="['system:user:edit']" -->
-          <el-button
-            link
-            type="primary"
-            icon="View"
-            @click.stop="handleUpdate(scope.row,'view')"
+          <!-- v-hasPermi="['system:user:edit']" -->
+          <el-button link type="primary" icon="View" @click.stop="handleUpdate(scope.row, 'view')"
             >详情</el-button
           >
           <el-button
@@ -222,18 +213,20 @@
             type="primary"
             icon="Edit"
             @click.stop="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']" -->
+          <!-- v-hasPermi="['system:user:edit']" -->
           <el-button
-            v-if="scope.row.statusEnum_enumText=='同意'"
+            v-if="scope.row.statusEnum_enumText == '同意'"
             link
             type="primary"
             icon="Edit"
             @click.stop="handleUpdateTK(scope.row)"
-           
             >退库</el-button
           >
           <!-- v-hasPermi="['system:user:remove']" -->
@@ -242,17 +235,15 @@
             type="primary"
             icon="View"
             @click.stop="handleSubmitApproval(scope.row)"
-      
             v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'"
             >提交审批</el-button
           >
-           <!-- v-hasPermi="['system:user:remove']" -->
+          <!-- v-hasPermi="['system:user:remove']" -->
           <el-button
             link
             type="primary"
             icon="View"
             @click.stop="handleWithdrawApproval(scope.row)"
-           
             v-if="scope.row.statusEnum == '2'"
             >撤销审批</el-button
           >
@@ -268,8 +259,8 @@
     />
     <!-- 退货列表 -->
     <el-table
-      v-if="purchaseinventoryReturnList&&purchaseinventoryReturnList.length>0"
-      style="height:190px;margin-top:32px;"
+      v-if="purchaseinventoryReturnList && purchaseinventoryReturnList.length > 0"
+      style="height: 190px; margin-top: 32px"
       v-loading="loadingReturn"
       :data="purchaseinventoryReturnList"
       @selection-change="handleSelectionChangeReturn"
@@ -354,7 +345,7 @@
             link
             type="primary"
             icon="View"
-            @click.stop="handleUpdateReturn(scope.row,'view')"
+            @click.stop="handleUpdateReturn(scope.row, 'view')"
             >详情</el-button
           >
           <el-button
@@ -362,8 +353,11 @@
             type="primary"
             icon="Edit"
             @click.stop="handleUpdateReturn(scope.row)"
-            
-            :disabled="scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'"
+            :disabled="
+              scope.row.statusEnum != '1' &&
+              scope.row.statusEnum != '9' &&
+              scope.row.statusEnum != '4'
+            "
             >编辑</el-button
           >
           <!-- v-hasPermi="['system:user:remove']" -->
@@ -372,17 +366,15 @@
             type="primary"
             icon="View"
             @click.stop="handleSubmitApprovalReturn(scope.row)"
-            
             v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'"
             >提交审批</el-button
           >
-           <!-- v-hasPermi="['system:user:remove']" -->
+          <!-- v-hasPermi="['system:user:remove']" -->
           <el-button
             link
             type="primary"
             icon="View"
             @click.stop="handleWithdrawApprovalReturn(scope.row)"
-           
             v-if="scope.row.statusEnum == '2'"
             >撤销审批</el-button
           >
@@ -414,7 +406,7 @@ import {
   generatedReturnDetail,
   getpurchaseInventoryDetailReturn,
   submitApprovalReturn,
-  withdrawApprovalReturn
+  withdrawApprovalReturn,
 } from './components/purchaseinventory';
 import { useStore } from '@/store/store';
 import inventoryReceiptDialog from './components/inventoryReceiptDialog';
@@ -424,7 +416,7 @@ const router = useRouter();
 const store = useStore();
 const { proxy } = getCurrentInstance();
 const purchaseinventoryRef = ref(null); // 初始化 ref
-const purchaseinventoryReturnList = ref([])
+const purchaseinventoryReturnList = ref([]);
 const purchaseinventoryList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -449,7 +441,7 @@ const editRow = ref({});
 const editRowTK = ref({});
 // 使用 ref 定义当前编辑的采购
 const currentData = ref({});
-const selectedRows = ref([])
+const selectedRows = ref([]);
 // 是否停用
 const statusFlagOptions = ref(undefined);
 
@@ -488,10 +480,10 @@ function getList() {
   // proxy.addDateRange(queryParams.value, dateRange.value)
   getPurchaseinventoryList(queryParams.value).then((res) => {
     loading.value = false;
-    purchaseinventoryList.value = res.data.records
-    purchaseinventoryList.value.map(k=>{
-      k.returnStatus_text =  k.returnStatus==1?'已退库':''
-    })
+    purchaseinventoryList.value = res.data.records;
+    purchaseinventoryList.value.map((k) => {
+      k.returnStatus_text = k.returnStatus == 1 ? '已退库' : '';
+    });
     total.value = res.data.total;
   });
 }
@@ -509,9 +501,9 @@ function handleQuery() {
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  queryParams.value.createTimeSTime = ""
-  queryParams.value.createTimeETime = ""
-  dateRange.value = ""
+  queryParams.value.createTimeSTime = '';
+  queryParams.value.createTimeETime = '';
+  dateRange.value = '';
   proxy.resetForm('queryRef');
   getList();
 }
@@ -530,9 +522,9 @@ function openAddInventoryReceiptDialog() {
 function handleUpdateTK(row) {
   // store.clearCurrentReturnData();
   editRow.value = row;
-    router.push({
+  router.push({
     path: 'returnedPurchase',
-    query:{originalSupplyBusNo:editRow.value.supplyBusNo}
+    query: { originalSupplyBusNo: editRow.value.supplyBusNo },
   });
   // getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
   //   currentData.value = response.data;
@@ -547,22 +539,26 @@ function handleUpdateTK(row) {
   // });
 }
 /** 退库修改按钮操作 */
-function handleUpdateReturn(row,view) {
-  if(view){
-    router.replace({ path: 'returnedPurchase',query:{originalSupplyBusNo:row.supplyBusNo,view:view}})  
-  }else{
+function handleUpdateReturn(row, view) {
+  if (view) {
+    router.replace({
+      path: 'returnedPurchase',
+      query: { originalSupplyBusNo: row.supplyBusNo, view: view },
+    });
+  } else {
     router.push({
-      path: 'returnedPurchase',query:{originalSupplyBusNo:row.originalSupplyBusNo,supplyBusNo:row.supplyBusNo}
+      path: 'returnedPurchase',
+      query: { originalSupplyBusNo: row.originalSupplyBusNo, supplyBusNo: row.supplyBusNo },
     });
   }
-  handleRowClick(editRowTK.value)
+  handleRowClick(editRowTK.value);
 }
 /** 退库提交审核按钮 */
 function handleSubmitApprovalReturn(row) {
   submitApprovalReturn(row.supplyBusNo).then((response) => {
     proxy.$modal.msgSuccess('提交审批成功');
     // open.value = false;
-    handleRowClick(editRowTK.value)
+    handleRowClick(editRowTK.value);
     // loadingReturn.value = false
   });
 }
@@ -577,18 +573,21 @@ function handleWithdrawApprovalReturn(row) {
   });
 }
 /** 退库修改按钮操作 */
-function handleUpdate(row,view) {
-  if(row.typeEnum==5){ //采购退货
+function handleUpdate(row, view) {
+  if (row.typeEnum == 5) {
+    //采购退货
     // editRow.value = row;
     // getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
     //   currentData.value = response.data;
     //   store.setCurrentData({ editRow: row, item: currentData.value });
-      router.push({
-        path:'returnedPurchase',query:{supplyBusNo:row.supplyBusNo}
-      });
-      // getList();
+    router.push({
+      path: 'returnedPurchase',
+      query: { supplyBusNo: row.supplyBusNo },
+    });
+    // getList();
     // })
-  }else{ // 采购入库
+  } else {
+    // 采购入库
     editRow.value = row;
     getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
       currentData.value = response.data;
@@ -596,20 +595,21 @@ function handleUpdate(row,view) {
       //   proxy.$refs['inventoryReceiptRef'].edit();
       // });
       store.setCurrentData({ editRow: row, item: currentData.value });
-      if(view){ // 详情
+      if (view) {
+        // 详情
         router.push({
-          path: 'purchaseDocument',query:{supplyBusNo:row.supplyBusNo,view:view}
+          path: 'purchaseDocument',
+          query: { supplyBusNo: row.supplyBusNo, view: view },
         });
-      }else{
+      } else {
         router.push({
           path: 'purchaseDocument',
         });
       }
-      
+
       getList();
-    })
+    });
   }
-  
 }
 /** 提交审核按钮 */
 function handleSubmitApproval(row) {
@@ -633,7 +633,7 @@ function handleWithdrawApproval(row) {
 function handleSelectionChange(selection) {
   ids.value = selection.map((item) => item.id);
   selectedRows.value = selection;
-  console.log(selectedRows.value,"!21212")
+  console.log(selectedRows.value, '!21212');
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -647,13 +647,13 @@ function handleSelectionChangeReturn(selection) {
 /** 删除按钮操作 */
 function handleDelete(row) {
   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;
     });
-  } 
-  console.log(ids, "ids");
+  }
+  console.log(ids, 'ids');
   proxy.$modal
     .confirm('是否确认删除以上数据?')
     .then(function () {
@@ -667,19 +667,18 @@ function handleDelete(row) {
 }
 //点击列表当前行
 function handleRowClick(row) {
-  editRowTK.value = row
-  console.log(row,"row")
-  if(row.returnStatus==1){
-    loadingReturn.value = true
+  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=>{
+      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
+        k.originalSupplyBusNo = k.originalSupplyBusNo ? k.originalSupplyBusNo : row.supplyBusNo;
+      });
+    });
+    loadingReturn.value = false;
   }
 }
 
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/basicInformationDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/basicInformationDetails.vue
new file mode 100644
index 00000000..92476d75
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/basicInformationDetails.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
+    </el-form>
+    <el-table
+      v-loading="loading"
+      :data="basicInformationDetailsList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="序号"
+        align="center"
+        key="no"
+        prop="no"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="数据上报日期"
+        align="center"
+        key="dataReportingDate"
+        prop="dataReportingDate"
+        width="200"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.occurrenceTime) }}</span>
+        </template>
+      </el-table-column>
+      <!-- itemTable -->
+      <el-table-column
+        label="省级行政区划代码"
+        align="center"
+        key="provinceCodes"
+        prop="provinceCodes"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="组织机构代码"
+        align="center"
+        key="organizationCode"
+        prop="organizationCode"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="医疗机构代码"
+        align="center"
+        key="medicalCode"
+        prop="medicalCode"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="组织机构名称"
+        align="center"
+        key="organizationName"
+        prop="organizationName"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="年度药品总收入(元)"
+        align="center"
+        key="yearMedicineTotalRevenue"
+        prop="yearMedicineTotalRevenue"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="实有床位数"
+        align="center"
+        key="actualBedsNo"
+        prop="actualBedsNo"
+        :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="basicInformationDetails">
+import {
+  getReportBasicInformationDetails,
+} from './statisticalManagent';
+
+const basicInformationDetailsList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const approvalTime = ref([]);
+const supplierListOptions = ref([]);
+const locationIdList = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+function getList() {
+  loading.value = true;
+  getReportBasicInformationDetails(queryParams.value).then((res) => {
+    loading.value = false;
+    basicInformationDetailsList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+getList();
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
index d58de29e..c8d06252 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/chkstockPartDetails.vue
@@ -41,7 +41,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/drugExpensesGrowthRate.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/drugExpensesGrowthRate.vue
new file mode 100644
index 00000000..8a48448a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/drugExpensesGrowthRate.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="150px">
+      <el-form-item label="项目名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="项目名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="医疗机构名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.medinsName"
+          placeholder="医疗机构名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </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-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="drugExpensesGrowthRateList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        key="name"
+        prop="name"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="医疗机构名称"
+        align="center"
+        key="medinsName"
+        prop="medinsName"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="本年度药品支出额（元）"
+        align="center"
+        key="currentYearExpenditure"
+        prop="currentYearExpenditure"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="上一年度药品支出额（元）"
+        align="center"
+        key="lastYearExpenditure"
+        prop="lastYearExpenditure"
+        width="200"
+        :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="drugExpensesGrowthRate">
+import {
+  getDrugExpensesGrowthRate
+} from './statisticalManagent';
+
+const { proxy } = getCurrentInstance();
+const drugExpensesGrowthRateList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined
+  },
+  rules: {},
+});
+
+const { queryParams} = toRefs(data);
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.$download.downloadGet(
+    'report-manage/inbound/excel-out',
+    {
+      ...queryParams.value,
+    },
+    `dict_${new Date().getTime()}.xlsx`
+  );
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getDrugExpensesGrowthRate(queryParams.value).then((res) => {
+    loading.value = false;
+    drugExpensesGrowthRateList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.name = '';
+  queryParams.value.medinsName = '';
+  proxy.resetForm('queryRef');
+  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;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
index 86a6dc4b..ecc0c705 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/earlyWarning.vue
@@ -34,7 +34,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
@@ -203,7 +203,7 @@ import { getExpirationWarning } from './statisticalManagent';
 
 const { proxy } = getCurrentInstance();
 
-const { item_type } = proxy.useDict('item_type');
+const { item_category_code } = proxy.useDict('item_category_code');
 
 const purchaseinventoryList = ref([]);
 const loading = ref(true);
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
index e52bbcc5..a84b5d6b 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
@@ -4,9 +4,9 @@
       <el-form-item label="药品名称：" prop="searchKey">
         <el-input
           v-model="queryParams.searchKey"
-          placeholder="药品编码/药品名称/名称拼音/供应商名"
+          placeholder="药品编码/药品名称/名称拼音"
           clearable
-          style="width: 250px"
+          style="width: 260px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
@@ -35,9 +35,10 @@
           placeholder="请选择药品类别"
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
@@ -50,6 +51,7 @@
           placeholder="请选择药品类别"
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <el-option label="未停供" :value="2" />
           <el-option label="已停供" :value="3" />
@@ -61,6 +63,7 @@
           placeholder="请选择医保等级"
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <el-option
             v-for="chrgitmLv_enumText in chrgitmLv_enumTextOptions"
@@ -70,27 +73,13 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库药房：" prop="locationId">
+      <el-form-item label="库存范围：" prop="zeroFlag">
         <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"
+          v-model="queryParams.zeroFlag"
           placeholder="请选择库存范围"
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <el-option
             v-for="supplyStatus in inventory_range"
@@ -100,40 +89,52 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="医院：" prop="hospital" label-width="100px">
+      <el-form-item label="仓库药房：" prop="locationId">
         <el-select
-          v-model="queryParams.hospital"
-          placeholder=""
+          v-model="locationId"
+          placeholder="请选择仓库药房"
+          multiple
           clearable
-          style="width: 150px"
+          style="width: 260px"
+          @change="handleQuery"
         >
           <el-option
-            v-for="supplyStatus in supplyTypeOptions"
+            v-for="supplyStatus in locationIdList"
             :key="supplyStatus.value"
-            :label="supplyStatus.label"
-            :value="supplyStatus.value"
+            :label="supplyStatus.name"
+            :value="supplyStatus.id"
           />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
+      <el-form-item label="供应商：" prop="supplierId">
+        <el-select
+          v-model="supplierId"
+          placeholder="请选择供应商"
+          multiple
+          clearable
+          style="width: 260px"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="supplyStatus in supplierList"
+            :key="supplyStatus.value"
+            :label="supplyStatus.name"
+            :value="supplyStatus.id"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- 添加记录 -->
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="openAddaddTransferProductDialog"
-          >备份</el-button
-        >
-      </el-col> -->
       <el-col :span="1.5">
         <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-col :span="1.5">
+        <el-button type="danger" plain icon="Download" @click="handleExport"> 导出Excel </el-button>
+      </el-col>
     </el-row>
     <el-table
       v-loading="loading"
@@ -141,17 +142,9 @@
       max-height="600"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column type="index" width="50" align="center" />
+      <el-table-column label="序号" type="index" width="50" align="center" />
       <el-table-column
-        label="药品类别"
-        align="center"
-        key="categoryCode_dictText"
-        prop="categoryCode_dictText"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="药品编码"
+        label="项目编码"
         align="center"
         key="busNo"
         prop="busNo"
@@ -159,13 +152,31 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="药品名称"
+        label="项目名称"
         align="center"
-        key="medicineName"
-        prop="medicineName"
+        key="itemName"
+        prop="itemName"
         width="160"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="项目类别"
+        align="center"
+        key="medCategoryCode_dictText"
+        prop="medCategoryCode_dictText"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>
+            {{
+              scope.row.itemTable == 'adm_device_definition'
+                ? scope.row.devCategoryCode_dictText
+                : scope.row.medCategoryCode_dictText
+            }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="仓库"
         align="center"
@@ -178,15 +189,9 @@
         align="center"
         key="totalVolume"
         prop="totalVolume"
-        width="120"
+        width="150"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="医保等级"
-        align="center"
-        key="chrgitmLv_enumText"
-        prop="chrgitmLv_enumText"
-      />
       <el-table-column
         label="厂家/产地"
         align="center"
@@ -204,34 +209,31 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="库存（采购单位）"
-        align="center"
+        label="库存（包装单位）"
+        align="right"
+        header-align="center"
         key="quantityUnit"
         prop="quantityUnit"
         width="130px"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template #default="scope">
+          <span>{{ formatQuantity(scope.row) }}</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"
+        label="库存（最小单位）"
+        align="right"
+        header-align="center"
         key="quantity"
         prop="quantity"
+        width="130px"
         :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="库存单位"
-        align="center"
-        key="minUnitCode_dictText"
-        prop="minUnitCode_dictText"
-        :show-overflow-tooltip="true"
-      />
+      >
+        <template #default="scope">
+          <span>{{ scope.row.quantity + ' ' + scope.row.minUnitCode_dictText }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="拆零比"
         align="center"
@@ -241,50 +243,54 @@
       />
       <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"
+        align="right"
+        header-align="center"
+        key="purchasePrice"
+        prop="purchasePrice"
         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
-          >
+          <span>{{ scope.row.purchasePrice?.toFixed(2) + ' 元' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="零售价"
+        align="right"
+        header-align="center"
+        key="salePrice"
+        prop="salePrice"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row.salePrice?.toFixed(2) + ' 元' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="进价总额"
+        align="right"
+        header-align="center"
+        key="totalPurchasePrice"
+        prop="totalPurchasePrice"
+        width="100"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row.totalPurchasePrice?.toFixed(2) + ' 元' }}</span>
         </template>
       </el-table-column>
       <el-table-column
         label="零售价总额"
-        align="center"
+        align="right"
+        header-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
-          >
+          <span>{{ scope.row.totalSalePrice?.toFixed(2) + ' 元' }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -293,7 +299,11 @@
         key="doseFormCode_dictText"
         prop="doseFormCode_dictText"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template #default="scope">
+          <span>{{ scope.row.doseFormCode_dictText || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="国药准字"
         align="center"
@@ -301,25 +311,35 @@
         prop="approvalNumber"
         width="165"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template #default="scope">
+          <span>{{ scope.row.approvalNumber || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="供应商"
         align="center"
-        key="supplyName"
-        prop="supplyName"
+        key="supplierName"
+        prop="supplierName"
         width="170"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="医保等级"
+        align="center"
+        key="chrgitmLv_enumText"
+        prop="chrgitmLv_enumText"
+      />
       <el-table-column
         label="生产日期"
         align="center"
         key="productionDate"
         prop="productionDate"
-        width="160"
+        width="120"
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-          <span>{{ parseTime(scope.row.productionDate) }}</span>
+          <span>{{ formatDateStr(scope.row.productionDate, 'YYYY-MM-DD') }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -327,21 +347,13 @@
         align="center"
         key="expirationDate"
         prop="expirationDate"
-        width="160"
+        width="120"
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-          <span>{{ parseTime(scope.row.expirationDate) }}</span>
+          <span>{{ formatDateStr(scope.row.expirationDate, 'YYYY-MM-DD') }}</span>
         </template>
       </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"
@@ -350,21 +362,6 @@
         width="110px"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="药品追溯码"
-        align="center"
-        key="traceNo"
-        prop="traceNo"
-        width="120px"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="药品停用"
-        align="center"
-        key="statusEnum_enumText"
-        prop="statusEnum_enumText"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column
         label="货位"
         align="center"
@@ -372,13 +369,6 @@
         prop="locationStoreName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="仓库类型"
-        align="center"
-        key="formEnum_enumText"
-        prop="formEnum_enumText"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column
         label="停供状态"
         align="center"
@@ -386,22 +376,6 @@
         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"
@@ -429,19 +403,15 @@
             v-if="scope.row.inventoryStatusEnum == 3"
             >取消停供</el-button
           >
-          <el-button
-            link
-            type="primary"
-            icon="Edit"
-            @click="handleOpenPage(scope.row)"
+          <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>
+      <span class="descriptions-item-label"> 进价合计金额：{{ salePriceTotal.toFixed(4) }} </span>
+      <span class="descriptions-item-label"> 零售价合计金额：{{ priceTotal.toFixed(4) }} </span>
     </div>
     <pagination
       v-show="total > 0"
@@ -471,18 +441,25 @@ import {
   getPharmacyCabinetList,
   cancelSupply,
   stopSupply,
-  productPageTotal
+  productPageTotal,
 } from './statisticalManagent';
-import Decimal from 'decimal.js';
 import traceabilityCodeManagement from './traceabilityCodeManagement.vue';
+import { formatDateStr } from '@/utils/index';
+import { getSupplierList } from '@/api/public';
+import { useStore } from '@/store/store';
+const store = useStore();
 
 const { proxy } = getCurrentInstance();
 
-const { item_type, inventory_range } = proxy.useDict('item_type', 'inventory_range');
+const { item_category_code, inventory_range } = proxy.useDict(
+  'item_category_code',
+  'inventory_range'
+);
 
 const purchaseinventoryList = ref([]);
 const visible = ref(false);
 const recordInfo = ref({});
+const route = useRoute();
 
 const loading = ref(true);
 
@@ -496,6 +473,9 @@ const supplyTypeOptions = ref(undefined);
 const supplyStatusOptions = ref(undefined);
 const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
+const supplierList = ref([]);
+const locationId = ref([]);
+const supplierId = ref([]);
 
 const data = reactive({
   form: {},
@@ -507,7 +487,7 @@ const data = reactive({
     // hospital:undefined,
     categoryCode: undefined,
     chrgitmLv: undefined,
-    warehouseScope: undefined,
+    zeroFlag: undefined,
     locationId: undefined,
     // occurrenceTimeSTime:undefined,
     // occurrenceTimeETime:undefined,
@@ -517,19 +497,38 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data);
 
+watch(
+  () => store.remainingDays,
+  (newValue) => {
+    if (newValue) {
+      queryParams.value.remainingDays = newValue;
+      handleQuery(); // 触发查询
+      store.clearRemainingDays(); // 清除值
+    }
+  },
+  { immediate: true } // 修正拼写错误
+);
+
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
     locationIdList.value = response.data;
   });
+  getSupplierList().then((response) => {
+    supplierList.value = response.data;
+  });
   getInit().then((response) => {
     chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions;
   });
 }
 /** 查询调拨管理项目列表 */
 function getList() {
+  console.log(store.remainingDays, '1');
+
   loading.value = true;
   salePriceTotal.value = 0;
   priceTotal.value = 0;
+  queryParams.value.locationIds = locationId.value.join(',');
+  queryParams.value.supplierIds = supplierId.value.join(',');
   getproductReturnPage(queryParams.value).then((res) => {
     loading.value = false;
     purchaseinventoryList.value = res.data.records;
@@ -538,30 +537,14 @@ function getList() {
         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;
   });
   productPageTotal(queryParams.value).then((res) => {
-    salePriceTotal.value = res.data.totalPurchasePrice;
-    priceTotal.value = res.data.totalSalePrice;
-  })
+    salePriceTotal.value = res.data.purchasePriceStatistics;
+    priceTotal.value = res.data.salePriceStatistics;
+  });
 }
 
 /** 搜索按钮操作 */
@@ -578,6 +561,26 @@ function handleQuery() {
   getList();
 }
 
+function formatQuantity(row) {
+  if (row.remainder > 0) {
+    return (
+      row.number + ' ' + row.unitCode_dictText + row.remainder + ' ' + row.minUnitCode_dictText
+    );
+  } else {
+    return row.number + ' ' + row.unitCode_dictText;
+  }
+}
+// 导出
+function handleExport() {
+  proxy.downloadGet(
+    '/inventory-manage/product/excel-out',
+    {
+      ...queryParams.value,
+    },
+    `库存明细记录_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
+  );
+}
+
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
@@ -585,7 +588,7 @@ function handleClear() {
   getList();
 }
 
-function handleOpenPage (row) {
+function handleOpenPage(row) {
   recordInfo.value = row;
   visible.value = true;
 }
@@ -611,14 +614,14 @@ function openAddaddTransferProductDialog() {
 // 取消停供  停供
 function handlestopcancelSupply(row) {
   if (row.inventoryStatusEnum == 2) {
-    stopSupply(row.id).then((response) => {
+    stopSupply(row.inventoryId).then((response) => {
       proxy.$modal.msgSuccess('停供成功');
       open.value = false;
       getList();
     });
   }
   if (row.inventoryStatusEnum == 3) {
-    cancelSupply(row.id).then((response) => {
+    cancelSupply(row.inventoryId).then((response) => {
       proxy.$modal.msgSuccess('取消停供成功');
       open.value = false;
       getList();
@@ -638,4 +641,4 @@ getPharmacyCabinetLists();
   display: flex;
   align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
index eed7145f..fcbfe88f 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/inventoryProductDetails.vue
@@ -51,7 +51,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
@@ -336,10 +336,10 @@ import { watch } from "vue";
 const { proxy } = getCurrentInstance();
 const route = useRoute();
 const {
-  item_type,
+  item_category_code,
   inventory_range,
 } = proxy.useDict(
-  "item_type",
+  "item_category_code",
   "inventory_range",
 );
 
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
index 74c48901..ab1f397a 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/lossReportingDetails.vue
@@ -41,7 +41,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
index 9c6c53ad..f4a4d450 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
@@ -1,23 +1,24 @@
 <template>
   <div outpatientNo="app-container">
     <el-form
-        style="margin-top:20px;margin-left:20px;"
-        :model="queryParams"
-        ref="queryRef"
-        :inline="true"
-        label-width="90px"
+      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="occurrenceTime"
-                type="daterange"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 300px"
-                value-format="YYYY-MM-DD"
-            />
-        </el-form-item>
-        <!-- <el-form-item label="开始时间" prop="startTime">
+      <el-form-item label="发药时间：">
+        <el-date-picker
+          v-model="occurrenceTime"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 300px"
+          value-format="YYYY-MM-DD"
+          @change="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
                 v-model="queryParams.startTime"
                 type="datetime"
@@ -59,30 +60,28 @@
           placeholder=""
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <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="categoryType">
+      <el-form-item label="项目类型：" prop="itemTable">
         <el-select
-          v-model="queryParams.categoryType"
+          v-model="queryParams.itemTable"
           placeholder=""
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
-          <el-option
-            v-for="categoryCode in item_type"
-            :key="categoryCode.value"
-            :label="categoryCode.label"
-            :value="categoryCode.value"
-          />
+          <el-option label="药品" value="med_medication_definition" />
+          <el-option label="耗材" value="adm_device_definition" />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
       <!-- <el-form-item label="病人姓名：" prop="patientName">
         <el-input
           v-model="queryParams.patientName"
@@ -98,6 +97,7 @@
           placeholder=""
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <el-option
             v-for="supplyStatus in practitionerNameOptions"
@@ -146,21 +146,22 @@
           />
         </el-select>
       </el-form-item> -->
-      <el-form-item label="出院状态：" prop="dischargeStatus">
+      <!-- <el-form-item label="出院状态：" prop="dischargeStatus">
         <el-select
           v-model="queryParams.dischargeStatus"
           placeholder=""
           clearable
           style="width: 150px"
+          @change="handleQuery"
         >
           <el-option
-            v-for="supplyStatus in dischargeStatusList" 
+            v-for="supplyStatus in dischargeStatusList"
             :key="supplyStatus.value"
             :label="supplyStatus.label"
             :value="supplyStatus.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="供应商：" prop="supplierId">
         <el-input
           v-model="queryParams.supplierId"
@@ -172,44 +173,37 @@
       </el-form-item> -->
     </el-form>
 
-    <el-row :gutter="10" outpatientNo="mb8" style="margin-left:20px;margin-right:0px;margin-bottom:5px">
+    <el-row
+      :gutter="10"
+      outpatientNo="mb8"
+      style="margin-left: 20px; margin-right: 0px; margin-bottom: 5px"
+    >
       <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-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button type="primary" plain @click="handleExport">导出</el-button>
       </el-col>
     </el-row>
 
     <el-table
-      style="padding:0 20px;width:100%"
+      style="padding: 0 20px; width: 100%"
       v-loading="loading"
       :data="purchaseinventoryList"
       @selection-change="handleSelectionChange"
       :span-method="arraySpanMethod"
-     
     >
-     <!-- :summary-method="getSummaries"
+      <!-- :summary-method="getSummaries"
       show-summary 每页单独合计-->
-      <el-table-column type="selection"  width="60px" align="center" />
+      <el-table-column type="selection" width="60px" align="center" />
       <el-table-column
-        v-if="inventoryScope==1||inventoryScope==3||inventoryScope==5"
+        v-if="inventoryScope == 1 || inventoryScope == 3 || inventoryScope == 5"
         label="发药人"
         align="center"
         key="practitionerName"
@@ -218,7 +212,7 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        v-if="inventoryScope==1||inventoryScope==3||inventoryScope==5"
+        v-if="inventoryScope == 1 || inventoryScope == 3 || inventoryScope == 5"
         label="发药单号"
         align="center"
         key="dispenseNo"
@@ -227,8 +221,8 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        v-if="inventoryScope==2||inventoryScope==4||inventoryScope==6"
-        :label="inventoryScope==2?'门诊号':'住院号'"
+        v-if="inventoryScope == 2 || inventoryScope == 4 || inventoryScope == 6"
+        :label="inventoryScope == 2 ? '门诊号' : '住院号'"
         align="center"
         key="outpatientNo"
         prop="outpatientNo"
@@ -242,7 +236,7 @@
         </template>
       </el-table-column> -->
       <el-table-column
-        v-if="inventoryScope==2||inventoryScope==4||inventoryScope==6"
+        v-if="inventoryScope == 2 || inventoryScope == 4 || inventoryScope == 6"
         label="处方号"
         align="center"
         key="prescriptionNo"
@@ -251,7 +245,7 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        v-if="inventoryScope==2||inventoryScope==4||inventoryScope==6"
+        v-if="inventoryScope == 2 || inventoryScope == 4 || inventoryScope == 6"
         label="病人"
         align="center"
         key="patientName"
@@ -260,7 +254,7 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        v-if="inventoryScope==2||inventoryScope==4||inventoryScope==6"
+        v-if="inventoryScope == 2 || inventoryScope == 4 || inventoryScope == 6"
         label="发药人"
         align="center"
         key="practitionerName"
@@ -268,8 +262,8 @@
         width="90px"
         :show-overflow-tooltip="true"
       />
-    <el-table-column
-        v-if="inventoryScope==2||inventoryScope==4||inventoryScope==6"
+      <el-table-column
+        v-if="inventoryScope == 2 || inventoryScope == 4 || inventoryScope == 6"
         label="发药单号"
         align="center"
         key="dispenseNo"
@@ -285,8 +279,8 @@
         width="160px"
         :show-overflow-tooltip="true"
       />
-       <el-table-column
-        v-if="inventoryScope==1||inventoryScope==3"
+      <el-table-column
+        v-if="inventoryScope == 1 || inventoryScope == 3"
         label="药品编码"
         align="center"
         key="busNo"
@@ -294,7 +288,7 @@
         width="130px"
         :show-overflow-tooltip="true"
       />
-       <!-- <el-table-column
+      <!-- <el-table-column
         v-if="inventoryScope==1||inventoryScope==3"
         label="医保项目"
         align="center"
@@ -304,7 +298,7 @@
         :show-overflow-tooltip="true"
       /> -->
       <el-table-column
-        v-if="inventoryScope==1||inventoryScope==3"
+        v-if="inventoryScope == 1 || inventoryScope == 3"
         label="医保编码"
         align="center"
         key="ybNo"
@@ -317,10 +311,9 @@
         align="center"
         key="totalVolume"
         prop="totalVolume"
-   
         :show-overflow-tooltip="true"
       />
-       <!-- <el-table-column
+      <!-- <el-table-column
         label="零售价"
         align="center"
         key="salePrice"
@@ -361,7 +354,7 @@
         prop="dispensePrice"
         width="100px"
         :show-overflow-tooltip="true"
-      /> 
+      />
       <el-table-column
         label="退药数量"
         align="center"
@@ -391,23 +384,20 @@
         align="center"
         key="manufacturerText"
         prop="manufacturerText"
-      
         :show-overflow-tooltip="true"
-      /> 
+      />
       <el-table-column
         label="供应商"
         align="center"
         key="supplierName"
         prop="supplierName"
-     
         :show-overflow-tooltip="true"
-      /> 
+      />
       <el-table-column
         label="发药时间"
         align="center"
         key="dispenseTime"
         prop="dispenseTime"
-      
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
@@ -430,7 +420,9 @@
         display: flex;
         align-items: center;
         justify-content: flex-start;
-        margin-left:0px;margin-right:0px;padding:0 20px;
+        margin-left: 0px;
+        margin-right: 0px;
+        padding: 0 20px;
       "
     >
       <el-col :span="3">
@@ -459,27 +451,23 @@ import {
   getPharmacyCabinetList,
   getAmbMedicationDetail,
   getAmbPractitionerDetail,
-  getMedicationDetailsInit
-} from "./statisticalManagent";
-import useUserStore from "@/store/modules/user";
-import { watch } from "vue";
-import { endsWith } from "lodash";
+  getMedicationDetailsInit,
+} from './statisticalManagent';
+import useUserStore from '@/store/modules/user';
+import { watch } from 'vue';
+import { endsWith } from 'lodash';
 const userStore = useUserStore();
 
 const route = useRoute();
 const { proxy } = getCurrentInstance();
 const totalAmount = ref(0);
-const {
-  item_type,
-} = proxy.useDict(
-  "item_type",
-);
-const purchaseinventoryListAll = ref([])
-const xiaojiTotal = ref([])
-const rowSpan = ref(1)
-const purposeLocationIdList = ref([])
-const dischargeStatusList = ref([])
-const inventoryOptions = ref([])
+const { item_category_code } = proxy.useDict('item_category_code');
+const purchaseinventoryListAll = ref([]);
+const xiaojiTotal = ref([]);
+const rowSpan = ref(1);
+const purposeLocationIdList = ref([]);
+const dischargeStatusList = ref([]);
+const inventoryOptions = ref([]);
 const purchaseinventoryList = ref([]);
 const loading = ref(true);
 const ids = ref([]);
@@ -487,8 +475,8 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const occurrenceTime = ref([]);
-const practitionerNameOptions = ref([]); 
-const inventoryScope = ref(1)
+const practitionerNameOptions = ref([]);
+const inventoryScope = ref(1);
 const locationIdList = ref([]);
 
 const data = reactive({
@@ -496,15 +484,15 @@ const data = reactive({
   queryParams: {
     pageNo: 1,
     pageSize: 10,
-    searchKey: undefined, 
-    practitionerId: undefined, 
-    // busNo:undefined, 
+    searchKey: undefined,
+    practitionerId: undefined,
+    // busNo:undefined,
     dischargeStatus: undefined,
     // settlementStatus:undefined,
-    locationId:undefined,
-    // patientName: undefined, 
-    dispenseTimeSTime:undefined,
-    dispenseTimeETime:undefined,
+    locationId: undefined,
+    // patientName: undefined,
+    dispenseTimeSTime: undefined,
+    dispenseTimeETime: undefined,
   },
   rules: {},
 });
@@ -513,8 +501,8 @@ const { queryParams, form, rules } = toRefs(data);
 watch(
   () => purchaseinventoryList.value,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-        handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      handleTotalAmount();
     }
   },
   { immediate: true }
@@ -522,7 +510,7 @@ watch(
 watch(
   () => inventoryScope.value,
   (newVlaue) => {
-   inventoryScope.value = newVlaue
+    inventoryScope.value = newVlaue;
   },
   { immediate: true }
 );
@@ -531,7 +519,11 @@ watch(
   () => route.query,
   (newQuery) => {
     // 如果路由中包含指定参数，则使用这些参数进行查询
-    if (newQuery.purposeLocationId || newQuery.occurrenceTimeSTime || newQuery.occurrenceTimeETime) {
+    if (
+      newQuery.purposeLocationId ||
+      newQuery.occurrenceTimeSTime ||
+      newQuery.occurrenceTimeETime
+    ) {
       // 设置查询参数
       if (newQuery.purposeLocationId) {
         queryParams.value.locationId = newQuery.purposeLocationId;
@@ -542,7 +534,7 @@ watch(
       if (newQuery.occurrenceTimeETime) {
         queryParams.value.dispenseTimeETime = newQuery.occurrenceTimeETime + ' 23:59:59';
       }
-      queryParams.value.flag = 1
+      queryParams.value.flag = 1;
       // 执行查询
       getList();
     }
@@ -551,68 +543,92 @@ watch(
 );
 /**计算合计金额 */
 function handleTotalAmount() {
-  totalAmount.value = purchaseinventoryList.value.reduce(
-    (accumulator, currentRow) => {
-      return (accumulator + (Number(currentRow.totalPrice) || 0))
-    },
-    0
-  );
+  totalAmount.value = purchaseinventoryList.value.reduce((accumulator, currentRow) => {
+    return accumulator + (Number(currentRow.totalPrice) || 0);
+  }, 0);
 }
-function getTotals(row,i){
-    let dispensePriceSums = Number(purchaseinventoryList.value[i].dispensePrice)
-    let totalReturnPriceSums = Number(purchaseinventoryList.value[i].refundPrice)
-    for (let j=1; i-j>=0; j++) {
-        if (purchaseinventoryList.value[i].outpatientNo == purchaseinventoryList.value[i-j].outpatientNo) {
-            dispensePriceSums += Number(purchaseinventoryList.value[i-j].dispensePrice)
-            totalReturnPriceSums += Number(purchaseinventoryList.value[i-j].refundPrice)
-        }
-    }  
-    xiaojiTotal.value.push({inde:i+1,outpatientNo:row.outpatientNo,dispensePrice:dispensePriceSums,refundPrice:totalReturnPriceSums})
-    // var dispensePrice2 = 0
-    // var refundPrice2 = 0
-    purchaseinventoryList.value.splice(i+1, 0, {outpatientNo:row.outpatientNo,prescriptionNo:'小计',dispensePrice:dispensePriceSums.toFixed(4)||0,refundPrice:totalReturnPriceSums.toFixed(4)||0})
-    // purchaseinventoryList.value.map(k=>{
-    //     if(k.prescriptionNo!='小计'){
-    //         dispensePrice2 += Number(k.dispensePrice)
-    //         refundPrice2 += Number(k.refundPrice)
-    //     }
-    // })
-    // dispensePrice2 = dispensePrice2?dispensePrice2.toFixed(4):dispensePrice2
-    // refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
-    // purchaseinventoryList.value.push({prescriptionNo:'合计',dispensePrice:dispensePrice2,refundPrice:refundPrice2})
+function getTotals(row, i) {
+  let dispensePriceSums = Number(purchaseinventoryList.value[i].dispensePrice);
+  let totalReturnPriceSums = Number(purchaseinventoryList.value[i].refundPrice);
+  for (let j = 1; i - j >= 0; j++) {
+    if (
+      purchaseinventoryList.value[i].outpatientNo == purchaseinventoryList.value[i - j].outpatientNo
+    ) {
+      dispensePriceSums += Number(purchaseinventoryList.value[i - j].dispensePrice);
+      totalReturnPriceSums += Number(purchaseinventoryList.value[i - j].refundPrice);
+    }
+  }
+  xiaojiTotal.value.push({
+    inde: i + 1,
+    outpatientNo: row.outpatientNo,
+    dispensePrice: dispensePriceSums,
+    refundPrice: totalReturnPriceSums,
+  });
+  // var dispensePrice2 = 0
+  // var refundPrice2 = 0
+  purchaseinventoryList.value.splice(i + 1, 0, {
+    outpatientNo: row.outpatientNo,
+    prescriptionNo: '小计',
+    dispensePrice: dispensePriceSums.toFixed(4) || 0,
+    refundPrice: totalReturnPriceSums.toFixed(4) || 0,
+  });
+  // purchaseinventoryList.value.map(k=>{
+  //     if(k.prescriptionNo!='小计'){
+  //         dispensePrice2 += Number(k.dispensePrice)
+  //         refundPrice2 += Number(k.refundPrice)
+  //     }
+  // })
+  // dispensePrice2 = dispensePrice2?dispensePrice2.toFixed(4):dispensePrice2
+  // refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
+  // purchaseinventoryList.value.push({prescriptionNo:'合计',dispensePrice:dispensePrice2,refundPrice:refundPrice2})
 }
-const arraySpanMethod = ({
-  row,
-  column,
-  rowIndex,
-  columnIndex,
-}) => {
-// 合并一样的列住院号 outpatientNumber属性
-  if (columnIndex === 1&&(inventoryScope.value==2||inventoryScope.value==4||inventoryScope.value==6)) {
-    if (rowIndex === 0 || (rowIndex > 0 && row.outpatientNo !== purchaseinventoryList.value[rowIndex - 1]?.outpatientNo)) {
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+  // 合并一样的列住院号 outpatientNumber属性
+  if (
+    columnIndex === 1 &&
+    (inventoryScope.value == 2 || inventoryScope.value == 4 || inventoryScope.value == 6)
+  ) {
+    if (
+      rowIndex === 0 ||
+      (rowIndex > 0 && row.outpatientNo !== purchaseinventoryList.value[rowIndex - 1]?.outpatientNo)
+    ) {
       let rowspan = 1;
-      let dispensePriceSum = 0
-      let totalReturnPriceSum = 0
+      let dispensePriceSum = 0;
+      let totalReturnPriceSum = 0;
       for (let i = rowIndex + 1; i < purchaseinventoryList.value.length; i++) {
         if (purchaseinventoryList.value[i].outpatientNo === row.outpatientNo) {
           rowspan++;
-          dispensePriceSum += Number(purchaseinventoryList.value[i].dispensePrice)
-          totalReturnPriceSum += Number(purchaseinventoryList.value[i].refundPrice)
-          if(i==purchaseinventoryList.value.length-1){
-            let findIndexTotal = xiaojiTotal.value.findIndex(k=>k.outpatientNo==row.outpatientNo)
-            if(findIndexTotal<0){
-               getTotals(row,i)
+          dispensePriceSum += Number(purchaseinventoryList.value[i].dispensePrice);
+          totalReturnPriceSum += Number(purchaseinventoryList.value[i].refundPrice);
+          if (i == purchaseinventoryList.value.length - 1) {
+            let findIndexTotal = xiaojiTotal.value.findIndex(
+              (k) => k.outpatientNo == row.outpatientNo
+            );
+            if (findIndexTotal < 0) {
+              getTotals(row, i);
             }
           }
         } else {
-            dispensePriceSum += Number(row.dispensePrice)
-            totalReturnPriceSum += Number(row.refundPrice)
-            let findIndexTotal = xiaojiTotal.value.findIndex(k=>k.outpatientNo==row.outpatientNo)
-            if(findIndexTotal<0){
-                xiaojiTotal.value.push({inde:i,outpatientNo:row.outpatientNo,dispensePrice:dispensePriceSum,refundPrice:totalReturnPriceSum})
-                purchaseinventoryList.value.splice(i, 0, {outpatientNo:row.outpatientNo,prescriptionNo:'小计',dispensePrice:dispensePriceSum.toFixed(4)||0,refundPrice:totalReturnPriceSum.toFixed(4)||0})
-            }
-            break;
+          dispensePriceSum += Number(row.dispensePrice);
+          totalReturnPriceSum += Number(row.refundPrice);
+          let findIndexTotal = xiaojiTotal.value.findIndex(
+            (k) => k.outpatientNo == row.outpatientNo
+          );
+          if (findIndexTotal < 0) {
+            xiaojiTotal.value.push({
+              inde: i,
+              outpatientNo: row.outpatientNo,
+              dispensePrice: dispensePriceSum,
+              refundPrice: totalReturnPriceSum,
+            });
+            purchaseinventoryList.value.splice(i, 0, {
+              outpatientNo: row.outpatientNo,
+              prescriptionNo: '小计',
+              dispensePrice: dispensePriceSum.toFixed(4) || 0,
+              refundPrice: totalReturnPriceSum.toFixed(4) || 0,
+            });
+          }
+          break;
         }
       }
       return { rowspan, colspan: 1 };
@@ -620,246 +636,314 @@ const arraySpanMethod = ({
       return { rowspan: 0, colspan: 0 };
     }
   }
-}
+};
 const getSummaries = (param) => {
-  const { columns, data } = param
-  const sums = []
+  const { columns, data } = param;
+  const sums = [];
   columns.forEach((column, index) => {
     if (index === 0) {
-      sums[index] = h('div', { style: { textDecoration: 'underline' } }, [
-        '合计',
-      ])
-      return
+      sums[index] = h('div', { style: { textDecoration: 'underline' } }, ['合计']);
+      return;
     }
-    const values = data.map((item) => (item.prescriptionNo!='小计'&&Number(item[column.property])))
-    if (column.property=='refundPrice'||column.property=='dispensePrice'||column.property=='totalPrice') {
-        // !values.every((value) => Number.isNaN(value))
-        sums[index] = `${values.reduce((prev, curr) => {
-            const value = Number(curr)
-            if (!Number.isNaN(value)) {
-            return (Number(prev) + Number(curr)).toFixed(4) || 0
-            } else {
-            return Number(prev)
-            }
-       }, 0)}`
+    const values = data.map(
+      (item) => item.prescriptionNo != '小计' && Number(item[column.property])
+    );
+    if (
+      column.property == 'refundPrice' ||
+      column.property == 'dispensePrice' ||
+      column.property == 'totalPrice'
+    ) {
+      // !values.every((value) => Number.isNaN(value))
+      sums[index] = `${values.reduce((prev, curr) => {
+        const value = Number(curr);
+        if (!Number.isNaN(value)) {
+          return (Number(prev) + Number(curr)).toFixed(4) || 0;
+        } else {
+          return Number(prev);
+        }
+      }, 0)}`;
     } else {
-      sums[index] = ' '
+      sums[index] = ' ';
     }
-  })
-  return sums
-}
+  });
+  return sums;
+};
 
-function inventoryChange(val){
-    inventoryScope.value = val
-    xiaojiTotal.value = []
-    purchaseinventoryList.value = []
-    getList()
+function inventoryChange(val) {
+  inventoryScope.value = val;
+  xiaojiTotal.value = [];
+  purchaseinventoryList.value = [];
+  getList();
 }
 function getPharmacyCabinetLists() {
   // 统计类型
   inventoryOptions.value = [
-    {value:1,label:'门诊人员发药明细'},
-    {value:2,label:'门诊发药明细流水账'},
-    {value:3,label:'住院人员发药明细账'},
-    {value:4,label:'住院发药明细流水账'},
-    {value:5,label:'住院耗材记账领用明细'},
-    {value:6,label:'住院耗材记账领用流水账'}
-  ]
-//   practitionerNameOptions.value = [{value:' ',label:'全部'},{value:"2",label:'超级管理员'},{value:"1925368521993523202",label:'郭鑫'}]
-  purposeLocationIdList.value = [{value:' ',label:'全部'},{value:1,label:'已结算'},{value:2,label:'未结算'}]
-  dischargeStatusList.value = [{value:' ',label:'全部'},{value:1,label:'已出院'},{value:2,label:'未出院'}]
+    { value: 1, label: '门诊人员发药明细' },
+    { value: 2, label: '门诊发药明细流水账' },
+    { value: 3, label: '住院人员发药明细账' },
+    { value: 4, label: '住院发药明细流水账' },
+    { value: 5, label: '住院耗材记账领用明细' },
+    { value: 6, label: '住院耗材记账领用流水账' },
+  ];
+  //   practitionerNameOptions.value = [{value:' ',label:'全部'},{value:"2",label:'超级管理员'},{value:"1925368521993523202",label:'郭鑫'}]
+  purposeLocationIdList.value = [
+    { value: ' ', label: '全部' },
+    { value: 1, label: '已结算' },
+    { value: 2, label: '未结算' },
+  ];
+  dischargeStatusList.value = [
+    { value: ' ', label: '全部' },
+    { value: 1, label: '已出院' },
+    { value: 2, label: '未出院' },
+  ];
   getPharmacyCabinetList().then((response) => {
-    locationIdList.value = response.data
-  })
+    locationIdList.value = response.data;
+  });
   getMedicationDetailsInit().then((response) => {
-    practitionerNameOptions.value = response.data.practitionerList
-  })
-  
+    practitionerNameOptions.value = response.data.practitionerList;
+  });
 }
 /** 查询调拨管理项目列表 */
-function getList(type) { 
-    if(type){
-      xiaojiTotal.value = []
-      purchaseinventoryList.value = []
-    }
-    loading.value = true;
-    // let queryParamsValues ={...queryParams.value}
-    // delete queryParamsValues.inventoryScope
-    if(inventoryScope.value==1||inventoryScope.value==3||inventoryScope.value==5){
-        var dispensePrice = 0
-        var refundPrice = 0
-        getAmbPractitionerDetail(queryParams.value).then((res) => {
-          purchaseinventoryList.value = res.data.records
-          total.value = res.data.total;
-          loading.value = false;
-          if(purchaseinventoryList.value.length==0){
-            return
-          }
-          purchaseinventoryList.value.map(k=>{
-            k.dispensePrice = k.dispensePrice || '0.00'
-            k.refundPrice = k.refundPrice || '0.00'
-            k.dispenseQuantity = k.dispenseQuantity?(k.dispenseQuantity+k.unitCode_dictText):('0.00'+ k.unitCode_dictText)
-            k.refundQuantity = k.refundQuantity?(k.refundQuantity+k.refundUnitCode_dictText):('0.00'+ k.unitCode_dictText)
-            if(total.value&&total.value<=queryParams.value.pageSize){
-              dispensePrice += Number(k.dispensePrice)
-              refundPrice += Number(k.refundPrice)
+function getList(type) {
+  if (type) {
+    xiaojiTotal.value = [];
+    purchaseinventoryList.value = [];
+  }
+  loading.value = true;
+  // let queryParamsValues ={...queryParams.value}
+  // delete queryParamsValues.inventoryScope
+  if (inventoryScope.value == 1 || inventoryScope.value == 3 || inventoryScope.value == 5) {
+    var dispensePrice = 0;
+    var refundPrice = 0;
+    getAmbPractitionerDetail(queryParams.value).then((res) => {
+      purchaseinventoryList.value = res.data.records;
+      total.value = res.data.total;
+      loading.value = false;
+      if (purchaseinventoryList.value.length == 0) {
+        return;
+      }
+      purchaseinventoryList.value.map((k) => {
+        k.dispensePrice = k.dispensePrice || '0.00';
+        k.refundPrice = k.refundPrice || '0.00';
+        k.dispenseQuantity = k.dispenseQuantity
+          ? k.dispenseQuantity + k.unitCode_dictText
+          : '0.00' + k.unitCode_dictText;
+        k.refundQuantity = k.refundQuantity
+          ? k.refundQuantity + k.refundUnitCode_dictText
+          : '0.00' + k.unitCode_dictText;
+        if (total.value && total.value <= queryParams.value.pageSize) {
+          dispensePrice += Number(k.dispensePrice);
+          refundPrice += Number(k.refundPrice);
+        }
+      });
+      // 1页数据
+      if (total.value && total.value <= queryParams.value.pageSize) {
+        dispensePrice = dispensePrice ? dispensePrice.toFixed(4) : dispensePrice;
+        refundPrice = refundPrice ? refundPrice.toFixed(4) : refundPrice;
+        let pageNoAll = total.value / queryParams.value.pageSize;
+        if (Math.ceil(pageNoAll) == queryParams.value.pageNo) {
+          purchaseinventoryList.value.push({
+            practitionerName: '合计',
+            dispensePrice: dispensePrice,
+            refundPrice: refundPrice,
+          });
+        }
+      }
+      // 带分页数据
+      if (total.value && total.value > queryParams.value.pageSize) {
+        let queryParamsValue = {
+          pageNo: 1,
+          pageSize: total.value,
+        };
+        getAmbPractitionerDetail(queryParamsValue).then((res) => {
+          purchaseinventoryListAll.value = res.data.records || [];
+          if (purchaseinventoryListAll.value.length > 0) {
+            purchaseinventoryListAll.value.map((k) => {
+              k.dispensePrice = k.dispensePrice || '0.00';
+              k.refundPrice = k.refundPrice || '0.00';
+              k.dispenseQuantity = k.dispenseQuantity
+                ? k.dispenseQuantity + k.unitCode_dictText
+                : '0.00' + k.unitCode_dictText;
+              k.refundQuantity = k.refundQuantity
+                ? k.refundQuantity + k.refundUnitCode_dictText
+                : '0.00' + k.unitCode_dictText;
+              dispensePrice += Number(k.dispensePrice);
+              refundPrice += Number(k.refundPrice);
+            });
+            dispensePrice = dispensePrice ? dispensePrice.toFixed(4) : dispensePrice;
+            refundPrice = refundPrice ? refundPrice.toFixed(4) : refundPrice;
+            let pageNoAll = total.value / queryParams.value.pageSize;
+            if (Math.ceil(pageNoAll) == queryParams.value.pageNo) {
+              purchaseinventoryList.value.push({
+                practitionerName: '合计',
+                dispensePrice: dispensePrice,
+                refundPrice: refundPrice,
+              });
             }
-          })
-          // 1页数据
-          if(total.value&&total.value<=queryParams.value.pageSize){
-            dispensePrice = dispensePrice?dispensePrice.toFixed(4):dispensePrice
-            refundPrice = refundPrice?refundPrice.toFixed(4):refundPrice
-            let pageNoAll = total.value / queryParams.value.pageSize
-            if(Math.ceil(pageNoAll)==queryParams.value.pageNo){
-              purchaseinventoryList.value.push({practitionerName:'合计',dispensePrice:dispensePrice,refundPrice:refundPrice})
-            }
-          }
-            // 带分页数据
-          if(total.value&&total.value>queryParams.value.pageSize){
-            let queryParamsValue = {
-              pageNo:1,
-              pageSize:total.value
-            }
-            getAmbPractitionerDetail(queryParamsValue).then((res) => {
-              purchaseinventoryListAll.value = res.data.records||[]
-              if(purchaseinventoryListAll.value.length>0){
-                purchaseinventoryListAll.value.map(k=>{
-                  k.dispensePrice = k.dispensePrice || '0.00'
-                  k.refundPrice = k.refundPrice || '0.00'
-                  k.dispenseQuantity = k.dispenseQuantity?(k.dispenseQuantity+k.unitCode_dictText):('0.00'+ k.unitCode_dictText)
-                  k.refundQuantity = k.refundQuantity?(k.refundQuantity+k.refundUnitCode_dictText):('0.00'+ k.unitCode_dictText)
-                  dispensePrice += Number(k.dispensePrice)
-                  refundPrice += Number(k.refundPrice)
-                })
-                dispensePrice = dispensePrice?dispensePrice.toFixed(4):dispensePrice
-                refundPrice = refundPrice?refundPrice.toFixed(4):refundPrice
-                let pageNoAll = total.value / queryParams.value.pageSize
-                if(Math.ceil(pageNoAll)==queryParams.value.pageNo){
-                  purchaseinventoryList.value.push({practitionerName:'合计',dispensePrice:dispensePrice,refundPrice:refundPrice})
-                }
-              }
-            })
           }
         });
-    }else if(inventoryScope.value==2||inventoryScope.value==4||inventoryScope.value==6){
-        var dispensePrice2 = 0
-        var refundPrice2 = 0
-        getAmbMedicationDetail(queryParams.value).then((res) => {
-            purchaseinventoryList.value = res.data.records
-            total.value = res.data.total;
-            if(purchaseinventoryList.value.length==0){
-              return
-            }
-            purchaseinventoryList.value.map(k=>{
-              k.dispensePrice = k.dispensePrice || '0.00'
-              k.refundPrice = k.refundPrice || '0.00'
-              k.dispenseQuantity = k.dispenseQuantity?(k.dispenseQuantity+k.unitCode_dictText):('0.00'+ k.unitCode_dictText)
-              k.refundQuantity = k.refundQuantity?(k.refundQuantity+k.refundUnitCode_dictText):('0.00'+ k.unitCode_dictText)
-              if(total.value&&total.value<=queryParams.value.pageSize){
-                  dispensePrice2 += Number(k.dispensePrice)
-                  refundPrice2 += Number(k.refundPrice)
+      }
+    });
+  } else if (inventoryScope.value == 2 || inventoryScope.value == 4 || inventoryScope.value == 6) {
+    var dispensePrice2 = 0;
+    var refundPrice2 = 0;
+    getAmbMedicationDetail(queryParams.value).then((res) => {
+      purchaseinventoryList.value = res.data.records;
+      total.value = res.data.total;
+      if (purchaseinventoryList.value.length == 0) {
+        return;
+      }
+      purchaseinventoryList.value.map((k) => {
+        k.dispensePrice = k.dispensePrice || '0.00';
+        k.refundPrice = k.refundPrice || '0.00';
+        k.dispenseQuantity = k.dispenseQuantity
+          ? k.dispenseQuantity + k.unitCode_dictText
+          : '0.00' + k.unitCode_dictText;
+        k.refundQuantity = k.refundQuantity
+          ? k.refundQuantity + k.refundUnitCode_dictText
+          : '0.00' + k.unitCode_dictText;
+        if (total.value && total.value <= queryParams.value.pageSize) {
+          dispensePrice2 += Number(k.dispensePrice);
+          refundPrice2 += Number(k.refundPrice);
+        }
+      });
+      // 1页数据
+      if (total.value && total.value <= queryParams.value.pageSize) {
+        dispensePrice2 = dispensePrice2 ? dispensePrice2.toFixed(4) : dispensePrice2;
+        refundPrice2 = refundPrice2 ? refundPrice2.toFixed(4) : refundPrice2;
+        let pageNoAll = total.value / queryParams.value.pageSize;
+        if (Math.ceil(pageNoAll) == queryParams.value.pageNo) {
+          purchaseinventoryList.value.push({
+            prescriptionNo: '合计',
+            dispensePrice: dispensePrice2,
+            refundPrice: refundPrice2,
+          });
+        }
+      }
+      loading.value = false;
+      // 带分页数据
+      if (total.value && total.value > queryParams.value.pageSize) {
+        let queryParamsValue = {
+          pageNo: 1,
+          pageSize: total.value,
+        };
+        getAmbMedicationDetail(queryParamsValue).then((res) => {
+          purchaseinventoryListAll.value = res.data.records;
+          if (purchaseinventoryListAll.value.length == 0) {
+            return;
+          }
+          purchaseinventoryListAll.value.map((k, index) => {
+            k.dispensePrice = k.dispensePrice || '0.00';
+            k.refundPrice = k.refundPrice || '0.00';
+            k.dispenseQuantity = k.dispenseQuantity
+              ? k.dispenseQuantity + k.unitCode_dictText
+              : '0.00' + k.unitCode_dictText;
+            k.refundQuantity = k.refundQuantity
+              ? k.refundQuantity + k.refundUnitCode_dictText
+              : '0.00' + k.unitCode_dictText;
+            dispensePrice2 += Number(k.dispensePrice);
+            refundPrice2 += Number(k.refundPrice);
+            //处理每页门诊号相同数据分开不在一页的问题start
+            for (let m = 1; m < queryParams.value.pageSize && m < index; m++) {
+              if (
+                queryParams.value.pageNo > 1 &&
+                index == queryParams.value.pageSize * (queryParams.value.pageNo - 1) &&
+                k.outpatientNo == purchaseinventoryListAll.value[index - m]?.outpatientNo
+              ) {
+                purchaseinventoryList.value.unshift(purchaseinventoryListAll.value[index - m]); // 加
+                //修改计算的小计缺少加过来的部分
+                let dispenseNoIndex1 = purchaseinventoryList.value.findIndex(
+                  (o) =>
+                    o.prescriptionNo == '小计' &&
+                    o.outpatientNo == purchaseinventoryListAll.value[index - m].outpatientNo
+                );
+                purchaseinventoryList.value[dispenseNoIndex1].dispensePrice =
+                  Number(purchaseinventoryList.value[dispenseNoIndex1].dispensePrice) +
+                  Number(purchaseinventoryListAll.value[index - m].dispensePrice);
+                purchaseinventoryList.value[dispenseNoIndex1].refundPrice =
+                  Number(purchaseinventoryList.value[dispenseNoIndex1].refundPrice) +
+                  Number(purchaseinventoryListAll.value[index - m].refundPrice);
               }
-            })
-            // 1页数据
-            if(total.value&&total.value<=queryParams.value.pageSize){
-                dispensePrice2 = dispensePrice2?dispensePrice2.toFixed(4):dispensePrice2
-                refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
-                let pageNoAll = total.value / queryParams.value.pageSize
-                if(Math.ceil(pageNoAll)==queryParams.value.pageNo){
-                    purchaseinventoryList.value.push({prescriptionNo:'合计',dispensePrice:dispensePrice2,refundPrice:refundPrice2})
-                }
-            }
-            loading.value = false;
-            // 带分页数据
-            if(total.value&&total.value>queryParams.value.pageSize){
-                let queryParamsValue = {
-                    pageNo:1,
-                    pageSize:total.value
-                }
-                getAmbMedicationDetail(queryParamsValue).then((res) => {
-                    purchaseinventoryListAll.value = res.data.records
-                    if(purchaseinventoryListAll.value.length==0){
-                      return
-                    }
-                    purchaseinventoryListAll.value.map((k,index)=>{
-                      k.dispensePrice = k.dispensePrice || '0.00'
-                      k.refundPrice = k.refundPrice || '0.00'
-                      k.dispenseQuantity = k.dispenseQuantity?(k.dispenseQuantity+k.unitCode_dictText):('0.00'+ k.unitCode_dictText)
-                      k.refundQuantity = k.refundQuantity?(k.refundQuantity+k.refundUnitCode_dictText):('0.00'+ k.unitCode_dictText)
-                      dispensePrice2 += Number(k.dispensePrice)
-                      refundPrice2 += Number(k.refundPrice)
-                      //处理每页门诊号相同数据分开不在一页的问题start
-                      for(let m = 1;m<queryParams.value.pageSize&&m<index;m++){
-                        if (queryParams.value.pageNo>1&&index == (queryParams.value.pageSize*(queryParams.value.pageNo-1))&& 
-                          k.outpatientNo == purchaseinventoryListAll.value[index - m]?.outpatientNo
-                        ) {
-                          purchaseinventoryList.value.unshift(purchaseinventoryListAll.value[index-m]) // 加
-                          //修改计算的小计缺少加过来的部分
-                          let dispenseNoIndex1 = purchaseinventoryList.value.findIndex(o=>o.prescriptionNo=='小计'&&o.outpatientNo==purchaseinventoryListAll.value[index-m].outpatientNo)
-                          purchaseinventoryList.value[dispenseNoIndex1].dispensePrice = Number(purchaseinventoryList.value[dispenseNoIndex1].dispensePrice)+Number(purchaseinventoryListAll.value[index-m].dispensePrice)
-                          purchaseinventoryList.value[dispenseNoIndex1].refundPrice = Number(purchaseinventoryList.value[dispenseNoIndex1].refundPrice)+Number(purchaseinventoryListAll.value[index-m].refundPrice)
-                        } 
 
-                        if ((index+m) == (queryParams.value.pageSize*queryParams.value.pageNo)&& k.outpatientNo == purchaseinventoryListAll.value[index + m]?.outpatientNo) {
-                          let dispenseNoIndex = purchaseinventoryList.value.findIndex(o=>o.dispenseNo==k.dispenseNo)
-                          purchaseinventoryList.value.splice(dispenseNoIndex,1) // 减
-                         
-                          if(purchaseinventoryList.value[dispenseNoIndex-1]&&purchaseinventoryList.value[dispenseNoIndex-1].prescriptionNo=='小计'){
-                            purchaseinventoryList.value.splice(dispenseNoIndex+1,1) // 减掉带小计的
-                          }
-                        } 
-                      }
-                      // end
-                    })
-                    dispensePrice2 = dispensePrice2?dispensePrice2.toFixed(4):dispensePrice2
-                    refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
-                    let pageNoAll = total.value / queryParams.value.pageSize
-                    if(Math.ceil(pageNoAll)==queryParams.value.pageNo){
-                      purchaseinventoryList.value.push({prescriptionNo:'合计',dispensePrice:dispensePrice2,refundPrice:refundPrice2})
-                    }
-                })
+              if (
+                index + m == queryParams.value.pageSize * queryParams.value.pageNo &&
+                k.outpatientNo == purchaseinventoryListAll.value[index + m]?.outpatientNo
+              ) {
+                let dispenseNoIndex = purchaseinventoryList.value.findIndex(
+                  (o) => o.dispenseNo == k.dispenseNo
+                );
+                purchaseinventoryList.value.splice(dispenseNoIndex, 1); // 减
+
+                if (
+                  purchaseinventoryList.value[dispenseNoIndex - 1] &&
+                  purchaseinventoryList.value[dispenseNoIndex - 1].prescriptionNo == '小计'
+                ) {
+                  purchaseinventoryList.value.splice(dispenseNoIndex + 1, 1); // 减掉带小计的
+                }
+              }
             }
+            // end
+          });
+          dispensePrice2 = dispensePrice2 ? dispensePrice2.toFixed(4) : dispensePrice2;
+          refundPrice2 = refundPrice2 ? refundPrice2.toFixed(4) : refundPrice2;
+          let pageNoAll = total.value / queryParams.value.pageSize;
+          if (Math.ceil(pageNoAll) == queryParams.value.pageNo) {
+            purchaseinventoryList.value.push({
+              prescriptionNo: '合计',
+              dispensePrice: dispensePrice2,
+              refundPrice: refundPrice2,
+            });
+          }
         });
-    }else{
-        total.value =0
-        purchaseinventoryList.value = [
-            {outpatientNo:'M2505070009100304',prescriptionNo:'CF2505070009101361',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'依折麦布片',busNo:'yp3065',medicalName:'依折麦布片',ybNo:'XC10AXY097A0010',totalVolume:'10mg*10',salePrice:'63.56',price:'63.56',totalPrice:'63.56',dispenseQuantity:'1盒',dispensePrice:'63.56',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'Y013201',manufacturerText:'杭州默沙东制药有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100304',prescriptionNo:'CF2505070009101362',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100305',prescriptionNo:'CF2505070009101363',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100305',prescriptionNo:'CF2505070009101364',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'依折麦布片',busNo:'yp3065',medicalName:'依折麦布片',ybNo:'XC10AXY097A0010',totalVolume:'10mg*10',salePrice:'63.56',price:'63.56',totalPrice:'63.56',dispenseQuantity:'1盒',dispensePrice:'63.56',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'Y013201',manufacturerText:'杭州默沙东制药有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100305',prescriptionNo:'CF2505070009101365',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100305',prescriptionNo:'CF2505070009101366',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100306',prescriptionNo:'CF2505070009101367',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'依折麦布片',busNo:'yp3065',medicalName:'依折麦布片',ybNo:'XC10AXY097A0010',totalVolume:'10mg*10',salePrice:'63.56',price:'63.56',totalPrice:'63.56',dispenseQuantity:'1盒',dispensePrice:'63.56',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'Y013201',manufacturerText:'杭州默沙东制药有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100306',prescriptionNo:'CF2505070009101368',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100306',prescriptionNo:'CF2505070009101369',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100307',prescriptionNo:'CF2505070009101368',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',dispenseQuantity:'1盒',dispensePrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-            {outpatientNo:'M2505070009100307',prescriptionNo:'CF2505070009101369',dispenseTime:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',medicationName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'2.8',price:'2.8',totalPrice:'2.8',dispenseQuantity:'1盒',dispensePrice:'2.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
-        ]
-        loading.value = false;
-    }
+      }
+    });
+  } else {
+    total.value = 0;
+    loading.value = false;
+  }
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.dispenseTimeSTime =
     occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[0] + " 00:00:00"
-      : "";
+      ? occurrenceTime.value[0] + ' 00:00:00'
+      : '';
   queryParams.value.dispenseTimeETime =
     occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[1] + " 23:59:59"
-      : "";
+      ? occurrenceTime.value[1] + ' 23:59:59'
+      : '';
   queryParams.value.pageNo = 1;
   getList(1);
 }
 
+function handleExport() {
+  queryParams.value.dispenseTimeSTime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[0] + ' 00:00:00'
+      : '';
+  queryParams.value.dispenseTimeETime =
+    occurrenceTime.value && occurrenceTime.value.length == 2
+      ? occurrenceTime.value[1] + ' 23:59:59'
+      : '';
+  queryParams.value.pageNo = 1;
+
+  proxy.downloadGet(
+    '/pharmacy-manage/medication-details/excel-out',
+    {
+      ...queryParams.value,
+    },
+    `发药明细报表_${new Date().getTime()}.xlsx`
+  );
+}
+
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  occurrenceTime.value = ""
-  queryParams.value.dispenseTimeSTime = ""
-  queryParams.value.dispenseTimeETime = ""
-  proxy.resetForm("queryRef");
+  occurrenceTime.value = '';
+  queryParams.value.dispenseTimeSTime = '';
+  queryParams.value.dispenseTimeETime = '';
+  proxy.resetForm('queryRef');
   getList(1);
 }
 
@@ -870,9 +954,8 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
-
 getList();
-getPharmacyCabinetLists()
+getPharmacyCabinetLists();
 </script>
 <style scoped>
 .custom-tree-node {
@@ -880,7 +963,7 @@ getPharmacyCabinetLists()
   align-items: center;
 }
 
-.pagination-container{
-    margin-right: 20px;
+.pagination-container {
+  margin-right: 20px;
 }
 </style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationStockOutDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationStockOutDetails.vue
new file mode 100644
index 00000000..0e2af1bd
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationStockOutDetails.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
+    </el-form>
+    <el-table
+      v-loading="loading"
+      :data="medicationStockOutDetailsList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="医疗机构代码"
+        align="center"
+        key="medicalInstitutionCode"
+        prop="medicalInstitutionCode"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <!-- itemTable -->
+      <el-table-column
+        label="组织机构名称"
+        align="center"
+        key="organizationName"
+        prop="organizationName"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="国家药品编码(YPID)"
+        align="center"
+        key="nationalMedicineCode"
+        prop="nationalMedicineCode"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="院内药品唯一码"
+        align="center"
+        key="busNo"
+        prop="busNo"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="省级药品集中采购平台药品编码"
+        align="center"
+        key="provincialMedicineConcentratedCode"
+        prop="provincialMedicineConcentratedCode"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="产品名称"
+        align="center"
+        key="lotName"
+        prop="lotName"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="出库数量(最小销售包装单位)"
+        align="center"
+        key="quantitySales"
+        prop="quantitySales"
+        :show-overflow-tooltip="true"
+        width="220"
+      />
+      <el-table-column
+        label="出库数量(最小制剂单位)"
+        align="center"
+        key="quantityPreparation"
+        prop="quantityPreparation"
+        :show-overflow-tooltip="true"
+        width="220"
+      />
+    </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="medicationStockOutDetails">
+import {
+  getReportMedicationStockOutDetails,
+} from './statisticalManagent';
+
+
+const medicationStockOutDetailsList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const approvalTime = ref([]);
+const supplierListOptions = ref([]);
+const locationIdList = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+function getList() {
+  loading.value = true;
+  getReportMedicationStockOutDetails(queryParams.value).then((res) => {
+    loading.value = false;
+    medicationStockOutDetailsList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+getList();
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationUsageDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationUsageDetails.vue
new file mode 100644
index 00000000..e1a55bdf
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationUsageDetails.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="app-container">
+    <el-table
+      v-loading="loading"
+      :data="medicationUsageList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="医疗机构代码"
+        align="center"
+        key="orgId"
+        prop="orgId"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="组织机构名称"
+        align="center"
+        key="orgName"
+        prop="orgName"
+         width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="国家药品编码(YPID)"
+        align="center"
+        key="nationalDrugCode"
+        prop="ypCode"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="院内药品唯一码"
+        align="center"
+        key="busNo"
+        prop="busNo"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="省级药品集中采购平台药品编码"
+        align="center"
+        key="provincialDrugCode"
+        prop="provincialDrugCode"
+        width="220"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="产品名称"
+        align="center"
+        key="itemName"
+        prop="itemName"
+         width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="销售总金额(元)"
+        align="center"
+        key="totalSalesPrice"
+        prop="totalSalesPrice"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="销售数量(最小销售包装单位)"
+        align="center"
+        key="packageSalesQuantity"
+        prop="packageSalesQuantity"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="销售数量(最小制剂单位)"
+        align="center"
+        key="dosageSalesQuantity"
+        prop="dosageSalesQuantity"
+        width="200"
+        :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="medicationUsageDetails">
+import {
+  getReportMedicationUsage
+} from './statisticalManagent';
+
+
+const medicationUsageList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const total = ref(0);
+
+const queryParams = ref({
+    pageNo: 1,
+    pageSize: 10,
+});
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getReportMedicationUsage(queryParams.value).then((res) => {
+    loading.value = false;
+    medicationUsageList.value = res.data.records;
+    total.value = res.data.total;
+  })
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  getList();
+});
+
+</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/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/nonWinQtyRatio.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/nonWinQtyRatio.vue
new file mode 100644
index 00000000..0877856c
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/nonWinQtyRatio.vue
@@ -0,0 +1,185 @@
+<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="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-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="nonWinQtyRatinoList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        key="itemName"
+        prop="itemName"
+        :show-overflow-tooltip="true"
+        width="110px"
+      />
+      <el-table-column
+        label="医疗机构名称"
+        align="center"
+        key="orgName"
+        prop="orgName"
+        width="200px"
+        :show-overflow-tooltip="true"
+      />
+      <!-- itemTable -->
+      <el-table-column
+        label="药品通用名"
+        align="center"
+        key="medName"
+        prop="medName"
+        width="140px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="非中选产品采购数量（片袋支）"
+        align="center"
+        key="nonWinQty"
+        prop="nonWinQty"
+        width="250px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="通用名药品采购数量（片袋支）"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        width="250px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="非中选产品采购金额（元）"
+        align="center"
+        key="nonWinAmt"
+        prop="nonWinAmt"
+        width="250px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="通用名药品采购金额（元）"
+        align="center"
+        key="amount"
+        prop="amount"
+        width="250px"
+        :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="nonWinQtyRatio">
+import {
+  getReportNonWinQtyRatio,
+} from './statisticalManagent';
+
+const { proxy } = getCurrentInstance();
+const route = useRoute();
+
+const nonWinQtyRatioList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const approvalTime = ref([]);
+const supplierListOptions = ref([]);
+const locationIdList = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.$download.downloadGet(
+    'report-manage/inbound/excel-out',
+    {
+      ...queryParams.value,
+    },
+    `dict_${new Date().getTime()}.xlsx`
+  );
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getReportNonWinQtyRatio(queryParams.value).then((res) => {
+    loading.value = false;
+    nonWinQtyRatioList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.occurrenceTimeSTime =
+    approvalTime.value && approvalTime.value.length == 2 ? approvalTime.value[0] + ' 00:00:00' : '';
+  queryParams.value.occurrenceTimeETime =
+    approvalTime.value && approvalTime.value.length == 2 ? approvalTime.value[1] + ' 23:59:59' : '';
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.occurrenceTimeSTime = '';
+  queryParams.value.occurrenceTimeETime = '';
+  approvalTime.value = '';
+  proxy.resetForm('queryRef');
+  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;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/offlinePurchaseRatioDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/offlinePurchaseRatioDetails.vue
new file mode 100644
index 00000000..da3b6e89
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/offlinePurchaseRatioDetails.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="app-container">
+    <el-table
+      v-loading="loading"
+      :data="offlinePurchaseRatioList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        key="itemName"
+        prop="itemName"
+         width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="医疗机构名称"
+        align="center"
+        key="orgName"
+        prop="orgName"
+         width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="实际药品采购金额（元）"
+        align="center"
+        key="actualDrugPurchasePrice"
+        prop="actualDrugPurchasePrice"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="平台采购金额（元）"
+        align="center"
+        key="platformPurchasePrice"
+        prop="platformPurchasePrice"
+        width="200"
+        :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="offlinePurchaseRatioDetails">
+import {
+  getReportOfflinePurchaseRatio
+} from './statisticalManagent';
+
+const offlinePurchaseRatioList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const total = ref(0);
+
+const queryParams = ref({
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+});
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getReportOfflinePurchaseRatio(queryParams.value).then((res) => {
+    loading.value = false;
+    offlinePurchaseRatioList.value = res.data.records;
+    total.value = res.data.total;
+  })
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  getList();
+});
+
+</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/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
index 790580ce..5bd27c6d 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue
@@ -1,11 +1,11 @@
 <template>
   <div busNo="app-container">
     <el-form
-        style="margin-top:20px;margin-left:20px;"
-        :model="queryParams"
-        ref="queryRef"
-        :inline="true"
-        label-width="90px"
+      style="margin-top: 20px; margin-left: 20px"
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      label-width="90px"
     >
       <el-form-item label="收费时间：">
         <el-date-picker
@@ -61,12 +61,7 @@
         />
       </el-form-item> -->
       <el-form-item label="科室：" prop="departmentId">
-        <el-select
-          v-model="queryParams.departmentId"
-          placeholder=""
-          clearable
-          style="width: 150px"
-        >
+        <el-select v-model="queryParams.departmentId" placeholder="" clearable style="width: 150px">
           <el-option
             v-for="supplyStatus in getDepartmentOptions"
             :key="supplyStatus.id"
@@ -76,12 +71,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="开单人：" prop="issuerId">
-        <el-select
-          v-model="queryParams.issuerId"
-          placeholder=""
-          clearable
-          style="width: 150px"
-        >
+        <el-select v-model="queryParams.issuerId" placeholder="" clearable style="width: 150px">
           <el-option
             v-for="supplyStatus in issuerOptions"
             :key="supplyStatus.id"
@@ -91,12 +81,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="收费人：" prop="payeeId">
-        <el-select
-          v-model="queryParams.payeeId"
-          placeholder=""
-          clearable
-          style="width: 150px"
-        >
+        <el-select v-model="queryParams.payeeId" placeholder="" clearable style="width: 150px">
           <el-option
             v-for="supplyStatus in payeeOptions"
             :key="supplyStatus.id"
@@ -104,17 +89,12 @@
             :value="supplyStatus.id"
           />
         </el-select>
-      </el-form-item> 
+      </el-form-item>
       <!-- 字典item_type -->
       <el-form-item label="项目类型：" prop="clinicalType">
-        <el-select
-          v-model="queryParams.clinicalType"
-          placeholder=""
-          clearable
-          style="width: 150px"
-        >
+        <el-select v-model="queryParams.clinicalType" placeholder="" clearable style="width: 150px">
           <el-option
-            v-for="supplyStatus in clinicalTypeOptions" 
+            v-for="supplyStatus in clinicalTypeOptions"
             :key="supplyStatus.value"
             :label="supplyStatus.label"
             :value="supplyStatus.value"
@@ -122,7 +102,11 @@
         </el-select>
       </el-form-item>
       <!-- 医保号，门诊号，患者姓名，项目名，项目编码 -->
-      <el-form-item label="医保号/门诊号/患者姓名/项目名/项目编码：" prop="searchKey" label-width="295">
+      <el-form-item
+        label="医保号/门诊号/患者姓名/项目名/项目编码："
+        prop="searchKey"
+        label-width="295"
+      >
         <el-input
           v-model="queryParams.searchKey"
           placeholder="输入医保号/门诊号/患者姓名/项目名称/项目编码后回车查询"
@@ -133,50 +117,34 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" busNo="mb8" style="margin-left:20px;margin-right:0px;margin-bottom:5px">
+    <el-row
+      :gutter="10"
+      busNo="mb8"
+      style="margin-left: 20px; margin-right: 0px; margin-bottom: 5px"
+    >
       <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
-      style="padding:0 20px;width:100%;height:67vh"
+      style="padding: 0 20px; width: 100%; height: 67vh"
       v-loading="loading"
       :data="purchaseinventoryList"
       @selection-change="handleSelectionChange"
       :span-method="arraySpanMethod"
-      border
-      fit
-      :default-sort="{ prop: 'chargeTime', order: 'descending' }"
-      @header-click="handleHeaderClick"
-      show-summary
-      :summary-method="getSummaries"
     >
-    <!-- :span-method="arraySpanMethod" -->
-     <!-- :summary-method="getSummaries"
+      <!-- :span-method="arraySpanMethod" -->
+      <!-- :summary-method="getSummaries"
       show-summary 每页单独合计-->
       <el-table-column type="selection" width="50px" align="center" resizable />
       <el-table-column
-        label='门诊号'
+        label="门诊号"
         align="center"
         key="busNo"
         min-width="150px"
@@ -197,7 +165,6 @@
         align="center"
         key="departmentName"
         prop="departmentName"
-        min-width="120px"
         :show-overflow-tooltip="true"
         resizable
       />
@@ -210,7 +177,7 @@
         :show-overflow-tooltip="true"
         resizable
       />
-       <el-table-column
+      <el-table-column
         label="医保号"
         align="center"
         key="ybCode"
@@ -219,13 +186,12 @@
         :show-overflow-tooltip="true"
         resizable
       />
-      
+
       <el-table-column
         label="药品项目"
         align="center"
         key="clinicalName"
         prop="clinicalName"
-        min-width="180px"
         :show-overflow-tooltip="true"
         resizable
       />
@@ -243,27 +209,23 @@
         align="center"
         key="type_dictText"
         prop="type_dictText"
-        min-width="100px"
         :show-overflow-tooltip="true"
         resizable
       />
-      
+
       <el-table-column
         label="开单人"
         align="center"
         key="issuerName"
         prop="issuerName"
-        min-width="100px"
         :show-overflow-tooltip="true"
         resizable
       />
-       <el-table-column
-      
+      <el-table-column
         label="收费人"
         align="center"
         key="payeeName"
         prop="payeeName"
-        min-width="100px"
         :show-overflow-tooltip="true"
         resizable
       />
@@ -281,7 +243,6 @@
         align="center"
         key="number"
         prop="number"
-        min-width="80px"
         :show-overflow-tooltip="true"
         resizable
       />
@@ -290,7 +251,6 @@
         align="center"
         key="price"
         prop="price"
-        min-width="100px"
         :show-overflow-tooltip="true"
         resizable
       >
@@ -303,25 +263,20 @@
         align="center"
         key="totalPrice"
         prop="totalPrice"
-        min-width="100px"
         :show-overflow-tooltip="true"
-        resizable
-      /> 
+      />
       <el-table-column
         label="医保等级"
         align="center"
         key="chrgitmLv_enumText"
         prop="chrgitmLv_enumText"
-        min-width="100px"
         :show-overflow-tooltip="true"
-        resizable
-      /> 
+      />
       <el-table-column
         label="收费时间"
         align="center"
         key="chargeTime"
         prop="chargeTime"
-        min-width="160px"
         :show-overflow-tooltip="true"
         resizable
       >
@@ -345,7 +300,9 @@
         display: flex;
         align-items: center;
         justify-content: flex-start;
-        margin-left:0px;margin-right:0px;padding:0 20px;
+        margin-left: 0px;
+        margin-right: 0px;
+        padding: 0 20px;
       "
     >
       <el-col :span="3">
@@ -361,29 +318,28 @@ import {
   getAmbPractitionerDetail,
   // getMedicationDetailsInit,
   getDepartmentList,
-  getReportChargeInit
-} from "./statisticalManagent";
-import useUserStore from "@/store/modules/user";
-import { watch } from "vue";
-import { parseTime } from '@/utils/his'; // 导入日期时间处理工具函数
+  getReportChargeInit,
+} from './statisticalManagent';
+import useUserStore from '@/store/modules/user';
+import { watch } from 'vue';
 const userStore = useUserStore();
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const totalAmount = ref(0);
 // const {
-//   item_type,
+//   item_category_code,
 //   hosp_lv
 // } = proxy.useDict(
-//   "item_type",
+//   "item_category_code",
 //   "hosp_lv"
 // );
-const purchaseinventoryListAll = ref([])
-const xiaojiTotal = ref([])
-const rowSpan = ref(1)
-const issuerOptions = ref([])
-const payeeOptions = ref([])
-const inventoryOptions = ref([])
+const purchaseinventoryListAll = ref([]);
+const xiaojiTotal = ref([]);
+const rowSpan = ref(1);
+const issuerOptions = ref([]);
+const payeeOptions = ref([]);
+const inventoryOptions = ref([]);
 const clinicalTypeOptions = ref([]);
 const purchaseinventoryList = ref([]);
 const loading = ref(true);
@@ -392,7 +348,7 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const occurrenceTime = ref([]);
-const getDepartmentOptions = ref([])
+const getDepartmentOptions = ref([]);
 // const queryParams.value.statisticsType = ref(1)
 
 const data = reactive({
@@ -400,18 +356,18 @@ const data = reactive({
   queryParams: {
     pageNo: 1,
     pageSize: 10,
-    statisticsType: 1, 
-    searchKey:undefined,
-    // ybCode: undefined, 
-    // busNo:undefined, 
+    statisticsType: 1,
+    searchKey: undefined,
+    // ybCode: undefined,
+    // busNo:undefined,
     // name: undefined,
-    departmentId:undefined,
-    issuerId:undefined,
-    payeeId: undefined, 
-    clinicalType:undefined,
+    departmentId: undefined,
+    issuerId: undefined,
+    payeeId: undefined,
+    clinicalType: undefined,
     // clinicalName:undefined,
-    chargeTimeSTime:undefined,
-    chargeTimeETime:undefined,
+    chargeTimeSTime: undefined,
+    chargeTimeETime: undefined,
   },
   rules: {},
 });
@@ -420,8 +376,8 @@ const { queryParams, form, rules } = toRefs(data);
 watch(
   () => purchaseinventoryList.value,
   (newVlaue) => {
-    if(newVlaue&&newVlaue.length>0){
-        handleTotalAmount()
+    if (newVlaue && newVlaue.length > 0) {
+      handleTotalAmount();
     }
   },
   { immediate: true }
@@ -429,71 +385,96 @@ watch(
 watch(
   () => queryParams.value.statisticsType,
   (newVlaue) => {
-   queryParams.value.statisticsType = newVlaue
+    queryParams.value.statisticsType = newVlaue;
   },
   { immediate: true }
 );
 /**计算合计金额 */
 function handleTotalAmount() {
-  totalAmount.value = purchaseinventoryList.value.reduce(
-    (accumulator, currentRow) => {
-      return (accumulator + (Number(currentRow.totalPrice) || 0))
-    },
-    0
-  );
+  totalAmount.value = purchaseinventoryList.value.reduce((accumulator, currentRow) => {
+    return accumulator + (Number(currentRow.totalPrice) || 0);
+  }, 0);
 }
-function getTotals(row,i){
-    let totalPriceSums = Number(purchaseinventoryList.value[i].totalPrice)
-    // let totalReturnPriceSums = Number(purchaseinventoryList.value[i].refundPrice)
-    for (let j=1; i-j>=0; j++) {
-      if (purchaseinventoryList.value[i].busNo == purchaseinventoryList.value[i-j].busNo) {
-        totalPriceSums += Number(purchaseinventoryList.value[i-j].totalPrice)
-        // totalReturnPriceSums += Number(purchaseinventoryList.value[i-j].refundPrice)
-      }
-    }  
-    xiaojiTotal.value.push({inde:i+1,busNo:row.busNo,genderEnum_enumText:row.genderEnum_enumText,totalPrice:totalPriceSums.toFixed(2)||0.00})
-    // var totalPrice2 = 0
-    // var refundPrice2 = 0
-    purchaseinventoryList.value.splice(i+1, 0, {busNo:row.busNo,genderEnum_enumText:row.genderEnum_enumText,departmentName:'小计',totalPrice:totalPriceSums.toFixed(2)||0.00})
-    // purchaseinventoryList.value.map(k=>{
-    //     if(k.departmentName!='小计'){
-    //         totalPrice2 += Number(k.totalPrice)
-    //         refundPrice2 += Number(k.refundPrice)
-    //     }
-    // })
-    // totalPrice2 = totalPrice2?totalPrice2.toFixed(4):totalPrice2
-    // refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
-    // purchaseinventoryList.value.push({departmentName:'合计',totalPrice:totalPrice2,refundPrice:refundPrice2})
-}
-// 行合并方法 - 简化实现，避免在合并过程中修改数组
-const arraySpanMethod = ({row, column, rowIndex, columnIndex}) => {
-  // 跳过小计行和合计行的合并处理
-  if (row.departmentName === '小计' || row.departmentName === '合计') {
-    return { rowspan: 1, colspan: 1 };
-  }
-  
-  // 只合并门诊号列(索引1)
-  if (columnIndex === 1) {
-    // 查找当前门诊号的起始位置
-    let startIndex = rowIndex;
-    while (startIndex > 0) {
-      const prevRow = purchaseinventoryList.value[startIndex - 1];
-      // 如果前一行是小计行或者门诊号不同，当前行就是起始行
-      if (prevRow.departmentName === '小计' || prevRow.busNo !== row.busNo) {
-        break;
-      }
-      startIndex--;
+function getTotals(row, i) {
+  let totalPriceSums = Number(purchaseinventoryList.value[i].totalPrice);
+  // let totalReturnPriceSums = Number(purchaseinventoryList.value[i].refundPrice)
+  for (let j = 1; i - j >= 0; j++) {
+    if (purchaseinventoryList.value[i].busNo == purchaseinventoryList.value[i - j].busNo) {
+      totalPriceSums += Number(purchaseinventoryList.value[i - j].totalPrice);
+      // totalReturnPriceSums += Number(purchaseinventoryList.value[i-j].refundPrice)
     }
-    
-    // 如果当前行是门诊号的起始行
-    if (startIndex === rowIndex) {
+  }
+  xiaojiTotal.value.push({
+    inde: i + 1,
+    busNo: row.busNo,
+    genderEnum_enumText: row.genderEnum_enumText,
+    totalPrice: totalPriceSums.toFixed(4) || 0.0,
+  });
+  // var totalPrice2 = 0
+  // var refundPrice2 = 0
+  purchaseinventoryList.value.splice(i + 1, 0, {
+    busNo: row.busNo,
+    genderEnum_enumText: row.genderEnum_enumText,
+    departmentName: '小计',
+    totalPrice: totalPriceSums.toFixed(4) || 0.0,
+  });
+  // purchaseinventoryList.value.map(k=>{
+  //     if(k.departmentName!='小计'){
+  //         totalPrice2 += Number(k.totalPrice)
+  //         refundPrice2 += Number(k.refundPrice)
+  //     }
+  // })
+  // totalPrice2 = totalPrice2?totalPrice2.toFixed(4):totalPrice2
+  // refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
+  // purchaseinventoryList.value.push({departmentName:'合计',totalPrice:totalPrice2,refundPrice:refundPrice2})
+}
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+  // 合并一样的列住院号 outpatientNumber属性&&(queryParams.value.statisticsType==1||queryParams.value.statisticsType==4||queryParams.value.statisticsType==6)
+  if (columnIndex === 1 && purchaseinventoryList.value.length > 0) {
+    if (
+      rowIndex === 0 ||
+      (rowIndex > 0 && row.busNo !== purchaseinventoryList.value[rowIndex - 1]?.busNo)
+    ) {
       let rowspan = 1;
-      // 计算门诊号相同的连续行数
-      for (let i = rowIndex + 1; i < purchaseinventoryList.value.length; i++) {
-        const nextRow = purchaseinventoryList.value[i];
-        // 如果下一行是小计行或者门诊号不同，停止计数
-        if (nextRow.departmentName === '小计' || nextRow.busNo !== row.busNo) {
-          break;
+      let totalPriceSum = 0;
+      // let totalReturnPriceSum = 0
+      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 {
+            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.0,
+              });
+              // console.log(purchaseinventoryList.value,"12121")
+            }
+            break;
+          }
         }
         rowspan++;
       }
@@ -502,59 +483,74 @@ const arraySpanMethod = ({row, column, rowIndex, columnIndex}) => {
       // 非起始行不显示
       return { rowspan: 0, colspan: 0 };
     }
+    // }else{ // 姓名列patientName
+    //   if (columnIndex ===2&&purchaseinventoryList.value.length>0) {
+    //     if (rowIndex === 0 || (rowIndex > 0 && row.name !== purchaseinventoryList.value[rowIndex - 1]?.name)) {
+    //       let rowspan = 1;
+    //       for (let i = rowIndex + 1; i < purchaseinventoryList.value.length; i++) {
+    //         if (purchaseinventoryList.value[i].name === row.name) {
+    //           rowspan++;
+    //         } else {
+    //           break;
+    //         }
+    //       }
+    //       return { rowspan:rowspan, colspan: 1 };
+    //     } else {
+    //       return { rowspan: 0, colspan: 0 };
+    //     }
+    //   }
   }
-}
+};
 const getSummaries = (param) => {
-  const { columns, data } = param
-  const sums = []
+  const { columns, data } = param;
+  const sums = [];
   columns.forEach((column, index) => {
     if (index === 0) {
-      sums[index] = h('div', { style: { textDecoration: 'underline' } }, [
-        '合计',
-      ])
-      return
+      sums[index] = h('div', { style: { textDecoration: 'underline' } }, ['合计']);
+      return;
     }
-    const values = data.map((item) => (item.departmentName!='小计'&&Number(item[column.property])))
-    if (column.property=='totalPrice') {
+    const values = data.map(
+      (item) => item.departmentName != '小计' && Number(item[column.property])
+    );
+    if (column.property == 'totalPrice') {
       sums[index] = `${values.reduce((prev, curr) => {
-          const value = Number(curr)
-          if (!Number.isNaN(value)) {
-          return (Number(prev) + Number(curr)).toFixed(2) || 0.00
-          } else {
-          return Number(prev)
-          }
-      }, 0.00)}`
+        const value = Number(curr);
+        if (!Number.isNaN(value)) {
+          return (Number(prev) + Number(curr)).toFixed(4) || 0.0;
+        } else {
+          return Number(prev);
+        }
+      }, 0.0)}`;
     } else {
-      sums[index] = ' '
+      sums[index] = ' ';
     }
-  })
-  return sums
-}
+  });
+  return sums;
+};
 
-function inventoryChange(val){
-    queryParams.value.statisticsType = val
-    xiaojiTotal.value = []
-    purchaseinventoryList.value = []
-    getList()
+function inventoryChange(val) {
+  queryParams.value.statisticsType = val;
+  xiaojiTotal.value = [];
+  purchaseinventoryList.value = [];
+  getList();
 }
 function getPharmacyCabinetLists() {
-  getReportChargeInit().then((response)=>{
-    inventoryOptions.value = response.data.statisticsTypeOptions
-    queryParams.value.statisticsType = 1
-    issuerOptions.value = response.data.issuerOptions
-    payeeOptions.value = response.data.payeeOptions
-    clinicalTypeOptions.value = response.data.clinicalTypeOptions
-  })
+  getReportChargeInit().then((response) => {
+    inventoryOptions.value = response.data.statisticsTypeOptions;
+    queryParams.value.statisticsType = 1;
+    issuerOptions.value = response.data.issuerOptions;
+    payeeOptions.value = response.data.payeeOptions;
+    clinicalTypeOptions.value = response.data.clinicalTypeOptions;
+  });
   getDepartmentList().then((response) => {
-    getDepartmentOptions.value = response.data // 科室
-  })
-
+    getDepartmentOptions.value = response.data; // 科室
+  });
 }
 /** 查询调拨管理项目列表 */
-function getList(type) { 
-  if(type){
-    xiaojiTotal.value = []
-    purchaseinventoryList.value = []
+function getList(type) {
+  if (type) {
+    xiaojiTotal.value = [];
+    purchaseinventoryList.value = [];
   }
   loading.value = true;
   // purchaseinventoryList.value = [
@@ -570,7 +566,7 @@ function getList(type) {
   //   {busNo:'M2505070009100307',name:"赵六",departmentName:'CF2505070009101368',birthDate:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',clinicalName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'4.8',price:'4.8',totalPrice:'4.8',number:'1盒',totalPrice:'4.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
   //   {busNo:'M2505070009100307',name:"赵六",departmentName:'CF2505070009101369',birthDate:'2025-05-07 16:28',practitionerName:'张三',practitionerName:'王东收费',clinicalName:'布洛芬缓释胶囊',busNo:'yp3065',medicalName:'布洛芬缓释胶囊',ybNo:'XC10AXY097A0010',totalVolume:'0.3g*24',salePrice:'2.8',price:'2.8',totalPrice:'2.8',number:'1盒',totalPrice:'2.8',refundQuantity:'0.00盒',refundPrice:'0.00',lotNumber:'72240709',manufacturerText:'上海信谊天平药业有限公司',supplierName:'旧系统批量'},
   // ]
-  var totalPrice2 = 0
+  var totalPrice2 = 0;
   // var refundPrice2 = 0
   // var purchaseinventoryLists = []
   // var purchaseinventoryListsArray = []
@@ -581,111 +577,139 @@ function getList(type) {
     //   purchaseinventoryLists.map(p=>{
     //     purchaseinventoryListsArray = [...purchaseinventoryListsArray, ...p.reportPageItemDto]
     //     // purchaseinventoryList.value.concat(p.reportPageItemDto)
-    //   }) 
+    //   })
     // }
     // purchaseinventoryList.value = purchaseinventoryListsArray
-    purchaseinventoryList.value = res.data.records||[]
-    total.value = res.data.total
-    purchaseinventoryList.value.map(k=>{
-      k.totalPrice = k.totalPrice?k.totalPrice.toFixed(2):'0.00'
-      // 优先使用price，其次使用salePrice
-      k.price = k.price ? k.price.toFixed(2) : (k.salePrice ? k.salePrice.toFixed(2) : '0.00')
-      // 如果没有chargeTime，尝试使用createTime作为替代
-      if (!k.chargeTime && k.createTime) {
-        k.chargeTime = k.createTime;
-      }
+    purchaseinventoryList.value = res.data.records || [];
+    total.value = res.data.total;
+    purchaseinventoryList.value.map((k) => {
+      k.totalPrice = k.totalPrice ? k.totalPrice.toFixed(4) : '0.0000';
+      k.price = k.price ? k.price.toFixed(4) : '0.0000';
       // k.refundPrice = k.refundPrice || '0.00'
-      k.number = k.number ? (k.number + (k.quantityUnit_dictText || '')) : ('0.00' + (k.quantityUnit_dictText || ''))
+      k.number = k.number
+        ? k.number + (k.quantityUnit_dictText ? k.quantityUnit_dictText : '')
+        : '0.0000' + k.quantityUnit_dictText
+        ? k.quantityUnit_dictText
+        : '';
       // k.refundQuantity = k.refundQuantity?(k.refundQuantity+k.refundUnitCode_dictText):('0.00'+ k.quantityUnit_dictText)
-      if(total.value&&total.value<=queryParams.value.pageSize){
-          totalPrice2 += Number(k.totalPrice)
-          // refundPrice2 += Number(k.refundPrice)
+      if (total.value && total.value <= queryParams.value.pageSize) {
+        totalPrice2 += Number(k.totalPrice);
+        // refundPrice2 += Number(k.refundPrice)
       }
-    })
-    if(total.value<=res.data.size){
+    });
+    if (total.value <= res.data.size) {
       loading.value = false;
     }
-    // 1页数据时，不再手动添加合计行，使用表格的show-summary功能
-   
+    // 1页数据
+    if (total.value && total.value <= queryParams.value.pageSize) {
+      totalPrice2 = totalPrice2 ? totalPrice2.toFixed(4) : totalPrice2;
+      // refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
+      let pageNoAll = total.value / queryParams.value.pageSize;
+      if (Math.ceil(pageNoAll) == queryParams.value.pageNo) {
+        purchaseinventoryList.value.push({ departmentName: '合计', totalPrice: totalPrice2 });
+      }
+    }
+
     // 带分页数据
-    if(total.value&&total.value>queryParams.value.pageSize){
+    if (total.value && total.value > queryParams.value.pageSize) {
       // var purchaseinventoryListsAll = []
       // var purchaseinventoryListsArrayAll = []
-      let queryParamsValue = {...queryParams.value}
-      queryParamsValue.pageSize = total.value
-      queryParamsValue.pageNo = 1
+      let queryParamsValue = { ...queryParams.value };
+      queryParamsValue.pageSize = total.value;
+      queryParamsValue.pageNo = 1;
       getReportChargePage(queryParamsValue).then((res) => {
         // purchaseinventoryListsAll = res.data.records||[]
         // if(purchaseinventoryListsAll.length>0){
         //   purchaseinventoryListsAll.map(p=>{
         //     purchaseinventoryListsArrayAll = [...purchaseinventoryListsArrayAll, ...p.reportPageItemDto]
         //     // purchaseinventoryList.value.concat(p.reportPageItemDto)
-        //   }) 
+        //   })
         // }
         // purchaseinventoryListAll.value = purchaseinventoryListsArrayAll
-        purchaseinventoryListAll.value = res.data.records||[]
-        if(purchaseinventoryListAll.value.length>0){
-          purchaseinventoryListAll.value.map((k,index)=>{
-            k.totalPrice = k.totalPrice?k.totalPrice.toFixed(2):'0.00'
-            // 优先使用price，其次使用salePrice
-            k.price = k.price ? k.price.toFixed(2) : (k.salePrice ? k.salePrice.toFixed(2) : '0.00')
-            // 如果没有chargeTime，尝试使用createTime作为替代
-            if (!k.chargeTime && k.createTime) {
-              k.chargeTime = k.createTime;
-            }
+        purchaseinventoryListAll.value = res.data.records || [];
+        if (purchaseinventoryListAll.value.length > 0) {
+          purchaseinventoryListAll.value.map((k, index) => {
+            k.totalPrice = k.totalPrice ? k.totalPrice.toFixed(4) : '0.0000';
+            k.price = k.price ? k.price.toFixed(4) : '0.0000';
             // k.refundPrice = k.refundPrice || '0.00'
-            k.number = k.number ? (k.number + (k.quantityUnit_dictText || '')) : ('0.00' + (k.quantityUnit_dictText || ''))
+            k.number = k.number
+              ? k.number + k.quantityUnit_dictText
+                ? k.quantityUnit_dictText
+                : ''
+              : '0.0000' + k.quantityUnit_dictText
+              ? k.quantityUnit_dictText
+              : '';
             // k.refundQuantity = k.refundQuantity?(k.refundQuantity+k.refundUnitCode_dictText):('0.00'+ k.quantityUnit_dictText)
-            totalPrice2 += Number(k.totalPrice)
+            totalPrice2 += Number(k.totalPrice);
             // refundPrice2 += Number(k.refundPrice)
             //处理不同页门诊号相同小计在最后回显问题start
             // m<queryParams.value.pageSize&&
-            for(let m = 1;m<index;m++){
-              if (queryParams.value.pageNo>1&&index == (queryParams.value.pageSize*(queryParams.value.pageNo-1))&& 
+            for (let m = 1; m < index; m++) {
+              if (
+                queryParams.value.pageNo > 1 &&
+                index == queryParams.value.pageSize * (queryParams.value.pageNo - 1) &&
                 k.busNo == purchaseinventoryListAll.value[index - m]?.busNo
               ) {
-              //   purchaseinventoryList.value.unshift(purchaseinventoryListAll.value[index-m]) // 加
-              //   //修改计算的小计缺少加过来的部分
-                let dispenseNoIndex1 = purchaseinventoryList.value.findIndex(o=>o.departmentName=='小计'&&o.busNo==purchaseinventoryListAll.value[index-m].busNo)
-               
-                if(dispenseNoIndex1>0){
-                  purchaseinventoryList.value[dispenseNoIndex1].totalPrice = Number(purchaseinventoryList.value[dispenseNoIndex1].totalPrice)+Number(purchaseinventoryListAll.value[index-m].totalPrice)
-                  purchaseinventoryList.value[dispenseNoIndex1].totalPrice = purchaseinventoryList.value[dispenseNoIndex1].totalPrice?purchaseinventoryList.value[dispenseNoIndex1].totalPrice.toFixed(2):'0.00'
+                //   purchaseinventoryList.value.unshift(purchaseinventoryListAll.value[index-m]) // 加
+                //   //修改计算的小计缺少加过来的部分
+                let dispenseNoIndex1 = purchaseinventoryList.value.findIndex(
+                  (o) =>
+                    o.departmentName == '小计' &&
+                    o.busNo == purchaseinventoryListAll.value[index - m].busNo
+                );
+
+                if (dispenseNoIndex1 > 0) {
+                  purchaseinventoryList.value[dispenseNoIndex1].totalPrice =
+                    Number(purchaseinventoryList.value[dispenseNoIndex1].totalPrice) +
+                    Number(purchaseinventoryListAll.value[index - m].totalPrice);
+                  purchaseinventoryList.value[dispenseNoIndex1].totalPrice = purchaseinventoryList
+                    .value[dispenseNoIndex1].totalPrice
+                    ? purchaseinventoryList.value[dispenseNoIndex1].totalPrice.toFixed(4)
+                    : '0.0000';
                 }
               }
-              if ((index+m) == (queryParams.value.pageSize*queryParams.value.pageNo)&& k.busNo == purchaseinventoryListAll.value[index + m]?.busNo) {
-                if(purchaseinventoryList.value[purchaseinventoryList.value.length-1].departmentName=='小计'){
-                  purchaseinventoryList.value.splice(purchaseinventoryList.value.length-1,1) // 减掉第二页还有相同门诊号的第一页的小计
+              if (
+                index + m == queryParams.value.pageSize * queryParams.value.pageNo &&
+                k.busNo == purchaseinventoryListAll.value[index + m]?.busNo
+              ) {
+                if (
+                  purchaseinventoryList.value[purchaseinventoryList.value.length - 1]
+                    .departmentName == '小计'
+                ) {
+                  purchaseinventoryList.value.splice(purchaseinventoryList.value.length - 1, 1); // 减掉第二页还有相同门诊号的第一页的小计
                 }
                 // let dispenseNoIndex = purchaseinventoryList.value.findIndex(o=>o.paymentId==k.paymentId&&o.chargeId==k.chargeId) //通过唯一主键进行区分
                 // purchaseinventoryList.value.splice(dispenseNoIndex,1) // 减
                 // if(purchaseinventoryList.value[dispenseNoIndex-1]&&purchaseinventoryList.value[dispenseNoIndex-1].departmentName=='小计'){
                 //   purchaseinventoryList.value.splice(dispenseNoIndex+1,1) // 减掉带小计的
                 // }
-              } 
+              }
             }
             // end
-          })
-          totalPrice2 = totalPrice2?totalPrice2.toFixed(4):totalPrice2
+          });
+          totalPrice2 = totalPrice2 ? totalPrice2.toFixed(4) : totalPrice2;
           // refundPrice2 = refundPrice2?refundPrice2.toFixed(4):refundPrice2
           loading.value = false;
-          // 不再手动添加合计行，使用表格的show-summary功能
+          let pageNoAll = total.value / queryParams.value.pageSize;
+          if (Math.ceil(pageNoAll) == queryParams.value.pageNo) {
+            purchaseinventoryList.value.push({ departmentName: '合计', totalPrice: totalPrice2 });
+          }
         }
-      })
+      });
     }
   });
 }
-  
+
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.chargeTimeSTime =
     occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[0] + " 00:00:00"
-      : "";
+      ? occurrenceTime.value[0] + ' 00:00:00'
+      : '';
   queryParams.value.chargeTimeETime =
     occurrenceTime.value && occurrenceTime.value.length == 2
-      ? occurrenceTime.value[1] + " 23:59:59"
-      : "";
+      ? occurrenceTime.value[1] + ' 23:59:59'
+      : '';
   queryParams.value.pageNo = 1;
   getList(1);
 }
@@ -693,10 +717,10 @@ function handleQuery() {
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  occurrenceTime.value = ""
-  queryParams.value.chargeTimeSTime = ""
-  queryParams.value.chargeTimeETime = ""
-  proxy.resetForm("queryRef");
+  occurrenceTime.value = '';
+  queryParams.value.chargeTimeSTime = '';
+  queryParams.value.chargeTimeETime = '';
+  proxy.resetForm('queryRef');
   getList(1);
 }
 
@@ -707,54 +731,36 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length;
 }
 
-// 表头点击事件，用于实现更灵活的列操作
-function handleHeaderClick(column) {
-  // 可以在这里添加额外的表头操作逻辑
-  // 例如：根据列内容自动调整宽度
-  if (column.property) {
-    autoFitColumnWidth(column.property);
-  }
+// 初始化日期范围为当前月第一天到今天
+function initDefaultDateRange() {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = now.getMonth();
+
+  // 当前月第一天
+  const firstDay = new Date(year, month, 1);
+  // 今天
+  const today = now;
+
+  // 格式化为YYYY-MM-DD格式
+  const formatDate = (date) => {
+    const y = date.getFullYear();
+    const m = String(date.getMonth() + 1).padStart(2, '0');
+    const d = String(date.getDate()).padStart(2, '0');
+    return `${y}-${m}-${d}`;
+  };
+
+  occurrenceTime.value = [formatDate(firstDay), formatDate(today)];
+
+  // 同时设置到queryParams中，确保首次加载时传递时间参数
+  queryParams.value.chargeTimeSTime = occurrenceTime.value[0] + ' 00:00:00';
+  queryParams.value.chargeTimeETime = occurrenceTime.value[1] + ' 23:59:59';
 }
 
-// 根据内容自动调整列宽
-function autoFitColumnWidth(property) {
-  // 实际项目中可以根据需要实现更复杂的自动宽度计算逻辑
-  // 这里提供一个简单的实现方式
-  const table = document.querySelector('.el-table__body-wrapper table');
-  if (table) {
-    const rows = table.querySelectorAll('tbody tr');
-    let maxWidth = 100; // 默认最小宽度
-    
-    rows.forEach(row => {
-      const cell = Array.from(row.cells).find((cell, index) => {
-        const headerCell = table.querySelector(`thead th:nth-child(${index + 1})`);
-        return headerCell && headerCell.dataset.property === property;
-      });
-      
-      if (cell) {
-        const textWidth = cell.textContent.length * 8; // 粗略估算文本宽度
-        maxWidth = Math.max(maxWidth, textWidth);
-      }
-    });
-    
-    // 应用计算出的宽度（可以根据实际需要调整）
-    // 注意：在实际Element Plus中，可能需要通过ref获取表格实例并调用API来设置列宽
-  }
-}
-
-/** 跳转到患者档案管理页面 */
-function handleArchive(row) {
-  // 跳转到患者档案管理页面，并传递busNo参数
-  proxy.$router.push({
-    path: '/system/basicmanage/patientmanagement',
-    query: { searchKey: row.busNo }
-  });
-}
-
-
-
+// 初始化页面
+getPharmacyCabinetLists();
+initDefaultDateRange();
 getList();
-getPharmacyCabinetLists()
 </script>
 <style scoped>
 .custom-tree-node {
@@ -762,7 +768,7 @@ getPharmacyCabinetLists()
   align-items: center;
 }
 
-.pagination-container{
-    margin-right: 20px;
+.pagination-container {
+  margin-right: 20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientDetails.vue
new file mode 100644
index 00000000..9f157c36
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientDetails.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <el-table
+      v-loading="loading"
+      :data="patientDetailsList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="门诊住院号"
+        align="center"
+        key="encounterBusNo"
+        prop="encounterBusNo"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品通用名"
+        align="center"
+        key="medName"
+        prop="medName"
+         width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品医保编码"
+        align="center"
+        key="medYbNo"
+        prop="medYbNo"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品类别"
+        align="center"
+        key="categoryCode_dictText"
+        prop="categoryCode_dictText"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="剂型"
+        align="center"
+        key="doseFormCode_dictText"
+        prop="doseFormCode_dictText"
+        width="140px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格"
+        align="center"
+        key="totalVolume"
+        prop="totalVolume"
+         width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="计价单位"
+        align="center"
+        key="unitCode_dictText"
+        prop="unitCode_dictText"
+        width="160"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否中选产品"
+        align="center"
+        key="isSelected"
+        prop="isSelected"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+       <el-table-column
+        label="生产企业"
+        align="center"
+        key="manufacturerText"
+        prop="manufacturerText"
+        width="100"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="单价（元）"
+        align="center"
+        key="price"
+        prop="price"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="使用数量（片袋支）"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="使用总金额（元）"
+        align="center"
+        key="totalPrice"
+        prop="totalPrice"
+        width="200"
+        :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="patientDetails">
+import {
+  getReportPatientDetails
+} from './statisticalManagent';
+
+
+const patientDetailsList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const total = ref(0);
+
+const queryParams = ref({
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+});
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getReportPatientDetails(queryParams.value).then((res) => {
+    loading.value = false;
+    patientDetailsList.value = res.data.records;
+    total.value = res.data.total;
+  })
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  getList();
+});
+
+</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/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientMasterDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientMasterDetails.vue
new file mode 100644
index 00000000..c0ba104d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientMasterDetails.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="app-container">
+    <el-table
+      v-loading="loading"
+      :data="patientMasterList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="门诊住院号"
+        align="center"
+        key="encounterBusNo"
+        prop="encounterBusNo"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="患者姓名"
+        align="center"
+        key="patientName"
+        prop="patientName"
+         width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="身份证号"
+        align="center"
+        key="idCard"
+        prop="idCard"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="人员编码"
+        align="center"
+        key="psnNo"
+        prop="psnNo"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="参保地区"
+        align="center"
+        key="insuPlcNo"
+        prop="insuPlcNo"
+        width="140px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="参保类型"
+        align="center"
+        key="ybType"
+        prop="ybType"
+         width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="入院时间"
+        align="center"
+        key="encounterStartTime"
+        prop="encounterStartTime"
+        width="160"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.occurrenceTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="出院时间"
+        align="center"
+        key="encounterEndTime"
+        prop="encounterEndTime"
+        width="160"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.approvalTime) }}</span>
+        </template>
+      </el-table-column>
+            <el-table-column
+        label="处方日期"
+        align="center"
+        key="issueTime"
+        prop="issueTime"
+        width="160"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.approvalTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="出院诊断"
+        align="center"
+        key="outDiagnoseName"
+        prop="outDiagnoseName"
+        width="160"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="总费用（元）"
+        align="center"
+        key="feeAmount"
+        prop="feeAmount"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+       <el-table-column
+        label="政策范围内"
+        align="center"
+        key="inscpScpAmt"
+        prop="inscpScpAmt"
+        width="100"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="基本医保统筹支付金额（元）"
+        align="center"
+        key="tcPayAmount"
+        prop="tcPayAmount"
+        width="200"
+        :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="patientMasterDetails">
+import {
+  getReportPatientMasterDetail
+} from './statisticalManagent';
+
+
+const patientMasterList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const total = ref(0);
+
+const queryParams = ref({
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+});
+
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getReportPatientMasterDetail(queryParams.value).then((res) => {
+    loading.value = false;
+    patientMasterList.value = res.data.records;
+    total.value = res.data.total;
+  })
+}
+
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  getList();
+});
+
+</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/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
index 70188c32..557ac37d 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
@@ -296,7 +296,7 @@ function handleCurrentChange(val) {
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.$download.downloadGet("report-manage/medication-device/excel-out", {
+  proxy.$download.downloadGet("/report-manage/medication-device/excel-out", {
     ...rightQueryParams.value,
   }, `config_${new Date().getTime()}.xlsx`);
 }
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/productUsageDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/productUsageDetails.vue
new file mode 100644
index 00000000..494375aa
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/productUsageDetails.vue
@@ -0,0 +1,228 @@
+<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="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-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="productUsageDetailsList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="编码"
+        align="center"
+        key="busNo"
+        prop="busNo"
+        :show-overflow-tooltip="true"
+        width="110"
+      />
+      <el-table-column
+        label="药品通用名"
+        align="center"
+        key="medName"
+        prop="medName"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <!-- itemTable -->
+      <el-table-column
+        label="产品名称"
+        align="center"
+        key="productName"
+        prop="productName"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="剂型"
+        align="center"
+        key="doseFormCode_dictText"
+        prop="doseFormCode_dictText"
+        width="140"
+        :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="packageUnit"
+        prop="packageUnit"
+        width="140px"
+        :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="manufacturerText"
+        prop="manufacturerText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="价格（每盒瓶/元）"
+        align="center"
+        key="price"
+        prop="price"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否医保患者使用"
+        align="center"
+        key="isUsed"
+        prop="isUsed"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="患者参保地"
+        align="center"
+        key="insuplcName"
+        prop="insuplcName"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="参保类型"
+        align="center"
+        key="ybType"
+        prop="ybType"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="使用数量（片袋支）"
+        align="center"
+        key="quantity"
+        prop="quantity"
+        width="160"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="使用金额（片袋支）"
+        align="center"
+        key="totalPrice"
+        prop="totalPrice"
+        width="160"
+        :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="productUsageDetails">
+import {
+  getReportProductUsageDetails,
+} from './statisticalManagent';
+
+const { proxy } = getCurrentInstance();
+const route = useRoute();
+
+const productUsageDetailsList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const approvalTime = ref([]);
+const supplierListOptions = ref([]);
+const locationIdList = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询产品使用情况项目列表 */
+function getList() {
+  loading.value = true;
+  getReportProductUsageDetails(queryParams.value).then((res) => {
+    loading.value = false;
+    productUsageDetailsList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.occurrenceTimeSTime =
+    approvalTime.value && approvalTime.value.length == 2 ? approvalTime.value[0] + ' 00:00:00' : '';
+  queryParams.value.occurrenceTimeETime =
+    approvalTime.value && approvalTime.value.length == 2 ? approvalTime.value[1] + ' 23:59:59' : '';
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.occurrenceTimeSTime = '';
+  queryParams.value.occurrenceTimeETime = '';
+  approvalTime.value = '';
+  proxy.resetForm('queryRef');
+  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;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
index ec1d7d17..2bd62e74 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseDocumentDetsils.vue
@@ -86,7 +86,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
@@ -141,7 +141,13 @@
         prop="supplyBusno"
         width="200"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template #default="scope">
+          <el-button type="primary" link @click="showDetail(scope.row.supplyBusno)">
+            {{ scope.row.supplyBusno }}
+          </el-button>
+        </template>
+      </el-table-column>
       <!-- itemTable -->
       <el-table-column
         label="药品名称"
@@ -285,6 +291,64 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
+    <el-dialog v-model="dialogVisible" title="单据详情" width="1700px" destroy-on-close>
+      <el-row>
+        <el-col :span="24">
+          <el-descriptions :column="4">
+            <el-descriptions-item label="单据编号：">
+              {{ documentDetails[0].busNo }}
+            </el-descriptions-item>
+            <el-descriptions-item label="制单日期：">
+              {{ documentDetails[0].applyTime }}
+            </el-descriptions-item>
+            <el-descriptions-item label="供应商：">
+              {{ documentDetails[0].supplierName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="制单人：">
+              {{ documentDetails[0].practitionerName }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+      <el-table :data="documentDetails" border max-height="600">
+        <el-table-column label="序号" align="center" type="index" width="60" />
+        <el-table-column label="项目名" align="center" prop="itemName" />
+        <el-table-column label="规格" align="center" prop="totalVolume" />
+        <el-table-column label="厂家/产地" align="center" prop="manufacturerText" width="240" />
+        <el-table-column label="仓库" align="center" prop="purposeLocationName" />
+        <el-table-column label="采购数量" align="right" prop="totalQuantity" header-align="center">
+          <template #default="scope">
+            <span>{{ scope.row.totalQuantity + scope.row.unitCode_dictText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" align="right" prop="price" header-align="center">
+          <template #default="scope">
+            <span>{{ scope.row.price.toFixed(2) + ' 元' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="合计金额" align="right" prop="totalPrice" header-align="center">
+          <template #default="scope">
+            <span>{{ scope.row.totalPrice.toFixed(2) + ' 元' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="批号" align="center" prop="lotNumber" />
+        <el-table-column label="生产日期" align="center" prop="startTime" width="130">
+          <template #default="scope">
+            <span>{{ formatDateStr(scope.row.startTime, 'YYYY-MM-DD') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期至" align="center" prop="endTime" width="130">
+          <template #default="scope">
+            <span>{{ formatDateStr(scope.row.endTime, 'YYYY-MM-DD') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -293,26 +357,24 @@ import {
   getReportInboundPCage,
   getPharmacyCabinetList,
   getInboundInit,
+  getDocumentDetails,
 } from './statisticalManagent';
+import { formatDateStr } from '@/utils/index';
 
 const { proxy } = getCurrentInstance();
 const route = useRoute();
 
-// const {
-//   item_type
-// } = proxy.useDict(
-//   "item_type"
-// );
 const purchaseinventoryList = ref([]);
 const loading = ref(true);
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
+const dialogVisible = ref(false);
 const total = ref(0);
 const approvalTime = ref([]);
 const supplierListOptions = ref([]);
-// const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
+const documentDetails = ref([]);
 
 const data = reactive({
   form: {},
@@ -364,6 +426,14 @@ function getList() {
   });
 }
 
+// 查看单据详情
+function showDetail(busNo) {
+  getDocumentDetails({ busNo: busNo }).then((res) => {
+    dialogVisible.value = true;
+    documentDetails.value = res.data;
+  });
+}
+
 // 监听路由变化
 watch(
   () => route.query,
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
index c16d663c..16fb8c3e 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/purchaseReturnDetsils.vue
@@ -91,7 +91,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
@@ -343,9 +343,9 @@ import {
 const { proxy } = getCurrentInstance();
 const route = useRoute();
 // const {
-//   item_type
+//   item_category_code
 // } = proxy.useDict(
-//   "item_type"
+//   "item_category_code"
 // );
 const purchaseinventoryList = ref([]);
 const loading = ref(true);
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
index c3c848ed..d9ba1094 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/registrationFeeDetails.vue
@@ -208,10 +208,10 @@ const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const totalAmount = ref(0);
 // const {
-//   item_type,
+//   item_category_code,
 //   hosp_lv
 // } = proxy.useDict(
-//   "item_type",
+//   "item_category_code",
 //   "hosp_lv"
 // );
 const purchaseinventoryListAll = ref([])
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
index df607579..b1dedbc2 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/requisitionDetails.vue
@@ -328,9 +328,9 @@ const { proxy } = getCurrentInstance();
 const route = useRoute();
 
 const {
-  item_type,
+  item_category_code,
 } = proxy.useDict(
-  "item_type",
+  "item_category_code",
 );
 
 const purchaseinventoryList = ref([]);
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
index a2bd4064..367aae60 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/returnOrutboundDetails.vue
@@ -90,7 +90,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
@@ -105,7 +105,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
index 6b30b567..cbaa8ef0 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="90px"
-    >
-     <el-form-item label="药品名称：" prop="searchKey">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
+      <el-form-item label="药品名称：" prop="searchKey">
         <el-input
           v-model="queryParams.searchKey"
           placeholder="药品编码/药品名称/名称拼音/供应商名"
@@ -33,7 +28,7 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item> -->
-     
+
       <el-form-item label="药品类别：" prop="categoryCode">
         <el-select
           v-model="queryParams.categoryCode"
@@ -42,14 +37,14 @@
           style="width: 150px"
         >
           <el-option
-            v-for="categoryCode in item_type"
+            v-for="categoryCode in item_category_code"
             :key="categoryCode.value"
             :label="categoryCode.label"
             :value="categoryCode.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="医保等级：" prop="chrgitmLv" >
+      <el-form-item label="医保等级：" prop="chrgitmLv">
         <el-select
           v-model="queryParams.chrgitmLv"
           placeholder="请选择医保等级"
@@ -64,7 +59,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库药房：" prop="locationId" >
+      <el-form-item label="仓库药房：" prop="locationId">
         <el-select
           v-model="queryParams.locationId"
           placeholder="请选择仓库药房"
@@ -72,7 +67,7 @@
           style="width: 150px"
         >
           <el-option
-            v-for="supplyStatus in locationIdList" 
+            v-for="supplyStatus in locationIdList"
             :key="supplyStatus.value"
             :label="supplyStatus.name"
             :value="supplyStatus.id"
@@ -99,25 +94,11 @@
     <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-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>
 
@@ -133,7 +114,6 @@
         key="categoryCode_dictText"
         prop="categoryCode_dictText"
         :show-overflow-tooltip="true"
-  
       />
       <el-table-column
         label="药品编码"
@@ -262,7 +242,7 @@
         prop="price"
         :show-overflow-tooltip="true"
       />
-     <el-table-column
+      <el-table-column
         label="本期库存数量"
         align="center"
         key="quantity"
@@ -298,19 +278,15 @@
 </template>
 
 <script setup name="settlementDoc">
-import {
-  getproductReturnPage,
-  getInit,
-  getPharmacyCabinetList,
-} from "./statisticalManagent";
+import { getproductReturnPage, getInit, getPharmacyCabinetList } from './statisticalManagent';
 
 const { proxy } = getCurrentInstance();
 
 const {
-  item_type,
+  item_category_code,
   inventory_range,
 } = proxy.useDict(
-  "item_type",
+  "item_category_code",
   "inventory_range",
 );
 
@@ -322,7 +298,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const supplyTypeOptions = ref(undefined); 
+const supplyTypeOptions = ref(undefined);
 const supplyStatusOptions = ref(undefined);
 const chrgitmLv_enumTextOptions = ref([]);
 const locationIdList = ref([]);
@@ -332,13 +308,13 @@ const data = reactive({
   queryParams: {
     pageNo: 1,
     pageSize: 10,
-    searchKey: undefined, 
-    remainingDays: 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,
   },
@@ -349,37 +325,41 @@ const { queryParams, form, rules } = toRefs(data);
 
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
-    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;
   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
+    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
-      })
+        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;
   });
@@ -387,14 +367,14 @@ function getList() {
 
 /** 搜索按钮操作 */
 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();
 }
@@ -402,7 +382,7 @@ function handleQuery() {
 /** 清空条件按钮操作 */
 function handleClear() {
   // 清空查询条件
-  proxy.resetForm("queryRef");
+  proxy.resetForm('queryRef');
   getList();
 }
 
@@ -414,13 +394,11 @@ function handleSelectionChange(selection) {
 }
 
 getList();
-getPharmacyCabinetLists()
+getPharmacyCabinetLists();
 </script>
 <style scoped>
 .custom-tree-node {
   display: flex;
   align-items: center;
 }
-
-
-</style>
\ No newline at end of file
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
index f8bf4667..ed4c1326 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/statisticalManagent.js
@@ -387,7 +387,7 @@ export function handOperatedApplyReconcileAccounts(data) {
 
 export function productPageTotal(query) {
     return request({
-        url: '/inventory-manage/product/product-page-total',
+        url: '/inventory-manage/product/product-statistics',
         method: 'get',
         params: query
     })
@@ -415,4 +415,125 @@ export function getReportStocktakingPageAuto(query) {
         method: 'get',
         params: query
     })
-}
\ No newline at end of file
+}
+
+//报表导出
+export function exportRecords(params) {
+    return request({
+        url: '/pharmacy-manage/medication-details/excel-out',
+        method: 'get',
+        params: qparamsuery
+    })
+
+}
+
+//查看单据详情
+export function getDocumentDetails(params) {
+    return request({
+        url: '/inventory-manage/purchase/inventory-receipt',
+        method: 'get',
+        params: params
+    })
+
+}
+
+//药剂科报表_常规报表:出库明细表(例子)
+export function getStockOutDetail(query) {
+    return request({
+        url: '/report-manage/report/stock-out-detail-page',
+        method: 'get',
+        params: query
+    })
+
+}
+
+//查询患者明细主报表--20251106追加
+export function getReportPatientMasterDetail(query) {
+    return request({
+        url: '/report-manage/report/patient-master-detail',
+        method: 'get',
+        params: query
+    })
+}
+
+//线下采购占比报表--20251106追加
+export function getReportOfflinePurchaseRatio(query) {
+    return request({
+        url: '/report-manage/report/offline-purchase-ratio',
+        method: 'get',
+        params: query
+    })
+}
+
+//药品使用情况报表--20251106追加
+export function getReportMedicationUsage(query) {
+    return request({
+        url: '/report-manage/report/medication-usage',
+        method: 'get',
+        params: query
+    })
+}
+
+//查询患者明细报表--20251106追加
+export function getReportPatientDetails(query) {
+    return request({
+        url: '/report-manage/report/patient-details',
+        method: 'get',
+        params: query
+    })
+}
+
+//药剂科报表:药品费用增长率--20251106追加
+export function getDrugExpensesGrowthRate(query) {
+    return request({
+        url: '/report-manage/report/drug-expenses-growth-rate',
+        method: 'get',
+        params: query
+    })
+}
+
+//药剂科报表:30天回款率--20251106追加
+export function getThirtyDayCollectionRate(query) {
+    return request({
+        url: '/report-manage/report/thirty-day-collection-rate',
+        method: 'get',
+        params: query
+    })
+}
+
+//药剂科报表:基本情况--20251106追加
+export function getReportBasicInformationDetails(query) {
+    return request({
+        url: '/report-manage/report/basic-information-details',
+        method: 'get',
+        params: query
+    })
+}
+
+//药剂科报表:药品出库情况--20251106追加
+export function getReportMedicationStockOutDetails(query) {
+    return request({
+        url: '/report-manage/report/medication-stock-out-details',
+        method: 'get',
+        params: query
+    })
+}
+
+//药剂科报表:产品使用情况--20251106追加
+export function getReportProductUsageDetails(query) {
+    return request({
+        url: '/report-manage/report/product-usage-details',
+        method: 'get',
+        params: query
+    })
+}
+
+//药剂科报表:非中选产品采购量占比--20251106追加
+export function getReportNonWinQtyRatio(query) {
+    return request({
+        url: '/report-manage/report/non-win-qty-ratio',
+        method: 'get',
+        params: query
+    })
+}
+
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/stockOutDetail.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/stockOutDetail.vue
new file mode 100644
index 00000000..2a18523a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/stockOutDetail.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
+    </el-form>
+
+    <el-table
+      v-loading="loading"
+      :data="stockOutDetailList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="单据号"
+        align="center"
+        key="supplyBusno"
+        prop="supplyBusno"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="出库类型"
+        align="center"
+        key="type"
+        prop="type"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品名称"
+        align="center"
+        key="medName"
+        prop="medName"
+        width="140"
+        :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="itemTableText"
+        prop="itemTableText"
+        width="140"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="批次号"
+        align="center"
+        key="lotNumber"
+        prop="lotNumber"
+        width="140px"
+        :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="locationStoreName"
+        prop="locationStoreName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="计量单位"
+        align="center"
+        key="unitCode_dictText"
+        prop="unitCode_dictText"
+        :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="totalPrice"
+        prop="totalPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="售价"
+        align="center"
+        key="salePrice"
+        prop="salePrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="售价金额"
+        align="center"
+        key="totalSalePrice"
+        prop="totalSalePrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="出库科室"
+        align="center"
+        key="orgId_dictText"
+        prop="orgId_dictText"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="供应商"
+        align="center"
+        key="supplier"
+        prop="supplier"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="审核人"
+        align="center"
+        key="approverId_dictText"
+        prop="approverId_dictText"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column
+        label="审批日期"
+        align="center"
+        key="approvalTime"
+        prop="approvalTime"
+        width="160"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.approvalTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="出库原因"
+        align="center"
+        key="reason"
+        prop="reason"
+        :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="getStockOutDetail">
+import {
+  getStockOutDetail,
+} from './statisticalManagent';
+
+const { proxy } = getCurrentInstance();
+const route = useRoute();
+
+const stockOutDetailList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const approvalTime = ref([]);
+const supplierListOptions = ref([]);
+const locationIdList = ref([]);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    occurrenceTimeSTime: undefined,
+    occurrenceTimeETime: undefined,
+  },
+  rules: {},
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 药剂科报表_常规报表:出库明细表的查询 */
+function getList() {
+  loading.value = true;
+  getStockOutDetail(queryParams.value).then((res) => {
+    loading.value = false;
+    stockOutDetailList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+getList();
+</script>
+<style scoped>
+.custom-tree-node {
+  display: flex;
+  align-items: center;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/thirtyDayCollectionRate.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/thirtyDayCollectionRate.vue
new file mode 100644
index 00000000..775b9502
--- /dev/null
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/thirtyDayCollectionRate.vue
@@ -0,0 +1,195 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="150px">
+      <el-form-item label="项目名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="项目名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="医疗机构名称：" prop="searchKey">
+        <el-input
+          v-model="queryParams.medinsName"
+          placeholder="医疗机构名称"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
+        />
+      </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-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="collectionRateList"
+      @selection-change="handleSelectionChange"
+      height="calc(100vh - 300px)"
+    >
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        label="项目名称"
+        align="center"
+        key="name"
+        prop="name"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="医疗机构名称"
+        align="center"
+        key="medinsName"
+        prop="medinsName"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品通用名"
+        align="center"
+        key="drugGenname"
+        prop="drugGenname"
+        width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="30天回款率（%）"
+        align="center"
+        key="collectionRate"
+        prop="collectionRate"
+        width="200"
+        :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="thirtyDayCollectionRate">
+import {
+  getThirtyDayCollectionRate
+} from './statisticalManagent';
+
+const { proxy } = getCurrentInstance();
+const route = useRoute();
+const collectionRateList = ref([]);
+const loading = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    name: undefined,
+    medinsName: undefined
+  },
+  rules: {},
+});
+
+const { queryParams} = toRefs(data);
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.$download.downloadGet(
+    'report-manage/inbound/excel-out',
+    {
+      ...queryParams.value,
+    },
+    `dict_${new Date().getTime()}.xlsx`
+  );
+}
+/** 查询调拨管理项目列表 */
+function getList() {
+  loading.value = true;
+  getThirtyDayCollectionRate(queryParams.value).then((res) => {
+    loading.value = false;
+    collectionRateList.value = res.data.records;
+    total.value = res.data.total;
+  });
+}
+
+// 监听路由变化
+watch(
+  () => route.query,
+  (newQuery) => {
+    // 如果路由中包含指定参数，则使用这些参数进行查询
+    if (
+      newQuery.name ||
+      newQuery.medinsName
+    ) {
+      // 设置查询参数
+      if (newQuery.name) {
+        queryParams.value.name = newQuery.name;
+      }
+       // 设置查询参数
+      if (newQuery.medinsName) {
+        queryParams.value.medinsName = newQuery.medinsName;
+      }
+      // 执行查询
+      getList();
+    }
+  },
+  { immediate: true }
+);
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+/** 清空条件按钮操作 */
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.name = '';
+  queryParams.value.medinsName = '';
+  proxy.resetForm('queryRef');
+  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;
+}
+
+.title {
+  font-weight: bold;
+  font-size: large;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue
index a75b9a08..1f93830d 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/traceabilityCodeManagement.vue
@@ -72,9 +72,9 @@ import { formatDateStr } from '@/utils';
 const { proxy } = getCurrentInstance();
 
 const {
-  item_type,
+  item_category_code,
 } = proxy.useDict(
-  "item_type",
+  "item_category_code",
 );
 
 const purchaseinventoryList = ref([]);
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
index 65433631..379cabe8 100644
--- a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
@@ -8,6 +8,14 @@ export function listPatient(query) {
   })
 }
 
+export function devicePatientList(query) {
+  return request({
+    url: '/pharmacy-manage/device-dispense/encounter-list',
+    method: 'get',
+    params: query
+  })
+}
+
 export function listInit(query) {
   return request({
     url: '/pharmacy-manage/western-medicine-dispense/init',
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/disposalTemplate.json b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/disposalTemplate.json
new file mode 100644
index 00000000..55caac8a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/disposalTemplate.json
@@ -0,0 +1,334 @@
+{
+  "panels": [
+    {
+      "index": 0,
+      "name": 1,
+      "paperType": "A5",
+      "height": 210,
+      "width": 148,
+      "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": {},
+      "paperHeader": 0,
+      "paperFooter": 841.8897637795277,
+      "printElements": [
+        {
+          "options": {
+            "left": 169.5,
+            "top": 22.5,
+            "height": 12,
+            "width": 88.5,
+            "title": "长春大学医院",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 13.5,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 189,
+            "top": 45,
+            "height": 9.75,
+            "width": 42,
+            "title": "处置单",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 11.25,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 67.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "姓名",
+            "field": "patientName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 157.5,
+            "top": 67.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "年龄",
+            "field": "age",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 67.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "性别",
+            "field": "genderEnum_enumText",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 94.5,
+            "height": 9.75,
+            "width": 96,
+            "title": "科室",
+            "field": "departmentName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 156,
+            "top": 94.5,
+            "height": 9.75,
+            "width": 118.5,
+            "title": "费用性质",
+            "field": "contractName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 300,
+            "top": 94.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "日期",
+            "field": "reqTime",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 121.5,
+            "height": 9.75,
+            "width": 123,
+            "title": "门诊号",
+            "field": "encounterNo",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 156,
+            "top": 121.5,
+            "height": 9.75,
+            "width": 120,
+            "title": "开单医生",
+            "field": "doctorName",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 18,
+            "top": 141,
+            "height": 9,
+            "width": 393,
+            "borderWidth": "1.5",
+            "title": "undefined+beforeDragIn",
+            "coordinateSync": false,
+            "widthHeightSync": false
+          },
+          "printElementType": {
+            "title": "横线",
+            "type": "hline"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 156,
+            "height": 9.75,
+            "width": 24,
+            "title": "Rp",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "fontSize": 12,
+            "qrCodeLevel": 0
+          },
+          "printElementType": {
+            "title": "文本",
+            "type": "text"
+          }
+        },
+        {
+          "options": {
+            "left": 22.5,
+            "top": 177,
+            "height": 36,
+            "width": 387,
+            "title": "undefined+beforeDragIn",
+            "coordinateSync": false,
+            "widthHeightSync": false,
+            "field": "adviceItemList",
+            "columns": [
+              [
+                {
+                  "title": "项目名",
+                  "titleSync": false,
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 180.11284430829235,
+                  "field": "itemName",
+                  "checked": true,
+                  "columnId": "itemName",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "单价",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value +  ' 元'; }",
+                  "width": 65.15543233883191,
+                  "field": "unitPrice",
+                  "checked": true,
+                  "columnId": "unitPrice",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "数量",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "formatter2": "function(value,row,index,options,rowIndex,column){ return value +  ' ' + row.unitCode_dictText; }",
+                  "width": 61.720533008519084,
+                  "field": "quantity",
+                  "checked": true,
+                  "columnId": "quantity",
+                  "fixed": false,
+                  "rowspan": 1,
+                  "colspan": 1
+                },
+                {
+                  "title": "执行次数",
+                  "titleSync": false,
+                  "align": "right",
+                  "halign": "center",
+                  "tableQRCodeLevel": 0,
+                  "tableSummaryTitle": true,
+                  "tableSummary": "",
+                  "width": 80.01119034435662,
+                  "field": "quantity",
+                  "checked": true,
+                  "columnId": "quantity",
+                  "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
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json
index eecf0cb2..809db289 100644
--- a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/templateJson.json
@@ -37,7 +37,7 @@
             "top": 16.5,
             "height": 22.5,
             "width": 120,
-            "title": "医院",
+            "title": "长春大学医院",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontFamily": "Microsoft YaHei",
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
index 5fbced0d..c7d1dfcb 100644
--- a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
@@ -181,7 +181,15 @@
           v-model="projectTypeCode"
           placeholder="项目"
           style="width: 160px"
-          @change="getMedicineList(currentRow.encounterId)"
+          :clearable="false"
+          @change="
+            () => {
+              getList();
+              if (currentRow) {
+                getMedicineList(currentRow?.encounterId);
+              }
+            }
+          "
         >
           <el-option label="全部" value="1" />
           <el-option label="药品" value="2" />
@@ -355,28 +363,6 @@
       @cancel="openTraceNoDialog = false"
     />
   </div>
-
-  <el-dialog title="选择打印机" v-model="showPrinterDialog" width="400px" append-to-body>
-    <el-form>
-      <el-form-item label="请选择打印机：">
-        <el-select v-model="selectedPrinter" placeholder="请选择打印机" style="width: 100%">
-          <el-option
-            v-for="printer in printerList"
-            :key="printer.name"
-            :label="printer.name"
-            :value="printer.name"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="cancelPrinter">取 消</el-button>
-        <el-button type="primary" @click="confirmPrinter">确 定</el-button>
-      </span>
-    </template>
-  </el-dialog>
 </template>
 
 <script setup name="westernmedicine">
@@ -393,6 +379,7 @@ import {
   getReportRegisterInit,
   deviceDispense,
   deviceInvalid,
+  devicePatientList,
 } from './components/api';
 import { advicePrint } from '@/api/public';
 import { formatDate, formatDateStr } from '@/utils/index';
@@ -400,14 +387,7 @@ import { debounce } from 'lodash-es';
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
 // 使用window.hiprint，不再从vue-plugin-hiprint导入
 import templateJson from './components/templateJson.json';
-// import disposalTemplate from './components/disposalTemplate.json';
-import {
-  getPrinterList,
-  getCachedPrinter,
-  savePrinterToCache,
-  selectPrinterAndPrint,
-  executePrint,
-} from '@/utils/his';
+import disposalTemplate from './components/disposalTemplate.json';
 
 const showSearch = ref(true);
 const total = ref(0);
@@ -516,11 +496,37 @@ function getList() {
   queryParams.value.receptionTimeETime = dateRange.value[1] + ' 23:59:59';
 
   console.log('222', queryParams.value);
-  listPatient(queryParams.value).then((response) => {
-    console.log('Full response1:', response);
-    patientList.value = response.data.records;
-    total.value = response.data.total;
-  });
+  if (projectTypeCode.value == 2) {
+    listPatient(queryParams.value).then((response) => {
+      console.log('Full response1:', response);
+      patientList.value = response.data.records;
+      total.value = response.data.total;
+    });
+  } else if (projectTypeCode.value == 3) {
+    debugger;
+    devicePatientList(queryParams.value).then((response) => {
+      console.log('Full response1:', response);
+      patientList.value = response.data.records;
+      total.value = response.data.total;
+    });
+  } else {
+    Promise.all([listPatient(queryParams.value), devicePatientList(queryParams.value)]).then(
+      ([patientRes, deviceRes]) => {
+        // 合并两个接口的数据
+        const patientRecords = patientRes.data.records || [];
+        const deviceRecords = deviceRes.data.records || [];
+        const combinedRecords = [...patientRecords, ...deviceRecords];
+        // 根据 encounterId 去重
+        const uniqueRecords = combinedRecords.filter(
+          (item, index, self) =>
+            index === self.findIndex((record) => record.encounterId === item.encounterId)
+        );
+        patientList.value = uniqueRecords;
+        // 合并总数量（如果需要精确数量，可能需要后端支持）
+        total.value = uniqueRecords.length;
+      }
+    );
+  }
   listInit().then((response) => {
     console.log('Full response2:', response);
     departmentList.value = [{ value: null, label: '全部' }, ...response.data.departmentOptions];
@@ -531,6 +537,7 @@ function getList() {
   });
 }
 //打印中西药处方
+async function printPrescription() {
 // async function printPrescription() {
 //   const selectedRows = tableRef.value.getSelectionRows();
 //   if (selectedRows.length === 0) {
@@ -664,6 +671,30 @@ async function getPrintData() {
     proxy.$modal.msgWarning('未选择要打印的项目，请重新选择');
     return null;
   }
+  let requestIds = selectedRows.map((item) => item.requestId).join(',');
+  const result = [];
+  advicePrint({
+    requestIds: requestIds,
+    isPrescription: projectTypeCode.value == '3' ? undefined : '1',
+  }).then((res) => {
+    if (projectTypeCode.value == '3') {
+      const result = res.data;
+      const printElements = disposalTemplate;
+      var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+      hiprintTemplate.print2(result, {
+        height: 210,
+        width: 148,
+      });
+    } else {
+      const groupedRows = {};
+      res.data.adviceItemList.forEach((row) => {
+        const prescriptionNo = row.prescriptionNo;
+        if (!groupedRows[prescriptionNo]) {
+          groupedRows[prescriptionNo] = [];
+        }
+        row.contractName = res.data.contractName;
+        groupedRows[prescriptionNo].push(row);
+      });
 
   try {
     // 获取打印数据
@@ -688,9 +719,15 @@ async function getPrintData() {
       groupedRows[prescriptionNo].push(row);
     });
 
+      console.log('按处方号分组的结果:', groupedRows);
+
+      // 如果您需要将分组后的数据转换为数组形式
+      const groupedArray = Object.values(groupedRows);
+      console.log('分组后的数组形式:', groupedArray);
     const groupedArray = Object.values(groupedRows);
     const result = [];
 
+      groupedArray.forEach((item, index) => {
     groupedArray.forEach((item) => {
       if (item && item.length > 0) {
         // 从处方列表的第一个条目提取处方信息
@@ -817,6 +854,27 @@ async function previewAndPrint() {
           previewHtml += '<td>' + usageInfo.join('<br/>') + '</td>';
           previewHtml += '</tr>';
         });
+      });
+      console.log(result, 'result');
+      const printElements = templateJson;
+      var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+      hiprintTemplate.print2(result, {
+        height: 210,
+        width: 148,
+      }); //开始打印
+      // 直接打印回调
+      // 发送任务到打印机成功
+      hiprintTemplate.on('printSuccess', function (e) {
+        console.log('打印成功');
+      });
+      // 发送任务到打印机失败
+      hiprintTemplate.on('printError', function (e) {
+        console.log('打印失败');
+      });
+    }
+  });
+}
+
       } else {
         previewHtml += '<tr><td colspan="7" style="text-align: center;">暂无药品信息</td></tr>';
       }
@@ -1185,11 +1243,7 @@ function handleQuery() {
     queryParams.value.receptionTimeETime = null;
   }
   queryParams.value.pageNo = 1;
-  console.log('************', queryParams.value);
-  listPatient(queryParams.value).then((response) => {
-    patientList.value = response.data.records;
-    total.value = response.data.total;
-  });
+  getList();
 }
 
 function countGroupRows(data) {
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/accomplishList.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/accomplishList.vue
new file mode 100644
index 00000000..7df18833
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/accomplishList.vue
@@ -0,0 +1,158 @@
+<template>
+  <div class="awaitList-container">
+    <div class="operate">
+      <el-space>
+        <el-input
+          v-model="queryParams.searchKey"
+          style="max-width: 600px"
+          placeholder="请输入内容"
+          class="input-with-select"
+        >
+        </el-input>
+        <el-button @click="resetQuery">重置</el-button>
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+      </el-space>
+      <el-space>
+        <!-- <el-button>读卡</el-button> -->
+        <!-- <el-button type="primary">无档登记</el-button> -->
+      </el-space>
+    </div>
+    <div class="table-container">
+      <el-table
+        :data="treatHospitalizedData"
+        style="width: 100%"
+        height="100%"
+        show-overflow-tooltip
+      >
+        <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>
+          </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"
+    :inHospitalInfo="inHospitalInfo"
+    title="登记"
+    :registrationType="registrationType"
+    :alreadyEdit="alreadyEdit"
+    :noFile="noFile"
+    @okAct="patientRegisterOK"
+    @cancelAct="cancelAct"
+  />
+</template>
+<script setup >
+import PatientRegister from './patientRegister.vue';
+import { getAdmissionPage, getPatientBasicInfo, getInHospitalInfo } from './api';
+//const { proxy } = getCurrentInstance();
+const emits = defineEmits([]);
+// const props = defineProps({});
+const searchForm = reactive({
+  searchType: 'name',
+  searchKey: '',
+});
+const total = ref();
+const inHospitalInfo = ref({});
+const alreadyEdit = ref(true);
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  searchKey: undefined,
+  registeredFlag: '1',
+  searchKey: '',
+});
+
+const treatHospitalizedData = ref([]);
+const patientRegisterVisible = ref(false);
+const noFile = ref(false);
+const registrationType = ref(true);
+const patient = ref({});
+const doEdit = (row) => {
+  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();
+});
+const activeName = ref('first');
+
+const patientRegisterOK = () => {
+  patientRegisterVisible.value = false;
+  queryParams.value.searchKey = '';
+  emits('okList');
+  resetQuery();
+};
+
+const cancelAct = () => {
+  patientRegisterVisible.value = false;
+};
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+function resetQuery() {
+  queryParams.value = {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    registeredFlag: '1',
+    searchKey: '',
+  };
+  getList();
+}
+
+const getList = () => {
+  getAdmissionPage(queryParams.value).then((res) => {
+    treatHospitalizedData.value = res.data.records;
+    total.value = res.data.total;
+  });
+};
+</script>
+<style lang="scss" scoped>
+.awaitList-container {
+  width: 100%;
+  height: 100%;
+  .operate {
+    display: flex;
+    justify-content: space-between;
+    height: 40px;
+    padding: 0 16px;
+    align-items: center;
+  }
+  .table-container {
+    padding: 8px 16px;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/api.js b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/api.js
new file mode 100644
index 00000000..15571979
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/api.js
@@ -0,0 +1,169 @@
+import request from '@/utils/request'
+
+// 获取住院信息初期数据列表
+export function getInit(query) {
+  return request({
+    url: '/inpatient-manage/init',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取住院信息 分页显示
+// export function getAdmissionPage(query) {
+//   return request({
+//     url: '/inpatient-manage/admission-page',
+//     method: 'get',
+//     params: query
+//   })
+// }
+// 获取住院信息 分页显示 新
+export function getAdmissionPage(query) {
+  return request({
+    url: '/inhospital-charge/register/register-info',
+    method: 'get',
+    params: query
+  })
+}
+
+// 住院无档登记
+export function addAdmissionInfo(data) {
+  return request({
+    url: '/inpatient-manage/admission-information',
+    method: 'post',
+    data: data
+  })
+}
+
+// 住院登记
+export function admissionInfo(data) {
+  return request({
+    url: '/inpatient-manage/admission-information',
+    method: 'put',
+    data: data
+  })
+}
+
+/**
+ * 获取科室下拉列表
+ */
+export function getOrgList() {
+  return request({
+    url: '/base-data-manage/organization/organization',
+    method: 'get',
+  })
+}
+
+/**
+ * 查询病区下拉列表
+ */
+export function wardList() {
+  return request({
+    url: '/app-common/ward-list',
+    method: 'get'
+  })
+}
+
+/**
+ * 获取诊断基础下拉数据
+ */
+export function diagnosisInit() {
+  return request({
+    url: '/doctor-station/diagnosis/init',
+    method: 'get',
+  })
+}
+
+// 查询患者相关
+export function patientlLists() {
+  return request({
+    url: '/patient-manage/information/init',
+    method: 'get'
+  })
+}
+
+// 查询患者相关
+export function doctorList(id) {
+  return request({
+    url: '/inpatient-manage/doctor-list?orgId=' + id,
+    method: 'get'
+  })
+}
+
+// 查询患者相关
+export function getPatientInfo(id, statusEnum) {
+  return request({
+    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/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/awaitList.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/awaitList.vue
new file mode 100644
index 00000000..2078561e
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/awaitList.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="awaitList-container">
+    <div class="operate">
+      <el-space>
+        <el-input
+          v-model="queryParams.searchKey"
+          style="max-width: 600px"
+          placeholder="请输入内容"
+          class="input-with-select"
+          @keydown.enter="handleQuery"
+        >
+        </el-input>
+        <el-button @click="resetQuery">重置</el-button>
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+      </el-space>
+      <el-space>
+        <!-- <el-button>读卡</el-button> -->
+        <el-button type="primary" @click="doRegistering('no-file')">无档登记</el-button>
+      </el-space>
+    </div>
+    <div class="table-container">
+      <el-table
+        :data="treatHospitalizedData"
+        style="width: 100%"
+        height="100%"
+        show-overflow-tooltip
+      >
+        <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" link @click="doRegistering(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>
+    <PatientRegister
+      v-model="patientRegisterVisible"
+      :patientInfo="patient"
+      :inHospitalInfo="inHospitalInfo"
+      title="登记"
+      :registrationType="registrationType"
+      @okAct="patientRegisterOK"
+      @cancelAct="cancelAct"
+      :noFile="noFile"
+    />
+  </div>
+</template>
+<script setup>
+import PatientRegister from './patientRegister.vue';
+import { getAdmissionPage, getPatientBasicInfo, getInHospitalInfo } from './api';
+const emits = defineEmits(['okList']);
+
+const total = ref();
+const patient = ref({});
+const inHospitalInfo = ref({});
+const noFile = ref(false);
+const registrationType = ref(true);
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  searchKey: undefined,
+  registeredFlag: '0',
+  searchKey: '',
+});
+
+const treatHospitalizedData = ref([]);
+const doRegistering = (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;
+    });
+  }
+};
+
+const getList = () => {
+  getAdmissionPage(queryParams.value).then((res) => {
+    treatHospitalizedData.value = res.data.records;
+    total.value = res.data.total;
+  });
+};
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+function resetQuery() {
+  queryParams.value = {
+    pageNo: 1,
+    pageSize: 10,
+    searchKey: undefined,
+    registeredFlag: '0',
+    searchKey: '',
+  };
+  getList();
+}
+const patientRegisterVisible = ref(false);
+const patientYbRegisterVisible = ref(false);
+
+const patientRegisterOK = () => {
+  patientRegisterVisible.value = false;
+  queryParams.value.searchKey = '';
+  emits('okList');
+};
+
+const cancelAct = () => {
+  patientRegisterVisible.value = false;
+};
+
+getList();
+</script>
+<style lang="scss" scoped>
+.awaitList-container {
+  width: 100%;
+  height: 100%;
+  .operate {
+    display: flex;
+    justify-content: space-between;
+    height: 40px;
+    padding: 0 16px;
+    align-items: center;
+  }
+  .table-container {
+    padding: 8px 16px;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/existList.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/existList.vue
new file mode 100644
index 00000000..e7514ef4
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/existList.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="awaitList-container">
+    <div class="operate">
+      <el-space>
+        <el-input
+          v-model="searchForm.searchVal"
+          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>重置</el-button>
+        <el-button type="primary">查询</el-button>
+      </el-space>
+      <el-space>
+        <!-- <el-button>读卡</el-button>
+        <el-button type="primary">无档登记</el-button> -->
+      </el-space>
+    </div>
+    <div class="table-container">
+      <el-table
+        :data="treatHospitalizedData"
+        style="width: 100%"
+        height="100%"
+        show-overflow-tooltip
+      >
+        <el-table-column type="index" width="54" label="序号" />
+        <el-table-column prop="storageName" label="申请来源"> </el-table-column>
+        <el-table-column prop="createdDate" label="申请时间" min-width="160" />
+        <el-table-column prop="name" label="申请患者" />
+        <el-table-column prop="deptNurseName" label="入院病区" />
+        <el-table-column prop="sexName" label="性别" />
+        <el-table-column prop="purchaseTotalAmount" label="年龄"> </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script setup >
+import { getAdmissionPage } from './api';
+//const { proxy } = getCurrentInstance();
+const emits = defineEmits([]);
+// const props = defineProps({});
+const searchForm = reactive({
+  searchType: 'name',
+  searchVal: '',
+});
+
+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();
+});
+// defineExpose({ state });
+
+const getList = () => {
+  getAdmissionPage(queryParams.value).then((res) => {
+    treatHospitalizedData.value = res.data.records;
+    total.value = res.data.total;
+  });
+};
+
+const activeName = ref('first');
+
+// const handleClick = (tab: TabsPaneContext, event: Event) => {
+//   console.log(tab, event);
+// };
+</script>
+<style lang="scss" scoped>
+.awaitList-container {
+  width: 100%;
+  height: 100%;
+  .operate {
+    display: flex;
+    justify-content: space-between;
+    height: 40px;
+    padding: 0 16px;
+    align-items: center;
+  }
+  .table-container {
+    padding: 8px 16px;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/index.js b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/index.js
new file mode 100644
index 00000000..ab87123d
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/index.js
@@ -0,0 +1,4 @@
+import  AwaitList  from "./awaitList.vue";
+import  AccomplishList  from "./accomplishList.vue";
+import  ExistList  from "./existList.vue";
+export  {AwaitList,AccomplishList,ExistList}
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientInfo.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientInfo.vue
new file mode 100644
index 00000000..20b45092
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientInfo.vue
@@ -0,0 +1,407 @@
+<template>
+  <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"
+      >
+        {{ 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="!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?.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-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?.ybClassEnum_enumText || '-' }}</el-text>
+          <!-- TODO -->
+          <svg-icon size="20" icon-class="hipEdit" style="cursor: pointer" @click="changFeeType" />
+        </el-col>
+      </el-row>
+      <el-row class="patientInfos">
+        <el-col :span="2" class="patInfo-label">
+          <el-text truncated>证件类型：</el-text>
+        </el-col>
+        <!-- TODO -->
+        <el-col :span="4" class="patInfo-value">
+          <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-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-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-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">
+          <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">
+          <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">
+          <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">
+          <div>{{ patientInfo?.maritalStatusEnum_enumText || '-' }}</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">
+          <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">
+          <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">
+          <div>{{ patientInfo?.address || '-' }}</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">
+          <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">
+          <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">
+          <div>{{ patientInfo?.organizationId_dictText || '-' }}</div>
+        </el-col>
+        <el-col :span="2" class="patInfo-label">
+          <el-text truncated>单位名称：</el-text>
+        </el-col>
+        <el-col :span="4" class="patInfo-value">
+          <div>{{ patientInfo?.workCompany || '-' }}</div>
+        </el-col>
+      </el-row>
+    </div>
+    <div v-else>
+      <PatientInfoForm ref="patientInfoFormRef" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, watch } from 'vue';
+import PatientInfoForm from './patientInfoForm.vue';
+import { patientlLists, getOrgList } from './api';
+
+const typeList = ref({});
+const patientInfoFormRef = ref();
+const props = defineProps({
+  patientInfo: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  registrationType: {
+    type: [String, Boolean, Number], // 根据实际类型调整
+    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();
+});
+
+// 编辑状态
+const isEditing = ref(false);
+
+watch(
+  () => props.registrationType,
+  (newValue) => {
+    isEditing.value = !newValue;
+  },
+  { immediate: true }
+);
+
+watch(
+  () => props.patientInfo,
+  (newValue) => {},
+  { immediate: true }
+);
+
+function getInitOptions() {
+  patientlLists().then((res) => {
+    typeList.value = res.data;
+  });
+  getOrgList().then((res) => {
+    organization.value = res.data.records;
+  });
+}
+
+// 表单数据
+const form = reactive({});
+
+// 切换编辑状态
+const toggleEdit = () => {
+  if (!isEditing.value) {
+    // 取消时恢复原值
+    Object.assign(form, props.patientInfo);
+  }
+  isEditing.value = !isEditing.value;
+};
+
+// 提交表单
+const submitForm = async (callback) => {
+  console.log('提交更新:', form);
+  if (!registerRef.value) return false;
+  registerRef.value.validate((valid) => {
+    if (valid) {
+      callback();
+      return true;
+    } else {
+      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, isEditing, getPatientForm });
+</script>
+
+<style lang="scss" scoped>
+.patientInfo-container {
+  .operate {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 32px;
+    border-radius: 4px 4px 0px 0px;
+    background: rgba(37, 109, 149, 0.05);
+    padding-left: 16px;
+    color: var(--hip-color-primary-light);
+    font-weight: bold;
+    margin-bottom: 8px;
+  }
+
+  > .patientInfos {
+    margin-bottom: 16px;
+
+    &: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/ybmanagement/inhospital/register/components/patientInfoForm.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientInfoForm.vue
new file mode 100644
index 00000000..9730e335
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/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/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientRegister.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientRegister.vue
new file mode 100644
index 00000000..cc08aaea
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/patientRegister.vue
@@ -0,0 +1,317 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    top="6vh"
+    :width="width"
+    :title="props.title"
+    @open="openAct"
+    @closed="closedAct"
+    :z-index="20"
+    destroy-on-close
+  >
+    <el-scrollbar height="650px">
+      <PatientInfoComp
+        :patientInfo="props.patientInfo"
+        :registrationType="props.registrationType"
+        :initOptions="initOptions"
+        :noFile="noFile"
+        ref="patientInfoRef"
+        @onChangFeeType="onChangFeeType"
+      />
+      <!-- <PatientRelationList
+        class="relationList"
+        :patCode="patientInfo.code"
+        ref="PatientRelationListRef"
+      /> -->
+      <!--联系人组件  -->
+      <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">
+        <el-space>
+          <div>缴费预交金</div>
+          <el-input
+            style="width: 142px"
+            placeholder="请输入"
+            v-model="advance"
+            @input="handleAdvanceInput"
+            :formatter="handleAdvanceFormatter"
+            :parser="handleAdvanceParser"
+          ></el-input>
+          <div
+            class="feeType"
+            :class="currentFeeType == typeitem.type ? 'activeFeeType' : ''"
+            v-for="typeitem in feeTypeOptions"
+            :key="typeitem.type"
+            @click="currentFeeType = typeitem.type"
+          >
+            <svg-icon
+              :icon-class="typeitem.type"
+              :color="currentFeeType == typeitem.type ? '#13C0B3' : '#666666'"
+              height="18px"
+              width="18px"
+              style="margin-right: 4px"
+            />
+            {{ typeitem.label }}
+          </div>
+        </el-space>
+      </div>
+      <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"3
+      /> -->
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+const { proxy } = getCurrentInstance();
+import { ElMessageBox } from 'element-plus';
+import PatientInfoComp from './patientInfo.vue';
+import RegisterForm from './registerForm.vue';
+import { noFilesRegister, registerInHospital, getInit } from './api';
+const emits = defineEmits(['okAct', 'cancelAct']);
+
+const props = defineProps({
+  title: '',
+  registrationType: {
+    type: [String, Boolean, Number], // 根据实际类型调整
+    default: null, // 或者 false、'' 等
+  },
+  patientInfo: {
+    type: Object,
+  },
+  inHospitalInfo: {
+    type: Object,
+  },
+  alreadyEdit: {
+    type: Boolean,
+    default: false,
+  },
+  noFile: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+watch(
+  () => props.registrationType,
+  (newValue) => {
+    console.log('registrationType changed:', newValue);
+  },
+  { immediate: true }
+);
+
+const dialogVisible = defineModel('dialogVisible', {
+  type: Boolean,
+  default: false,
+});
+const code = defineModel('code');
+import { ElMessage } from 'element-plus';
+const width = '1128px';
+const patientApiInfo = ref({});
+const initOptions = ref({});
+
+/* 取消 */
+const cancelAct = () => {
+  emits('cancelAct');
+};
+const patientInfoRef = ref();
+
+/* 预交金 */
+const advancePaymentVisible = ref(false);
+/* 保存 */
+const handleSubmit = () => {
+  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);
+        }
+      }
+      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);
+          }
+        });
+      };
+
+      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 = props.inHospitalInfo.balanceAmount || 0;
+  advancePaymentVisible.value = false;
+  RegisterFormRef.value.init();
+};
+const closedAct = () => {
+  dialogVisible.value = false;
+  if (patientInfoRef.value?.isEditing) {
+    patientInfoRef.value.isEditing = false;
+  }
+};
+
+onMounted(() => {
+  getInit().then((res) => {
+    initOptions.value = res.data;
+  });
+});
+
+/* 登记 */
+const RegisterFormRef = ref();
+
+const feeTypeOptions = reactive([
+  {
+    type: 'hipCash',
+    label: '现金',
+  },
+  {
+    type: 'hipAlipay',
+    label: '支付宝',
+  },
+  {
+    type: 'wechat',
+    label: '微信',
+  },
+  {
+    type: 'hipPayCard',
+    label: '银行卡',
+  },
+]);
+const advance = ref('0.00');
+const currentFeeType = ref('hipCash');
+/* 预交金录入框格式 */
+const handleAdvanceInput = (value) => {
+  if (value.length === 1 && value === '.') {
+    value = '0.';
+  } else {
+    advance.value = value.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1');
+  }
+};
+const handleAdvanceFormatter = (value) => {
+  return `¥ ${value}`;
+};
+const handleAdvanceParser = (value) => {
+  return value.replace(/\$\s?|(,*)/g, '');
+};
+const medicalInsuranceVisible = ref(false);
+const medicalInsuranceTitle = ref('');
+
+/* 患者费别变更 */
+const onChangFeeType = () => {
+  medicalInsuranceTitle.value = '医保信息'; //医保信息、医保登记
+  medicalInsuranceVisible.value = true;
+};
+
+/*  */
+</script>
+<style lang="scss" scoped>
+.patientRegister-container {
+  height: 700px;
+  overflow-y: auto;
+}
+
+.advance-container {
+  width: 660px;
+  display: flex;
+
+  .feeType {
+    display: flex;
+    align-items: center;
+    height: 32px;
+    padding: 0px 8px;
+    color: #666666;
+    border-radius: 4px;
+    cursor: pointer;
+
+    :deep(.svg-icon) {
+      color: #666666;
+    }
+  }
+
+  .activeFeeType {
+    color: #13c0b3;
+    background: rgba(19, 192, 179, 0.1);
+
+    :deep(.svg-icon) {
+      color: #13c0b3;
+    }
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/registerForm.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/registerForm.vue
new file mode 100644
index 00000000..652a373a
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/components/registerForm.vue
@@ -0,0 +1,440 @@
+<template>
+  <div class="registerForm-container">
+    <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="encounterBusNo">
+            {{ submitForm.busNo ? submitForm.busNo : '-' }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="住院次数:" prop="hospitalizationCount" autocomplete="off">
+            {{ submitForm.inHospitalCount }}
+          </el-form-item>
+        </el-col>
+        <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 :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.totalBedsNum ? submitForm.idleBedsNum + '/' + submitForm.totalBedsNum : '-'
+            }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <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 med_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <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 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="患者病情">
+            <el-select v-model="submitForm.priorityEnum">
+              <el-option
+                v-for="item in props.initOptions.priorityEnumList"
+                :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="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-col :span="6">
+          <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.startTime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="date"
+              placeholder="请选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script setup>
+import {
+  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 { formatDateStr } from '@/utils';
+const emits = defineEmits([]);
+const props = defineProps({
+  patientInfo: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  inHospitalInfo: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  initOptions: {
+    type: Object,
+    require: true,
+    default: () => ({}),
+  },
+  alreadyEdit: {
+    type: Boolean,
+    default: false,
+  },
+  noFile: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const organization = ref([]);
+const wardListOptions = ref([]);
+const contractList = ref([]);
+const verificationStatusOptions = ref([]);
+const diagnosisDefinitionList = ref([]);
+const rules = reactive({
+  inHospitalOrgId: [
+    {
+      required: true,
+      message: '入院科室未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  wardLocationId: [
+    {
+      required: true,
+      message: '入院病区未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  startTime: [
+    {
+      required: true,
+      message: '入院日期未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  diagnosisDefinitionId: [
+    {
+      required: true,
+      message: '入院诊断未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+  diagnosisDesc: [
+    {
+      required: true,
+      message: '诊断描述未填写',
+      trigger: ['blur', 'change'],
+    },
+  ],
+});
+
+/* 提交表单 */
+const submitForm = reactive({
+  inHospitalOrgId: props.inHospitalInfo.inHospitalOrgId,
+  ambDoctorPractitionerName: props.inHospitalInfo.ambDoctorPractitionerName,
+  wardLocationId: props.inHospitalInfo.wardLocationId, // 入院护理组编码
+  admitSourceCode: '', // 患者入院类型（字典：PatientSource）
+  inWayCode: '', // 入院方式（字典InpWay）
+  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) {
+      if (newValue == '') {
+        submitForm.wardLocationId = '';
+      }
+    } else {
+      submitForm.wardLocationId = '';
+    }
+  }
+);
+
+watch(
+  () => submitForm.inNurseDeptCode,
+  (newValue) => {
+    if (newValue) {
+      getBedInfo(newValue);
+    }
+  }
+);
+
+onMounted(() => {
+  getInitOptions();
+  setValue();
+});
+
+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;
+  });
+  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 getDiagnosisInfo(value) {
+  getDiagnosisDefinitionList({ pageSize: 500, pageNo: 1, searchKey: value }).then((res) => {
+    diagnosisDefinitionList.value = res.data.records;
+  });
+}
+
+function handleNodeClick(orgInfo) {
+  wardList({ orgId: orgInfo.id }).then((res) => {
+    wardListOptions.value = res.data;
+  });
+}
+
+function handleChange(value) {
+  if (!value) {
+    wardListOptions.value = [];
+    submitForm.wardLocationId = undefined;
+  }
+}
+
+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();
+/* 登记 */
+const validateData = async (callback) => {
+  if (!registerRef.value) return false;
+  registerRef.value.validate((valid) => {
+    if (valid) {
+      callback();
+      return true;
+    } else {
+      return false;
+    }
+  });
+};
+
+const init = () => {
+  submitForm.inDocterWorkGroupCode = '';
+  submitForm.wardLocationId = '';
+};
+defineExpose({ validateData, submitForm, init });
+</script>
+<style lang="scss" scoped>
+.registerForm-container {
+  margin-top: 16px;
+
+  .operate {
+    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-bottom: 8px;
+  }
+
+  .register-from {
+    padding: 0 8px;
+  }
+
+  :deep(.el-form-item) {
+    width: 100%;
+    margin-right: 0px;
+  }
+}
+</style>
diff --git a/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/index.vue b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/index.vue
new file mode 100644
index 00000000..b6fd4097
--- /dev/null
+++ b/openhis-ui-vue3/src/views/ybmanagement/inhospital/register/index.vue
@@ -0,0 +1,31 @@
+<template>
+  <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>
+      <el-tab-pane label="已登记入院" name="second">
+        <AccomplishList v-if="activeName === 'second'" />
+      </el-tab-pane>
+      <!-- <el-tab-pane label="在院患者" name="third">
+        <ExistListt />
+      </el-tab-pane> -->
+    </el-tabs>
+  </div>
+</template>
+<script setup>
+import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
+import { AwaitList, AccomplishList, ExistList } from './components/index.js';
+const { proxy } = getCurrentInstance();
+const emits = defineEmits([]);
+const props = defineProps({});
+const state = reactive({});
+defineExpose({ state });
+const activeName = ref('first');
+
+</script>
+<style lang="scss" scoped>
+.sds {
+  background-color: red;
+}
+</style>
diff --git a/openhis-ui-vue3/vite.config.js b/openhis-ui-vue3/vite.config.js
index 9380a8a4..6ad38961 100644
--- a/openhis-ui-vue3/vite.config.js
+++ b/openhis-ui-vue3/vite.config.js
@@ -40,7 +40,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://localhost:18080/openhis',
+         target: 'http://localhost:18080/openhis',
           changeOrigin: true,
           rewrite: p => p.replace(/^\/dev-api/, ''),
         },
diff --git a/发版记录/2025-11-12/HIS-管理系统-调价管理.docx b/发版记录/2025-11-12/HIS-管理系统-调价管理.docx
new file mode 100644
index 00000000..54c9b60f
Binary files /dev/null and b/发版记录/2025-11-12/HIS-管理系统-调价管理.docx differ
diff --git a/发版记录/2025-11-12/发版日志.docx b/发版记录/2025-11-12/发版日志.docx
new file mode 100644
index 00000000..4ad7e843
Binary files /dev/null and b/发版记录/2025-11-12/发版日志.docx differ
diff --git a/迁移记录-DB变更记录/0000add_table__MigrationsHistory迁移记录表,在初始化脚本执行完成后执行.sql b/迁移记录-DB变更记录/0000add_table__MigrationsHistory迁移记录表,在初始化脚本执行完成后执行.sql
new file mode 100644
index 00000000..28323574
--- /dev/null
+++ b/迁移记录-DB变更记录/0000add_table__MigrationsHistory迁移记录表,在初始化脚本执行完成后执行.sql
@@ -0,0 +1,16 @@
+-- 创建 __MigrationsHistory 表（迁移历史表）
+CREATE TABLE __MigrationsHistory (
+    -- 迁移ID：唯一标识一条迁移记录，非空
+    MigrationId VARCHAR(150) NOT NULL,
+    -- 产品版本：记录迁移对应的框架/产品版本，非空
+    ProductVersion VARCHAR(32) NOT NULL,
+    -- 主键约束：确保 MigrationId 唯一（迁移记录不可重复）
+    CONSTRAINT pk___migrationshistory PRIMARY KEY (MigrationId)
+);
+
+-- 为表添加备注
+COMMENT ON TABLE __MigrationsHistory IS '用于记录数据库迁移历史的表，跟踪每次迁移的执行情况';
+
+-- 为字段添加备注
+COMMENT ON COLUMN __MigrationsHistory.MigrationId IS '迁移操作的唯一标识符，用于区分不同的迁移脚本';
+COMMENT ON COLUMN __MigrationsHistory.ProductVersion IS '执行迁移时使用的产品/框架版本，用于版本兼容性检查';
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/0000清库脚本.sql b/迁移记录-DB变更记录/0000清库脚本.sql
new file mode 100644
index 00000000..92d11501
--- /dev/null
+++ b/迁移记录-DB变更记录/0000清库脚本.sql
@@ -0,0 +1,7 @@
+TRUNCATE TABLE adm_encounter ;-- 清空就诊记录表
+TRUNCATE TABLE adm_encounter_location;-- 清空就诊地点表
+TRUNCATE TABLE adm_encounter_reason;-- 清空就诊原因表
+TRUNCATE TABLE adm_encounter_diagnosis;-- 清空就诊诊断表
+TRUNCATE TABLE adm_encounter_participant;-- 清空就诊参与者表
+TRUNCATE TABLE adm_charge_item;-- 清空费用项目表
+TRUNCATE TABLE elep_medication_request;-- 清空用药申请表
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509021111add_table_doc_order_process.sql b/迁移记录-DB变更记录/202509021111add_table_doc_order_process.sql
new file mode 100644
index 00000000..7a886cc5
--- /dev/null
+++ b/迁移记录-DB变更记录/202509021111add_table_doc_order_process.sql
@@ -0,0 +1,72 @@
+ -- 创建序列
+	CREATE SEQUENCE doc_order_process_id_seq
+		START WITH 1
+		INCREMENT BY 1
+		NO MINVALUE
+		NO MAXVALUE
+		CACHE 1;
+
+
+CREATE TABLE "public"."doc_order_process" (
+  "id" int8 NOT NULL DEFAULT nextval('doc_order_process_id_seq'::regclass),
+  "name" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "encounter_id" int8 NOT NULL,
+  "request_id" int8 NOT NULL,
+  "request_table_name" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "original_organization_id" int8 DEFAULT NULL,
+  "target_organization_id" int8 DEFAULT NULL,
+  "original_location_id" int8 DEFAULT NULL,
+  "target_location_id" int8 DEFAULT NULL,
+  "out_way_code" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "tenant_id" int8 NOT NULL,
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 0,
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "create_time" timestamptz(6) NOT NULL,
+  "update_by" varchar(32) COLLATE "pg_catalog"."default",
+  "update_time" timestamptz(6),
+  CONSTRAINT "doc_order_process_pkey" PRIMARY KEY ("id")
+)
+;
+
+ALTER TABLE "public"."doc_order_process" 
+  OWNER TO "postgres";
+
+COMMENT ON COLUMN "public"."doc_order_process"."id" IS 'ID';
+
+COMMENT ON COLUMN "public"."doc_order_process"."name" IS '名称';
+
+COMMENT ON COLUMN "public"."doc_order_process"."encounter_id" IS '就诊id';
+
+COMMENT ON COLUMN "public"."doc_order_process"."request_id" IS '请求id';
+
+COMMENT ON COLUMN "public"."doc_order_process"."request_table_name" IS '请求表名';
+
+COMMENT ON COLUMN "public"."doc_order_process"."original_organization_id" IS '原科室';
+
+COMMENT ON COLUMN "public"."doc_order_process"."target_organization_id" IS '目标科室';
+
+COMMENT ON COLUMN "public"."doc_order_process"."original_location_id" IS '原病区';
+
+COMMENT ON COLUMN "public"."doc_order_process"."target_location_id" IS '目标病区';
+
+COMMENT ON COLUMN "public"."doc_order_process"."out_way_code" IS '出院方式';
+
+COMMENT ON COLUMN "public"."doc_order_process"."tenant_id" IS '租户ID';
+
+COMMENT ON COLUMN "public"."doc_order_process"."delete_flag" IS '删除状态';
+
+COMMENT ON COLUMN "public"."doc_order_process"."create_by" IS '创建人';
+
+COMMENT ON COLUMN "public"."doc_order_process"."create_time" IS '创建时间';
+
+COMMENT ON COLUMN "public"."doc_order_process"."update_by" IS '更新人';
+
+COMMENT ON COLUMN "public"."doc_order_process"."update_time" IS '更新时间';
+
+COMMENT ON TABLE "public"."doc_order_process" IS '医嘱过程表';	
+
+
+
+-- 向迁移历史表插入记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509021111add_table_doc_order_process', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509031200add_table_doc_statistics.sql b/迁移记录-DB变更记录/202509031200add_table_doc_statistics.sql
new file mode 100644
index 00000000..54f98085
--- /dev/null
+++ b/迁移记录-DB变更记录/202509031200add_table_doc_statistics.sql
@@ -0,0 +1,62 @@
+-- 1. 创建 doc_statistics 表的主键序列（自增ID用，与 doc_order_process 序列逻辑一致）
+CREATE SEQUENCE doc_statistics_id_seq
+    START WITH 1               -- 序列起始值
+    INCREMENT BY 1             -- 每次递增1
+    NO MINVALUE                -- 无最小值限制
+    NO MAXVALUE                -- 无最大值限制
+    CACHE 1;                   -- 缓存1个值提升性能
+
+
+-- 2. 创建 doc_statistics 表（字段类型、约束与实体类属性一一对应）
+CREATE TABLE "public"."doc_statistics" (
+  "id" int8 NOT NULL DEFAULT nextval('doc_statistics_id_seq'::regclass),  -- 主键，关联序列自增
+  "record_id" int8 DEFAULT NULL,                                          -- 记录ID（对应实体类 recordId）
+  "statistic_definition_id" int8 DEFAULT NULL,                            -- 统计项定义ID（对应 statisticDefinitionId）
+  "encounter_id" int8 DEFAULT NULL,                                       -- 就诊ID（对应 encounterId）
+  "patient_id" int8 DEFAULT NULL,                                         -- 患者ID（对应 patientId）
+  "statistic_definition_code" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,  -- 统计项编码（对应 statisticDefinitionCode，长度适配业务需求）
+  "organization_id" int8 DEFAULT NULL,                                    -- 记录科室ID（对应 organizationId）
+  "value" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,  -- 统计值（对应 value，用varchar兼容多种数据类型）
+  "record_time" timestamp(6) DEFAULT NULL,                                -- 记录时间（对应 recordTime，实体类为Date，PostgreSQL用timestamp存储）
+  "source" varchar(100) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,  -- 记录来源（对应 source）
+  "tenant_id" int8 NOT NULL DEFAULT 1,                                    -- 租户ID（通用字段，与 doc_order_process 保持一致，默认值可根据业务调整）
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT '0',  -- 删除状态（0=未删除，1=已删除，与 doc_order_process 逻辑一致）
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,  -- 创建人（继承 HisBaseEntity 通用字段）
+  "create_time" timestamptz(6) NOT NULL,                                  -- 创建时间（继承 HisBaseEntity，带时区，与 doc_order_process 一致）
+  "update_by" varchar(32) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,  -- 更新人（继承 HisBaseEntity）
+  "update_time" timestamptz(6) DEFAULT NULL,                              -- 更新时间（继承 HisBaseEntity，带时区）
+  CONSTRAINT "doc_statistics_pkey" PRIMARY KEY ("id")                     -- 主键约束
+)
+;
+
+
+-- 3. 设置表所有者（与 doc_order_process 保持一致，默认为 postgres）
+ALTER TABLE "public"."doc_statistics" 
+  OWNER TO "postgres";
+
+
+-- 4. 字段注释（与实体类注释完全对应，便于维护）
+COMMENT ON COLUMN "public"."doc_statistics"."id" IS '主键ID';
+COMMENT ON COLUMN "public"."doc_statistics"."record_id" IS '记录ID';
+COMMENT ON COLUMN "public"."doc_statistics"."statistic_definition_id" IS '统计项定义ID';
+COMMENT ON COLUMN "public"."doc_statistics"."encounter_id" IS '就诊ID';
+COMMENT ON COLUMN "public"."doc_statistics"."patient_id" IS '患者ID';
+COMMENT ON COLUMN "public"."doc_statistics"."statistic_definition_code" IS '统计项编码';
+COMMENT ON COLUMN "public"."doc_statistics"."organization_id" IS '记录科室ID';
+COMMENT ON COLUMN "public"."doc_statistics"."value" IS '统计值';
+COMMENT ON COLUMN "public"."doc_statistics"."record_time" IS '记录时间（格式：yyyy-MM-dd HH:mm:ss）';
+COMMENT ON COLUMN "public"."doc_statistics"."source" IS '记录来源';
+COMMENT ON COLUMN "public"."doc_statistics"."tenant_id" IS '租户ID';
+COMMENT ON COLUMN "public"."doc_statistics"."delete_flag" IS '删除状态（0=未删除，1=已删除）';
+COMMENT ON COLUMN "public"."doc_statistics"."create_by" IS '创建人';
+COMMENT ON COLUMN "public"."doc_statistics"."create_time" IS '创建时间';
+COMMENT ON COLUMN "public"."doc_statistics"."update_by" IS '更新人';
+COMMENT ON COLUMN "public"."doc_statistics"."update_time" IS '更新时间';
+
+-- 5. 表注释
+COMMENT ON TABLE "public"."doc_statistics" IS '文档统计表（存储各类统计项数据，如医嘱统计、患者数据统计等）';
+
+
+-- 插入新的迁移历史记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509031200add_table_doc_statistics', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509031300alter_table_doc_statistics_definiton.sql b/迁移记录-DB变更记录/202509031300alter_table_doc_statistics_definiton.sql
new file mode 100644
index 00000000..1fa3920a
--- /dev/null
+++ b/迁移记录-DB变更记录/202509031300alter_table_doc_statistics_definiton.sql
@@ -0,0 +1,8 @@
+   ALTER TABLE "public"."doc_statistics_definition" 
+  ADD COLUMN "unit" varchar(50) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."doc_statistics_definition"."unit" IS '统计值单位（如“次”“mg”“分钟”等）';
+   
+   -- 插入文档统计表格结构修改的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509031300alter_table_doc_statistics_definiton', '1.0.0');
+
diff --git a/迁移记录-DB变更记录/202509040915alter_table_xx_request.sql b/迁移记录-DB变更记录/202509040915alter_table_xx_request.sql
new file mode 100644
index 00000000..494951a1
--- /dev/null
+++ b/迁移记录-DB变更记录/202509040915alter_table_xx_request.sql
@@ -0,0 +1,58 @@
+ALTER TABLE "public"."med_medication_request" 
+ALTER COLUMN "quantity" TYPE numeric(20,6),
+ALTER COLUMN "quantity" SET DEFAULT 0,
+ALTER COLUMN "quantity" SET NOT NULL;
+
+ALTER TABLE "public"."med_medication_request" 
+ALTER COLUMN "chinese_herbs_dose_quantity" TYPE numeric(20,6),
+ALTER COLUMN "chinese_herbs_dose_quantity" SET DEFAULT 0;
+
+
+ALTER TABLE "public"."wor_service_request" 
+ALTER COLUMN "quantity" TYPE numeric(20,6),
+ALTER COLUMN "quantity" SET DEFAULT 0,
+ALTER COLUMN "quantity" SET NOT NULL;
+
+
+ALTER TABLE "public"."wor_device_request" 
+ALTER COLUMN "quantity" TYPE numeric(20,6),
+ALTER COLUMN "quantity" SET DEFAULT 0,
+ALTER COLUMN "quantity" SET NOT NULL;
+
+
+ALTER TABLE "public"."adm_charge_item" 
+ALTER COLUMN "quantity_value" TYPE numeric(20,6),
+ALTER COLUMN "quantity_value" SET DEFAULT 0,
+ALTER COLUMN "quantity_value" SET NOT NULL;
+
+ALTER TABLE "public"."med_medication_dispense" 
+ALTER COLUMN "quantity" TYPE numeric(20,6),
+ALTER COLUMN "quantity" SET DEFAULT 0,
+ALTER COLUMN "quantity" SET NOT NULL;
+
+ALTER TABLE "public"."wor_device_dispense" 
+ALTER COLUMN "quantity" TYPE numeric(20,6),
+ALTER COLUMN "quantity" SET DEFAULT 0,
+ALTER COLUMN "quantity" SET NOT NULL;
+
+
+ALTER TABLE "public"."med_medication_dispense" 
+ALTER COLUMN "dispense_quantity" TYPE numeric(20,6),
+ALTER COLUMN "dispense_quantity" SET DEFAULT 0,
+ALTER COLUMN "dispense_quantity" SET NOT NULL;
+
+ALTER TABLE "public"."wor_device_dispense" 
+ALTER COLUMN "dispense_quantity" TYPE numeric(20,6),
+ALTER COLUMN "dispense_quantity" SET DEFAULT 0,
+ALTER COLUMN "dispense_quantity" SET NOT NULL;
+
+
+
+ALTER TABLE "public"."tmp_activity_device" 
+ALTER COLUMN "quantity" TYPE numeric(20,6),
+ALTER COLUMN "quantity" SET DEFAULT 0,
+ALTER COLUMN "quantity" SET NOT NULL;
+
+-- 插入修改xx_request表的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509040915alter_table_xx_request', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509041015add_column_wor_service_request.sql b/迁移记录-DB变更记录/202509041015add_column_wor_service_request.sql
new file mode 100644
index 00000000..89d7fb3c
--- /dev/null
+++ b/迁移记录-DB变更记录/202509041015add_column_wor_service_request.sql
@@ -0,0 +1,7 @@
+   ALTER TABLE "public"."wor_service_request" 
+  ADD COLUMN "rate_code" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."wor_service_request"."rate_code" IS '用药频次';
+   
+   -- 插入添加wor_service_request列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509041015add_column_wor_service_request', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509041017 insert_sys_menu.sql b/迁移记录-DB变更记录/202509041017 insert_sys_menu.sql
new file mode 100644
index 00000000..e3ef3072
--- /dev/null
+++ b/迁移记录-DB变更记录/202509041017 insert_sys_menu.sql	
@@ -0,0 +1,46 @@
+INSERT INTO "public"."sys_menu" (
+  "menu_name",
+  "parent_id",
+  "order_num",
+  "path",
+  "component",
+  "query",
+  "route_name",
+  "is_frame",
+  "is_cache",
+  "menu_type",
+  "visible",
+  "status",
+  "perms",
+  "icon",
+  "create_by",
+  "create_time",
+  "update_by",
+  "update_time",
+  "remark"
+)
+VALUES
+(
+  '药房月结',
+  376,
+  9,
+  'pharmacyMonthlybalance',
+  'medicationmanagement/statisticalManagement/pharmacyMonthlybalance',
+  NULL,
+  NULL,
+  '1',
+  '0',
+  'C',
+  '0',
+  '0',
+  NULL,
+  NULL,
+  'admin',
+  '2025-09-01 16:38:52.620255',
+  NULL,
+  NULL,
+  NULL
+);
+-- 插入系统菜单数据插入的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509041017insert_sys_menu', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql b/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql
new file mode 100644
index 00000000..0a25302b
--- /dev/null
+++ b/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql
@@ -0,0 +1,55 @@
+ -- 创建序列
+	CREATE SEQUENCE tmp_orders_group_package_id_seq
+		START WITH 1
+		INCREMENT BY 1
+		NO MINVALUE
+		NO MAXVALUE
+		CACHE 1;
+
+
+CREATE TABLE "public"."tmp_orders_group_package" (
+  "id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_id_seq'::regclass),
+  "name" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "package_type_enum" int4 NOT NULL,
+  "organization_id" int8 DEFAULT NULL,
+  "practitioner_id" int8 DEFAULT NULL,
+  "tenant_id" int8 NOT NULL,
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 0,
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "create_time" timestamptz(6) NOT NULL,
+  "update_by" varchar(32) COLLATE "pg_catalog"."default",
+  "update_time" timestamptz(6),
+  CONSTRAINT "tmp_orders_group_package_pkey" PRIMARY KEY ("id")
+)
+;
+
+ALTER TABLE "public"."tmp_orders_group_package" 
+  OWNER TO "postgres";
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."id" IS 'ID';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."name" IS '名称';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."package_type_enum" IS '组套包类型';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."organization_id" IS '科室id';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."practitioner_id" IS '参与者id';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."tenant_id" IS '租户ID';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."delete_flag" IS '删除状态';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_by" IS '创建人';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."create_time" IS '创建时间';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_by" IS '更新人';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package"."update_time" IS '更新时间';
+
+COMMENT ON TABLE "public"."tmp_orders_group_package" IS '医嘱组合套餐';	
+
+-- 插入添加临时订单分组包表的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509081020add_table_tmp_orders_group_package', '1.0.0');
diff --git a/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql
new file mode 100644
index 00000000..e46e460f
--- /dev/null
+++ b/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql
@@ -0,0 +1,58 @@
+ -- 创建序列
+	CREATE SEQUENCE tmp_orders_group_package_detail_id_seq
+		START WITH 1
+		INCREMENT BY 1
+		NO MINVALUE
+		NO MAXVALUE
+		CACHE 1;
+
+
+CREATE TABLE "public"."tmp_orders_group_package_detail" (
+  "id" int8 NOT NULL DEFAULT nextval('tmp_orders_group_package_detail_id_seq'::regclass),
+  "group_package_id" int8 NOT NULL,
+  "order_definition_id" int8 NOT NULL,
+  "order_definition_table" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "quantity" numeric(20, 6) DEFAULT 1,
+  "unit_code" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "tenant_id" int8 NOT NULL,
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 0,
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "create_time" timestamptz(6) NOT NULL,
+  "update_by" varchar(32) COLLATE "pg_catalog"."default",
+  "update_time" timestamptz(6),
+  CONSTRAINT "tmp_orders_group_package_detail_pkey" PRIMARY KEY ("id")
+)
+;
+
+ALTER TABLE "public"."tmp_orders_group_package_detail" 
+  OWNER TO "postgres";
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."id" IS 'ID';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."group_package_id" IS '组合套餐id';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_id" IS '医嘱定义id';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."order_definition_table" IS '医嘱定义表名';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."quantity" IS '数量';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."unit_code" IS '单位编码';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."tenant_id" IS '租户ID';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."delete_flag" IS '删除状态';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_by" IS '创建人';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."create_time" IS '创建时间';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_by" IS '更新人';
+
+COMMENT ON COLUMN "public"."tmp_orders_group_package_detail"."update_time" IS '更新时间';
+
+COMMENT ON TABLE "public"."tmp_orders_group_package_detail" IS '医嘱组合套餐明细';	
+
+-- 插入添加临时订单分组包详情表的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509081022add_table_tmp_orders_group_package_detail', '1.0.0');
diff --git a/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql b/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql
new file mode 100644
index 00000000..c4275494
--- /dev/null
+++ b/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql
@@ -0,0 +1,7 @@
+   ALTER TABLE "public"."adm_practitioner" 
+   ADD COLUMN "signature" text COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."adm_practitioner"."signature" IS '签名图片';
+   
+   -- 插入为adm_practitioner表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509101025add_column_adm_practitioner', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql b/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql
new file mode 100644
index 00000000..f66513b3
--- /dev/null
+++ b/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql
@@ -0,0 +1,8 @@
+
+   ALTER TABLE "public"."wor_service_request" 
+   ADD COLUMN "parent_id" int8  DEFAULT NULL;
+   COMMENT ON COLUMN "public"."wor_service_request"."parent_id" IS '父id(适用诊疗套餐)';
+   
+   -- 插入为wor_service_request表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509101030add_column_wor_service_request', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql b/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql
new file mode 100644
index 00000000..280f35e9
--- /dev/null
+++ b/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql	
@@ -0,0 +1,8 @@
+
+    ALTER TABLE "public"."cli_reservation_record" 
+   ADD COLUMN "tooth_position" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."cli_reservation_record"."tooth_position" IS '牙位';
+
+   -- 插入为cli_reservation_record表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509161311 add_column_cil_reservation_record', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509180852 add_column_wor_device_dispense.sql b/迁移记录-DB变更记录/202509180852 add_column_wor_device_dispense.sql
new file mode 100644
index 00000000..e4354d5a
--- /dev/null
+++ b/迁移记录-DB变更记录/202509180852 add_column_wor_device_dispense.sql	
@@ -0,0 +1,5 @@
+ALTER TABLE public.wor_device_dispense ADD preparer_id int8 NULL;
+COMMENT ON COLUMN public.wor_device_dispense.preparer_id IS '配药人';
+   -- 插入为wor_device_dispense表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509180852 add_column_wor_device_dispense', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql b/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql
new file mode 100644
index 00000000..053b1600
--- /dev/null
+++ b/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql	
@@ -0,0 +1,7 @@
+   ALTER TABLE "public"."tmp_activity_device" 
+   ADD COLUMN "unit_code" varchar(3) COLLATE "pg_catalog"."default" DEFAULT ''::character varying;
+   COMMENT ON COLUMN "public"."tmp_activity_device"."unit_code" IS '单位';
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509191411 add_column_tmp_activity_device', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql b/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql
new file mode 100644
index 00000000..49f5c2bc
--- /dev/null
+++ b/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql	
@@ -0,0 +1,65 @@
+
+   
+   -- 创建序列
+	CREATE SEQUENCE nd_review_prescription_records_id_seq
+		START WITH 1
+		INCREMENT BY 1
+		NO MINVALUE
+		NO MAXVALUE
+		CACHE 1;
+
+
+CREATE TABLE "public"."nd_review_prescription_records" (
+  "id" int8 NOT NULL DEFAULT nextval('nd_review_prescription_records_id_seq'::regclass),
+  "prescription_no" varchar(255) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "encounter_id" int8 DEFAULT NULL,
+  "med_request_ids" text DEFAULT NULL,
+  "pass_flag" int4 NOT NULL DEFAULT 1,
+  "reason_text" varchar(500) COLLATE "pg_catalog"."default" DEFAULT ''::character varying,
+  "practitioner_id" int8 DEFAULT NULL,
+  "tenant_id" int8 NOT NULL,
+  "delete_flag" char(1) COLLATE "pg_catalog"."default" NOT NULL DEFAULT 0,
+  "create_by" varchar(32) COLLATE "pg_catalog"."default" NOT NULL DEFAULT ''::character varying,
+  "create_time" timestamptz(6) NOT NULL,
+  "update_by" varchar(32) COLLATE "pg_catalog"."default",
+  "update_time" timestamptz(6),
+  CONSTRAINT "nd_review_prescription_records_pkey" PRIMARY KEY ("id")
+)
+;
+
+ALTER TABLE "public"."nd_review_prescription_records" 
+  OWNER TO "postgres";
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."id" IS 'ID';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."prescription_no" IS '处方号';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."encounter_id" IS '就诊id';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."med_request_ids" IS '药品请求ids';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."pass_flag" IS '通过标识';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."reason_text" IS '原因';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."practitioner_id" IS '审方人id';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."tenant_id" IS '租户ID';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."delete_flag" IS '删除状态';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."create_by" IS '创建人';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."create_time" IS '创建时间';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."update_by" IS '更新人';
+
+COMMENT ON COLUMN "public"."nd_review_prescription_records"."update_time" IS '更新时间';
+
+COMMENT ON TABLE "public"."nd_review_prescription_records" IS '农大审方记录';	
+
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509231011 add_table_nd_review_prescription_records', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql b/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql
new file mode 100644
index 00000000..1cab1228
--- /dev/null
+++ b/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql	
@@ -0,0 +1,13 @@
+ALTER TABLE "public"."doc_statistics_definition" 
+  ADD COLUMN "dict_name" varchar(50),
+  ADD COLUMN "dict_type" varchar(50);
+
+COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_name" IS '字典名称';
+
+COMMENT ON COLUMN "public"."doc_statistics_definition"."dict_type" IS '字典类型';
+
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202509261212 add_column _doc_statistics_definition', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql b/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql
new file mode 100644
index 00000000..dc8b641d
--- /dev/null
+++ b/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql	
@@ -0,0 +1,12 @@
+ALTER TABLE "public"."elep_medication_request" 
+  ADD COLUMN "condition_def_id" int8,
+  ADD COLUMN "opsp_dise_code" varchar(255);
+
+COMMENT ON COLUMN "public"."elep_medication_request"."condition_def_id" IS '诊断定义id';
+
+COMMENT ON COLUMN "public"."elep_medication_request"."opsp_dise_code" IS '慢病编码';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510131311 add_column_elep_medication_request', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql b/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql
new file mode 100644
index 00000000..0549c9e8
--- /dev/null
+++ b/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql	
@@ -0,0 +1,7 @@
+ALTER TABLE public.adm_charge_item ADD procedure_id int8 NULL;
+COMMENT ON COLUMN public.adm_charge_item.procedure_id IS '执行id';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510131411 add_column_adm_charge_item', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510151011 alter_table_request.sql b/迁移记录-DB变更记录/202510151011 alter_table_request.sql
new file mode 100644
index 00000000..ee7452b0
--- /dev/null
+++ b/迁移记录-DB变更记录/202510151011 alter_table_request.sql	
@@ -0,0 +1,22 @@
+ALTER TABLE public.wor_device_request ADD based_on_table varchar(255) NULL;
+COMMENT ON COLUMN public.wor_device_request.based_on_table IS '请求基于什么';
+
+ALTER TABLE public.wor_device_request ADD based_on_id int8 NULL;
+COMMENT ON COLUMN public.wor_device_request.based_on_id IS '请求基于什么的ID';
+
+ALTER TABLE public.wor_device_dispense ADD procedure_id int8 NULL;
+COMMENT ON COLUMN public.wor_device_dispense.procedure_id IS '执行id';
+
+ALTER TABLE public.med_medication_request ADD based_on_table varchar(255) NULL;
+COMMENT ON COLUMN public.med_medication_request.based_on_table IS '请求基于什么';
+
+ALTER TABLE public.med_medication_request ADD based_on_id int8 NULL;
+COMMENT ON COLUMN public.med_medication_request.based_on_id IS '请求基于什么的ID';
+
+ALTER TABLE public.med_medication_dispense ADD procedure_id int8 NULL;
+COMMENT ON COLUMN public.med_medication_dispense.procedure_id IS '执行id';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510151011 alter_table_request', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql b/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql
new file mode 100644
index 00000000..7bcfdc30
--- /dev/null
+++ b/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql	
@@ -0,0 +1,33 @@
+
+
+CREATE TABLE PUBLIC.cli_condition_no_definition (
+  gl_no VARCHAR (255) NULL,
+  id bigserial NOT NULL,
+  tenant_id INT8 NULL,
+  delete_flag BPCHAR DEFAULT '0' NULL,
+  create_by VARCHAR (32) NULL,
+  create_time TIMESTAMPTZ (6) NULL,
+  update_by VARCHAR (32) NULL,
+  update_time TIMESTAMPTZ (6) NULL,
+  gl_name VARCHAR (255) NULL,
+  icd10_no VARCHAR (255) NULL,
+  icd10_name VARCHAR (255) NULL
+);
+COMMENT ON TABLE PUBLIC.cli_condition_no_definition IS '诊断各种编码定义表';
+-- Column comments
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_no IS '国临疾病编码';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.id IS 'ID';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.tenant_id IS '租户id';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.delete_flag IS '删除状态';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_by IS '创建人';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.create_time IS '创建时间';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_by IS '更新人';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.update_time IS '更新时间';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.gl_name IS '国临疾病名称';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_no IS 'icd10编码';
+COMMENT ON COLUMN PUBLIC.cli_condition_no_definition.icd10_name IS 'icd10名称';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510151413 add_talble_cli_condition_no_definition', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql
new file mode 100644
index 00000000..ed6fe6f6
--- /dev/null
+++ b/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql	
@@ -0,0 +1,20 @@
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD dose numeric(20,6) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose IS '单次剂量';
+
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD rate_code varchar(255) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.rate_code IS '用药频次';
+
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD dispense_per_duration int4 NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.dispense_per_duration IS '用药天数';	
+
+
+ALTER TABLE public.tmp_orders_group_package_detail ADD method_code varchar(255) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.method_code IS '给药途径';	
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211012 add_column_tmp_orders_group_package_detail', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql b/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql
new file mode 100644
index 00000000..bfe7406d
--- /dev/null
+++ b/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql	
@@ -0,0 +1,7 @@
+ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211414 add_column_med_medication_dispense', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql b/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql
new file mode 100644
index 00000000..bfe7406d
--- /dev/null
+++ b/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql	
@@ -0,0 +1,7 @@
+ALTER TABLE public.med_medication_dispense ADD summary_no varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN public.med_medication_dispense.summary_no IS '汇总编号';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211414 add_column_med_medication_dispense', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql b/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql
new file mode 100644
index 00000000..d6e106d8
--- /dev/null
+++ b/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql	
@@ -0,0 +1,6 @@
+ALTER TABLE public.wor_supply_delivery ALTER COLUMN supplier_id DROP NOT NULL;
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510211511 alter_column_wor_supply_delivery', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql
new file mode 100644
index 00000000..bc2f59ed
--- /dev/null
+++ b/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql	
@@ -0,0 +1,7 @@
+ALTER TABLE public.tmp_orders_group_package_detail ADD dose_quantity numeric(20,6) NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.dose_quantity IS '小单位单次剂量';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510221011 add_column_tmp_orders_group_package_detail', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql b/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql
new file mode 100644
index 00000000..b33db798
--- /dev/null
+++ b/迁移记录-DB变更记录/202510271011  add_column_ med_medication_definition&med_medication_request.sql	
@@ -0,0 +1,11 @@
+		ALTER TABLE public.med_medication_definition ADD dosage_instruction varchar(255) NULL;
+		COMMENT ON COLUMN public.med_medication_definition.dosage_instruction IS '用药说明';
+		
+				
+		ALTER TABLE public.med_medication_request ADD dosage_instruction varchar(255) NULL;
+		COMMENT ON COLUMN public.med_medication_request.dosage_instruction IS '用药说明';
+
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510271011 add_column_ med_medication_definition&med_medication_request', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510271311 add_column_requests.sql b/迁移记录-DB变更记录/202510271311 add_column_requests.sql
new file mode 100644
index 00000000..27e5b9af
--- /dev/null
+++ b/迁移记录-DB变更记录/202510271311 add_column_requests.sql	
@@ -0,0 +1,12 @@
+	ALTER TABLE public.med_medication_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
+	COMMENT ON COLUMN public.med_medication_request.generate_source_enum IS '生成来源';	
+	
+	ALTER TABLE public.wor_device_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
+	COMMENT ON COLUMN public.wor_device_request.generate_source_enum IS '生成来源';	
+	
+	ALTER TABLE public.wor_service_request ADD generate_source_enum int4 NOT NULL DEFAULT 1;
+	COMMENT ON COLUMN public.wor_service_request.generate_source_enum IS '生成来源';	
+
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510271311 add_column_requests', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql b/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql
new file mode 100644
index 00000000..995646a6
--- /dev/null
+++ b/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql	
@@ -0,0 +1,7 @@
+ALTER TABLE "public"."adm_practitioner" 
+  ADD COLUMN "pos_no" varchar(255) DEFAULT '';
+
+COMMENT ON COLUMN "public"."adm_practitioner"."pos_no" IS 'pos机编号';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510281101 add_column_adm_practitioner', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql b/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql
new file mode 100644
index 00000000..da0a66cd
--- /dev/null
+++ b/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql	
@@ -0,0 +1,7 @@
+ALTER TABLE "public"."adm_healthcare_service" 
+  ADD COLUMN "bus_no" varchar(255);
+
+COMMENT ON COLUMN "public"."adm_healthcare_service"."bus_no" IS '编码';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202510301113 add_column adm_healthcare_service', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql b/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql
new file mode 100644
index 00000000..9df9308f
--- /dev/null
+++ b/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql	
@@ -0,0 +1,5 @@
+ALTER TABLE public.tmp_orders_group_package_detail ADD group_id int8 NULL;
+COMMENT ON COLUMN public.tmp_orders_group_package_detail.group_id IS '组号';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511031415 add_column tmp_orders_group_package_detail', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql b/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql
new file mode 100644
index 00000000..22d35e09
--- /dev/null
+++ b/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql	
@@ -0,0 +1,8 @@
+ALTER TABLE public.adm_charge_item ADD dispense_table varchar(255) DEFAULT ''::character varying NULL;
+COMMENT ON COLUMN public.adm_charge_item.dispense_table IS '发放所在表';
+
+ALTER TABLE public.adm_charge_item ADD dispense_id int8 NULL;
+COMMENT ON COLUMN public.adm_charge_item.dispense_id IS '发放ID';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511031515 add_column adm_charge_item', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql b/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql
new file mode 100644
index 00000000..5f003a8b
--- /dev/null
+++ b/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql	
@@ -0,0 +1,50 @@
+-- public.doc_inventory_item_static definition
+
+-- Drop table
+
+-- DROP TABLE public.doc_inventory_item_static;
+
+CREATE TABLE public.doc_inventory_item_static ( id bigserial NOT NULL, category_code varchar(255) DEFAULT '0'::character varying NOT NULL, "name" varchar(255) DEFAULT ''::character varying NOT NULL, inventory_status_enum int4 DEFAULT 0 NOT NULL, supplier_id int8 NOT NULL, description_text varchar(2000) NULL, unit_code varchar(255) DEFAULT ''::character varying NOT NULL, quantity numeric(20, 6) DEFAULT 0 NOT NULL, lot_number varchar(255) DEFAULT ''::character varying NOT NULL, production_date timestamptz(6) NULL, expiration_date timestamptz(6) NULL, location_store_id int8 NULL, location_id int8 NOT NULL, trace_no varchar(50000) DEFAULT ''::character varying NOT NULL, packaging_levels int4 DEFAULT 1 NOT NULL, tenant_id int8 NOT NULL, delete_flag int4 DEFAULT 0 NOT NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar(32) NULL, update_time timestamptz(6) NULL, item_table varchar(255) DEFAULT ''::character varying NOT NULL, item_id int8 NOT NULL, price numeric(20, 6) NULL, sale_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NOT NULL, min_unit_code varchar(255) DEFAULT ''::character varying NOT NULL, part_percent numeric(20, 6) DEFAULT 0 NOT NULL, supplier_name varchar(255) DEFAULT ''::character varying NOT NULL, location_name varchar(255) DEFAULT ''::character varying NOT NULL, location_store_name varchar(255) DEFAULT ''::character varying NOT NULL, manufacturer_text varchar(2000) NULL, chrgitm_lv int4 DEFAULT 3 NOT NULL, total_volume varchar(255) DEFAULT ''::character varying NOT NULL, py_str varchar(255) DEFAULT ''::character varying NOT NULL, wb_str varchar(255) DEFAULT ''::character varying NOT NULL, CONSTRAINT doc_inventory_item_static_pkey PRIMARY KEY (id));
+COMMENT ON TABLE public.doc_inventory_item_static IS '库存项目管理';
+
+-- Column comments
+
+COMMENT ON COLUMN public.doc_inventory_item_static.id IS 'ID';
+COMMENT ON COLUMN public.doc_inventory_item_static.category_code IS '物品类别';
+COMMENT ON COLUMN public.doc_inventory_item_static."name" IS '名称';
+COMMENT ON COLUMN public.doc_inventory_item_static.inventory_status_enum IS '库存状态';
+COMMENT ON COLUMN public.doc_inventory_item_static.supplier_id IS '供应商id';
+COMMENT ON COLUMN public.doc_inventory_item_static.description_text IS '说明书';
+COMMENT ON COLUMN public.doc_inventory_item_static.unit_code IS '最小单位';
+COMMENT ON COLUMN public.doc_inventory_item_static.quantity IS '当前库存数量(最小单位数量)';
+COMMENT ON COLUMN public.doc_inventory_item_static.lot_number IS '产品批号';
+COMMENT ON COLUMN public.doc_inventory_item_static.production_date IS '生产日期';
+COMMENT ON COLUMN public.doc_inventory_item_static.expiration_date IS '失效日期';
+COMMENT ON COLUMN public.doc_inventory_item_static.location_store_id IS '库位';
+COMMENT ON COLUMN public.doc_inventory_item_static.location_id IS '仓库';
+COMMENT ON COLUMN public.doc_inventory_item_static.trace_no IS '追溯码';
+COMMENT ON COLUMN public.doc_inventory_item_static.packaging_levels IS '追溯码包装层级';
+COMMENT ON COLUMN public.doc_inventory_item_static.tenant_id IS '租户ID';
+COMMENT ON COLUMN public.doc_inventory_item_static.delete_flag IS '删除状态';
+COMMENT ON COLUMN public.doc_inventory_item_static.create_by IS '创建人';
+COMMENT ON COLUMN public.doc_inventory_item_static.create_time IS '创建时间';
+COMMENT ON COLUMN public.doc_inventory_item_static.update_by IS '更新人';
+COMMENT ON COLUMN public.doc_inventory_item_static.update_time IS '更新时间';
+COMMENT ON COLUMN public.doc_inventory_item_static.item_table IS '项目';
+COMMENT ON COLUMN public.doc_inventory_item_static.item_id IS '物品编码';
+COMMENT ON COLUMN public.doc_inventory_item_static.price IS '采购单价(包装单位)';
+COMMENT ON COLUMN public.doc_inventory_item_static.sale_price IS '销售单价(包装单位)';
+COMMENT ON COLUMN public.doc_inventory_item_static.bus_no IS '项目编号';
+COMMENT ON COLUMN public.doc_inventory_item_static.min_unit_code IS '最小单位';
+COMMENT ON COLUMN public.doc_inventory_item_static.part_percent IS '拆零比';
+COMMENT ON COLUMN public.doc_inventory_item_static.supplier_name IS '供应商名称';
+COMMENT ON COLUMN public.doc_inventory_item_static.location_name IS '库房名称';
+COMMENT ON COLUMN public.doc_inventory_item_static.location_store_name IS '货位名称';
+COMMENT ON COLUMN public.doc_inventory_item_static.manufacturer_text IS '生产厂商文本';
+COMMENT ON COLUMN public.doc_inventory_item_static.chrgitm_lv IS '医保等级';
+COMMENT ON COLUMN public.doc_inventory_item_static.total_volume IS '规格';
+COMMENT ON COLUMN public.doc_inventory_item_static.py_str IS '药品名称拼音码';
+COMMENT ON COLUMN public.doc_inventory_item_static.wb_str IS '药品五笔码';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511041214 add_table doc_inventory_item_static', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql b/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql
new file mode 100644
index 00000000..91b216b1
--- /dev/null
+++ b/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql	
@@ -0,0 +1,38 @@
+-- public.adm_change_price_record definition
+
+-- Drop table
+
+-- DROP TABLE public.adm_change_price_record;
+
+CREATE TABLE public.adm_change_price_record ( id bigserial NOT NULL, location_id int8 NULL, applicant_id int8 NULL, item_category_enum int4 NULL, item_id int8 NULL, origin_buying_price numeric(20, 6) NULL, origin_retail_price numeric(20, 6) NULL, approver_id int8 NULL, approval_time timestamptz(6) NULL, tenant_id int8 NULL, delete_flag bpchar(1) DEFAULT '0' NULL, create_by varchar(32) DEFAULT ''::character varying NOT NULL, create_time timestamptz(6) NOT NULL, update_by varchar NULL, update_time timestamptz(6) NULL, item_quantity numeric(20, 6) NULL, difference_retail_price numeric(20, 6) NULL, bus_no varchar(255) DEFAULT ''::character varying NULL, description varchar(255) NULL, applicant_time timestamptz NULL, item_table varchar(50) DEFAULT ''::character varying NULL, new_buying_price numeric(20, 6) NULL, new_retail_price numeric(20, 6) NULL, unit_code varchar(255) DEFAULT ''::character varying NULL, status_enum int4 DEFAULT 0 NULL, lot_number varchar(255) DEFAULT ''::character varying NULL, reason varchar(2000) NULL, difference_buying_price numeric(20, 6) NULL, CONSTRAINT adm_change_price_record_pkey PRIMARY KEY (id));
+COMMENT ON TABLE public.adm_change_price_record IS '修改价格记录表';
+
+-- Column comments
+
+COMMENT ON COLUMN public.adm_change_price_record.id IS '本表id';
+COMMENT ON COLUMN public.adm_change_price_record.location_id IS '批次号';
+COMMENT ON COLUMN public.adm_change_price_record.applicant_id IS '改价申请人id';
+COMMENT ON COLUMN public.adm_change_price_record.item_category_enum IS '目标枚举 药品、耗材、诊疗、挂号';
+COMMENT ON COLUMN public.adm_change_price_record.item_id IS '药品ID、耗材ID、诊疗ID、挂号ID';
+COMMENT ON COLUMN public.adm_change_price_record.origin_buying_price IS '原进货价';
+COMMENT ON COLUMN public.adm_change_price_record.origin_retail_price IS '原新价格';
+COMMENT ON COLUMN public.adm_change_price_record.approver_id IS '审批人ID';
+COMMENT ON COLUMN public.adm_change_price_record.approval_time IS '审批时间';
+COMMENT ON COLUMN public.adm_change_price_record.tenant_id IS '租户ID';
+COMMENT ON COLUMN public.adm_change_price_record.delete_flag IS '删除标识 默认 0 未删除';
+COMMENT ON COLUMN public.adm_change_price_record.item_quantity IS '当前品库存量';
+COMMENT ON COLUMN public.adm_change_price_record.difference_retail_price IS '零售价盈负差';
+COMMENT ON COLUMN public.adm_change_price_record.bus_no IS '当前业务批次号';
+COMMENT ON COLUMN public.adm_change_price_record.description IS '改价原因';
+COMMENT ON COLUMN public.adm_change_price_record.applicant_time IS '改价申请时间';
+COMMENT ON COLUMN public.adm_change_price_record.item_table IS '业务表名药品、耗材、诊疗、挂号';
+COMMENT ON COLUMN public.adm_change_price_record.new_buying_price IS '新进货价';
+COMMENT ON COLUMN public.adm_change_price_record.new_retail_price IS '新零售价';
+COMMENT ON COLUMN public.adm_change_price_record.unit_code IS '物品计量单位';
+COMMENT ON COLUMN public.adm_change_price_record.status_enum IS '审批状态';
+COMMENT ON COLUMN public.adm_change_price_record.lot_number IS '批次号';
+COMMENT ON COLUMN public.adm_change_price_record.reason IS '条件理由';
+COMMENT ON COLUMN public.adm_change_price_record.difference_buying_price IS '进货价盈负差';
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511051215 add_table adm_change_price_record', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/202511061215 ALTER TABLE sys_oper_log.sql b/迁移记录-DB变更记录/202511061215 ALTER TABLE sys_oper_log.sql
new file mode 100644
index 00000000..3b641513
--- /dev/null
+++ b/迁移记录-DB变更记录/202511061215 ALTER TABLE sys_oper_log.sql	
@@ -0,0 +1,6 @@
+ALTER TABLE sys_oper_log ALTER COLUMN oper_param TYPE text;
+ALTER TABLE sys_oper_log ALTER COLUMN json_result TYPE text;
+ALTER TABLE sys_oper_log ALTER COLUMN error_msg TYPE text;
+   -- 插入为tmp_activity_device表添加列的迁移记录
+INSERT INTO __MigrationsHistory (MigrationId, ProductVersion)
+VALUES ('202511061215 ALTER TABLE sys_oper_log', '1.0.0');
\ No newline at end of file
diff --git a/迁移记录-DB变更记录/openHis数据库变更操作.docx b/迁移记录-DB变更记录/openHis数据库变更操作.docx
new file mode 100644
index 00000000..d06ad4c4
Binary files /dev/null and b/迁移记录-DB变更记录/openHis数据库变更操作.docx differ