器材目录编辑up

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

@@ -109,7 +109,7 @@ public class DeviceManageDto {
     private Long manufacturerId;
 
     /** 生产厂商文本 */
-    private Long manufacturerText;
+    private String manufacturerText;
 
     /** 供应商 */
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -107,7 +107,7 @@ public class DeviceManageUpDto {
 
     /** 生产厂商文本 */
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long manufacturerText;
+    private String manufacturerText;
 
     /** 供应商 */
     @NotNull(message = "供应商不能为空")

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

@@ -5,11 +5,14 @@ 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;
+
 /**
  * 诊疗目录分页更新
  *
@@ -73,4 +76,24 @@ public class DiagnosisTreatmentUpDto {
 
     /** 规则id */
     private Integer ruleId;
+
+    /** 财务类别 */
+    @Dict(dictCode = "fin_type_code")
+    private String itemTypeCode;
+    private String itemTypeCode_dictText;
+
+    /** 医保类别 */
+    @Dict(dictCode = "yb_type")
+    private String ybType;
+    private String ybType_dictText;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
 }

openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml

@@ -103,7 +103,7 @@
     </select>
 
     <select id="getOne" resultType="com.openhis.web.datadictionary.dto.DeviceManageDto">
-        SELECT
+    SELECT
         T1.id,
         T1.bus_no,
         T1.name,
@@ -158,7 +158,7 @@
             AND  T2.instance_table = 'adm_device_definition'
 
             <if test="id!= null">
-                AND T2.id = #{id}
+                AND T1.id = #{id}
             </if>
             <if test="tenantId!= null">
                 AND T1.tenant_id = #{tenantId}