```

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

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ItemDefinitionServiceImpl.java

@@ -109,6 +109,7 @@ public class ItemDefinitionServiceImpl implements IItemDefinitionService {
             .set(ChargeItemDefinition::getYbType, chargeItemDefinition.getYbType())
             .set(ChargeItemDefinition::getTypeCode, chargeItemDefinition.getTypeCode())
             .set(ChargeItemDefinition::getPrice, chargeItemDefinition.getPrice())
+            .set(ChargeItemDefinition::getPriceCode, chargeItemDefinition.getPriceCode())
             .set(ChargeItemDefinition::getChargeName, chargeItemDefinition.getChargeName());
 
         return chargeItemDefinitionService.update(null, updateWrapper);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/SupplierManagementAppServiceImpl.java

@@ -30,7 +30,7 @@ import com.openhis.administration.service.ISupplierService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.DelFlag;
+import com.core.common.enums.DelFlag;
 import com.openhis.common.enums.SupplierType;
 import com.openhis.common.enums.Whether;
 import com.openhis.common.utils.EnumUtils;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java

@@ -24,4 +24,14 @@ public class ActivityChildJsonDto {
      */
     private BigDecimal childrenRequestNum;
 
+    /**
+     * 售价
+     */
+    private BigDecimal retailPrice;
+
+    /**
+     * 诊疗名称
+     */
+    private String name;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java

@@ -5,14 +5,10 @@ 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 com.openhis.common.enums.DeviceCategory;
-import com.openhis.common.enums.PublicationStatus;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * 器材目录分页检索
  *
@@ -118,7 +114,7 @@ public class DeviceManageDto {
 
     /** 供应商 */
     @JsonSerialize(using = ToStringSerializer.class)
-    @Dict(dictTable = "adm_supplier",dictCode = "id",dictText = "name")
+    @Dict(dictTable = "adm_supplier", dictCode = "id", dictText = "name")
     private Long supplyId;
     private String supplyId_dictText;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java

@@ -3,12 +3,10 @@ package com.openhis.web.datadictionary.dto;
 import java.math.BigDecimal;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 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.DeviceCategory;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -136,7 +134,7 @@ public class DeviceManageUpDto {
 
     /** 医保类别 */
     private String ybType;
-    
+
     /** 医保等级 */
     private Integer chrgitmLv;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java

@@ -1,17 +1,14 @@
 package com.openhis.web.datadictionary.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 com.openhis.common.enums.ActivityDefCategory;
-import com.openhis.common.enums.PublicationStatus;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
 /**
  * 诊疗目录分页检索
  *
@@ -105,8 +102,8 @@ public class DiagnosisTreatmentDto {
     private String ybType;
     private String ybType_dictText;
 
-//    /** 购入价 */
-//    private BigDecimal purchasePrice;
+    // /** 购入价 */
+    // private BigDecimal purchasePrice;
 
     /** 零售价 */
     private BigDecimal retailPrice;
@@ -124,4 +121,9 @@ public class DiagnosisTreatmentDto {
     private Integer pricingFlag;
     private String pricingFlag_enumText;
 
+    /**
+     * 物价编码
+     */
+    private String priceCode;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java

@@ -1,18 +1,16 @@
 package com.openhis.web.datadictionary.dto;
 
+import java.math.BigDecimal;
+
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 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.ActivityDefCategory;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-
 /**
  * 诊疗目录分页更新
  *
@@ -111,4 +109,9 @@ public class DiagnosisTreatmentUpDto {
     /** 划价标记 */
     private Integer pricingFlag;
 
+    /**
+     * 物价编码
+     */
+    private String priceCode;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java

@@ -3,7 +3,6 @@ package com.openhis.web.datadictionary.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.openhis.common.annotation.Dict;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -71,4 +70,9 @@ public class ItemUpFromDirectoryDto {
     /** 价格 */
     private BigDecimal amount;
 
+    /**
+     * 物价编码
+     */
+    private String priceCode;
+
 }