代码提交 项目定价修改

openhis-server/core-common/src/main/java/com/core/common/enums/ChargeItemEnum.java

@@ -14,69 +14,69 @@ public enum ChargeItemEnum {
     /**
      * 床位费
      */
-    BED_FEE("01", "床位费"),
+    BED_FEE(1, "床位费"),
     /**
      * 诊察费
      */
-    DIAGNOSTIC_FEE("02", "诊察费"),
+    DIAGNOSTIC_FEE(2, "诊察费"),
     /**
      * 检查费
      */
-    CHECK_FEE("03", "检查费"),
+    CHECK_FEE(3, "检查费"),
     /**
      * 化验费
      */
-    DIAGNOSTIC_TEST_FEE("04", "化验费"),
+    DIAGNOSTIC_TEST_FEE(4, "化验费"),
     /**
      * 治疗费
      */
-    MEDICAL_EXPENSE_FEE("05", "治疗费"),
+    MEDICAL_EXPENSE_FEE(5, "治疗费"),
     /**
      * 手术费
      */
-    OPERATION_FEE("06", "手术费"),
+    OPERATION_FEE(6, "手术费"),
     /**
      * 护理费
      */
-    NURSING_FEE("07", "护理费"),
+    NURSING_FEE(7, "护理费"),
     /**
      * 卫生材料费
      */
-    SANITARY_MATERIALS_FEE("08", "卫生材料费"),
+    SANITARY_MATERIALS_FEE(8, "卫生材料费"),
     /**
      * 西药费
      */
-    WEST_MEDICINE("09", "西药费"),
+    WEST_MEDICINE(9, "西药费"),
     /**
      * 中药饮片费
      */
-    CHINESE_MEDICINE_SLICES_FEE("10", "中药饮片费"),
+    CHINESE_MEDICINE_SLICES_FEE(10, "中药饮片费"),
     /**
      * 中成药费
      */
-    CHINESE_MEDICINE_FEE("11", "中成药费"),
+    CHINESE_MEDICINE_FEE(11, "中成药费"),
     /**
      * 一般诊疗费
      */
-    GENERAL_CONSULTATION_FEE("12", "一般诊疗费"),
+    GENERAL_CONSULTATION_FEE(12, "一般诊疗费"),
     /**
      * 挂号费
      */
-    REGISTRATION_FEE("13", "挂号费"),
+    REGISTRATION_FEE(13, "挂号费"),
     /**
      * 其他费
      */
-    OTHER_FEE("14", "其他费");
+    OTHER_FEE(14, "其他费");
 
-    private final String code;
+    private final Integer code;
     private final String info;
 
-    ChargeItemEnum(String code, String info) {
+    ChargeItemEnum(Integer code, String info) {
         this.code = code;
         this.info = info;
     }
 
-    public String getCode() {
+    public Integer getCode() {
         return code;
     }
 

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java

@@ -134,7 +134,7 @@ public class ItemDefinitionController {
     public R<?> getDefinitionPage(ItemDefSearchParam itemDefSearchParam,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        @RequestParam(value = "searchKey", defaultValue = "10") String searchKey, HttpServletRequest request) {
+        @RequestParam(value = "searchKey", required = false) String searchKey, HttpServletRequest request) {
 
         IPage<ChargeItemDefPageDto> chargeItemDefinitionPage = new Page<>();
         List<ChargeItemDefPageDto> chargeItemDefinitionList;

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 public class ChargeItemOptionDto {
 
     /** 值 */
-    private String value;
+    private Integer value;
 
     /** 标签 */
     private String label;

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

@@ -19,7 +19,7 @@ public class ItemDefSearchParam {
     /** 定价类型 */
     private String definitionType;
     /** 定价项目 */
-    private String chargeItem;
+    private Integer chargeItem;
     /** 模糊搜索条件 */
     private String searchKey;
 }