代码提交 项目定价修改

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;
 }