```

docs(release-notes): 添加住院护士站划价功能说明和发版记录

- 新增住院护士站划价服务流程说明文档，详细描述了从参数预处理到结果响应的五大阶段流程
- 包含耗材类医嘱和诊疗活动类医嘱的差异化处理逻辑
- 添加完整的发版内容记录，涵盖新增菜单功能和各模块优化点
- 记录了住院相关功能的新增和门诊业务流程的修复
```

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IWesternMedicineDispenseAppService.java

@@ -8,6 +8,9 @@ import com.core.common.core.domain.R;
 import com.openhis.web.pharmacymanage.dto.DispenseItemDto;
 import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
 import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
+import com.openhis.yb.dto.MedicalInventory3511Param;
+import com.openhis.yb.dto.MedicalInventory3512Param;
+import com.openhis.yb.dto.MedicalInventory3513Param;
 
 /**
  * 处方管理 应用实现接口

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicalDeviceDispenseController.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 MedicalDeviceDispenseController {
 
-    @Autowired
+    @Resource
     public IMedicalDeviceDispenseAppService medicalDeviceDispenseAppService;
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/PendingMedicationDetailsController.java

@@ -1,5 +1,6 @@
 package com.openhis.web.pharmacymanage.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 PendingMedicationDetailsController {
 
-    @Autowired
+    @Resource
     public IPendingMedicationDetailsAppService pendingMedicationDetailsAppService;
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/WesternMedicineDispenseController.java

@@ -5,7 +5,9 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.openhis.yb.dto.MedicalInventory3511Param;
+import com.openhis.yb.dto.MedicalInventory3512Param;
+import com.openhis.yb.dto.MedicalInventory3513Param;
 import org.springframework.web.bind.annotation.*;
 
 import com.core.common.core.domain.R;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java

@@ -33,6 +33,10 @@ public class DispenseInventoryDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long reqId;
 
+    /** 退的请求id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long refundId;
+
     /** 病人id */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
@@ -43,7 +47,7 @@ public class DispenseInventoryDto {
     /** 请求数量 */
     private BigDecimal dispenseQuantity;
 
-    /** 发放数量 */
+    /** 发放状态 */
     private Integer dispenseStatus;
 
     /** 库存项目表主键ID */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java

@@ -73,9 +73,15 @@ public class EncounterInfoDto {
     /** 就诊日期 */
     private String receptionTime;
 
+    /** 住院日期 */
+    private String startTime;
+
     /** 年龄 */
     private String age;
 
     /** 生日 */
     private Date birthDate;
+
+    /** 电话 */
+    private String phone;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.pharmacymanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.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 zwh
+ * @date 2025-11-20
+ */
+@Data
+@Accessors(chain = true)
+public class InventoryDetailDto {
+
+    /** 库存项目表主键ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inventoryId;
+
+    /** 项目ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long itemId;
+
+    /** 库房ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
+    /** 拆零单位 */
+    @Dict(dictCode = "unit_code")
+    private String inventoryUnitCode;
+    private String inventoryUnitCode_dictText;
+
+    /** 大单位 */
+    @Dict(dictCode = "unit_code")
+    private String maxUnitCode;
+    private String maxUnitCode_dictText;
+
+    /** 当前库存数量(拆零单位) */
+    private BigDecimal inventoryQuantity;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 批号 */
+    private String inventoryLotNumber;
+
+    /** 有效期止 */
+    private Date expirationDate;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java

@@ -26,6 +26,9 @@ public class UnDispenseInventoryDto implements Serializable {
     /** 发药ID */
     private Long dispenseId;
 
+    /** 请求ID */
+    private Long requestId;
+
     /** 项目ID */
     private Long itemId;
 
@@ -47,6 +50,9 @@ public class UnDispenseInventoryDto implements Serializable {
     /** 已发数量 */
     private BigDecimal dispenseQuantity;
 
+    /** 发药状态 */
+    private Integer dispenseStatus;
+
     /** 发药数量 */
     private BigDecimal quantity;
 
@@ -61,4 +67,7 @@ public class UnDispenseInventoryDto implements Serializable {
 
     /** 有效期至 */
     private Date expirationDate;
+
+    /** 追溯码 */
+    private String TraceNo;
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.web.pharmacymanage.dto.EncounterInfoDto;
 import com.openhis.web.pharmacymanage.dto.EncounterInfoSearchParam;
+import com.openhis.web.pharmacymanage.dto.InventoryDetailDto;
 import com.openhis.web.pharmacymanage.dto.ItemDispenseOrderDto;
 
 @Repository
@@ -47,13 +48,14 @@ public interface WesternMedicineDispenseMapper {
      * @param preparation 发药状态:待配药
      * @param prepared 发药状态:已配药
      * @param dispenseStatus 发药状态
+     * @param active 库房状态：启用
      * @return 发耗材单列表
      */
     Page<ItemDispenseOrderDto> selectMedicineDispenseOrderPage(@Param("page") Page<ItemDispenseOrderDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<ItemDispenseOrderDto> queryWrapper,
         @Param("inProgress") Integer inProgress, @Param("completed") Integer completed,
         @Param("preparation") Integer preparation, @Param("prepared") Integer prepared,
-        @Param("dispenseStatus") Integer dispenseStatus);
+        @Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active);
 
     /**
      * 获取配药人下拉选列表
@@ -62,4 +64,28 @@ public interface WesternMedicineDispenseMapper {
      * @return 配药人下拉选列表
      */
     List<Practitioner> getPreparerDoctorList(@Param("pharmacist") String pharmacist);
+
+    /**
+     * 查询药品库存详细信息
+     * 
+     * @param medicationIdList 药品id列表
+     * @param locationIdList 库房id列表
+     * @param active 库存状态：启用
+     * @return 库存详细信息
+     */
+    List<InventoryDetailDto> selectMedicineInventoryDetail(@Param("medicationIdList") List<Long> medicationIdList,
+        @Param("locationIdList") List<Long> locationIdList, @Param("active") Integer active);
+
+    /**
+     * 查询非输液药品的已出库追溯码
+     * 
+     * @param status 出
+     * @param injectFlag 输液标记
+     * @param operationType 操作类型 | 发药
+     * @return 非输液药品的已出库追溯码
+     */
+    List<String> getOutTraceNo(@Param("status") Integer status, @Param("injectFlag") Integer injectFlag,
+        @Param("outpatientMinUnitCeil") Integer outpatientMinUnitCeil,
+        @Param("outpatientMinUnitTotalCeil") Integer outpatientMinUnitTotalCeil,
+        @Param("operationType") Integer operationType);
 }