Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/CabinetLocationController.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.basedatamanage.controller;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.core.common.core.domain.R;
+import com.core.common.utils.MessageUtils;
+import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.Location;
+import com.openhis.administration.mapper.LocationMapper;
+import com.openhis.administration.service.ILocationService;
+import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.basedatamanage.dto.LocationQueryDto;
+import com.openhis.web.basedatamanage.dto.LocationQueryParam;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 位置管理Controller业务层处理
+ *
+ * @author
+ * @date 2025-02-21
+ */
+@RestController
+@RequestMapping("/basedatamanage/cabinet-location")
+@Slf4j
+@AllArgsConstructor
+public class CabinetLocationController {
+
+    private final ILocationService locationService;
+
+    @Autowired
+    private LocationMapper locationMapper;
+
+    /**
+     * 位置分页列表
+     *
+     * @param locationQueryParam 查询字段
+     * @param searchKey 模糊查询关键字
+     * @param pageNo 当前页码
+     * @param pageSize 查询条数
+     * @param request 请求数据
+     * @return 位置分页列表
+     */
+    @GetMapping(value = "/cabinet-location")
+    public R<?> getLocationPage(LocationQueryParam locationQueryParam,
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
+
+        // 构建查询条件
+        QueryWrapper<Location> queryWrapper = HisQueryUtils.buildQueryWrapper(locationQueryParam, searchKey,
+            new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), request);
+
+        // 设置排序
+        queryWrapper.orderByDesc("create_time");
+        // 执行分页查询并转换为 locationQueryDtoPage
+        Page<LocationQueryDto> locationQueryDtoPage =
+            HisPageUtils.selectPage(locationMapper, queryWrapper, pageNo, pageSize, LocationQueryDto.class);
+
+        return R.ok(locationQueryDtoPage,
+            MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"位置信息"}));
+    }
+
+    /**
+     * 添加库房位置信息
+     *
+     * @param locationQueryDto 位置信息
+     */
+    @PostMapping("/cabinet-location")
+    public R<?> addLocation(@Validated @RequestBody LocationQueryDto locationQueryDto) {
+
+        LocationQueryDto locationQuery = new LocationQueryDto(LocationForm.CABINET);
+        Location location = new Location();
+        BeanUtils.copyProperties(locationQuery, location);
+
+        boolean saveLocationSuccess = locationService.save(location);
+
+        return saveLocationSuccess
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"位置信息"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00003, new Object[] {"位置信息"}));
+    }
+
+    /**
+     * 获取位置需要编辑的信息
+     *
+     * @param locationId 位置信息
+     */
+    @GetMapping("/cabinet-location-editById")
+    public R<?> getLocationById(@Validated @RequestParam Long locationId) {
+
+        Location location = locationService.getById(locationId);
+        return R.ok(location, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"位置信息"}));
+    }
+
+    /**
+     * 编辑位置信息
+     *
+     * @param location 位置信息
+     */
+    @PutMapping("/cabinet-location")
+    public R<?> editLocation(@Validated @RequestBody Location location) {
+
+        boolean updateLocationSuccess = locationService.updateById(location);
+
+        return updateLocationSuccess
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"位置信息"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"位置信息"}));
+    }
+
+    /**
+     * 删除位置信息
+     *
+     * @param locationId 主表id
+     */
+    @DeleteMapping("/cabinet-location")
+    public R<?> deleteLocation(@RequestParam Long locationId) {
+
+        boolean deleteLocationSuccess = locationService.removeById(locationId);
+
+        return deleteLocationSuccess
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"位置信息"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] {"位置信息"}));
+    }
+
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java

@@ -71,7 +71,7 @@ public class OrganizationController {
      * @return 机构分页列表
      */
     @GetMapping(value = "/organization")
-    public R<?> getOrganizationPage(@RequestBody OrgQueryParam orgQueryParam,
+    public R<?> getOrganizationPage(OrgQueryParam orgQueryParam,
         @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryDto.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.basedatamanage.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.openhis.common.enums.*;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author
+ * @date 2025-02-21
+ */
+@Data
+@Accessors(chain = true)
+public class LocationQueryDto {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 名称 */
+    private String name;
+
+    /** 状态编码 */
+    private LocationStatus statusEnum;
+
+    /** 操作状态 */
+    private LocationBedStatus operationalEnum;
+
+    /** 模式编码 */
+    private LocationMode modeEnum;
+
+    /** 模式编码 */
+    private String typeCode;
+
+    /** 功能编码 */
+    private String typeJson;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 物理形式枚举 */
+    private LocationForm formEnum;
+
+    /** 机构编码 */
+    private Long organizationId;
+
+    /** 显示顺序 */
+    private Integer displayOrder;
+
+//    public LocationQueryDto(LocationForm form, String busNo, LocationMode mode) {
+    public LocationQueryDto(LocationForm form) {
+        this.statusEnum = LocationStatus.ACTIVE;
+        this.formEnum = form;
+//        this.modeEnum = mode;
+    }
+}

openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/LocationQueryParam.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.web.basedatamanage.dto;
+
+import java.io.Serializable;
+
+import com.openhis.common.enums.LocationMode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 科室分页查询条件
+ *
+ * @author
+ * @date 2025-02-21
+ */
+@Data
+@Accessors(chain = true)
+public class LocationQueryParam implements Serializable {
+    /** 模式编码 */
+    private LocationMode modeEnum;
+
+}

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

@@ -102,10 +102,11 @@ public class DiseaseManageController {
      */
     @GetMapping("/information-one/{id}")
     public R<?> getDiseaseOne(@PathVariable("id") Long id) {
-
+        DiseaseManageDto diseaseManageDto = new DiseaseManageDto();
         // 根据ID查询【病种目录】
-        ConditionDefinition byId = iConditionDefinitionService.getById(id);
+        ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(id);
-        return R.ok(byId);
+        BeanUtils.copyProperties(conditionDefinition, diseaseManageDto);
+        return R.ok(diseaseManageDto);
     }
 
     /**

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

@@ -3,10 +3,8 @@
  */
 package com.openhis.web.datadictionary.controller;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
+import java.util.stream.Collectors;
-import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -33,6 +31,7 @@ import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.administration.service.IChargeItemDefAppService;
 import com.openhis.administration.service.IChargeItemDefinitionService;
 import com.openhis.common.constant.PromptMsgConstant;
+import com.openhis.common.enums.PublicationStatus;
 import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto;
 import com.openhis.web.datadictionary.dto.ChargeItemOptionDto;
 import com.openhis.web.datadictionary.dto.ItemDefSearchParam;
@@ -48,7 +47,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025-02-21
  */
 @RestController
-@RequestMapping("/dict-manager/definition")
+@RequestMapping("/dict-dictionary/definition")
 @Slf4j
 public class ItemDefinitionController {
 
@@ -72,56 +71,55 @@ public class ItemDefinitionController {
         List<ChargeItemOptionDto> chargeItemOptions = new ArrayList<>();
         if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 西药
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.WEST_MEDICINE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.WEST_MEDICINE.getCode(),
-                .setLabel(ChargeItemEnum.WEST_MEDICINE.getInfo()));
+                ChargeItemEnum.WEST_MEDICINE.getInfo()));
             // 中药饮片
-            chargeItemOptions
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode(),
-                .add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode())
+                ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo()));
-                    .setLabel(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo()));
             // 中成药
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode(),
-                .setLabel(ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo()));
+                ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo()));
             // 其他
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode())
+            chargeItemOptions
-                .setLabel(ChargeItemEnum.OTHER_FEE.getInfo()));
+                .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo()));
         } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 卫生材料
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode(),
-                .setLabel(ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo()));
+                ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo()));
             // 其他
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode())
+            chargeItemOptions
-                .setLabel(ChargeItemEnum.OTHER_FEE.getInfo()));
+                .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo()));
         } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) {
             // 床位
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.BED_FEE.getCode())
+            chargeItemOptions
-                .setLabel(ChargeItemEnum.BED_FEE.getInfo()));
+                .add(new ChargeItemOptionDto(ChargeItemEnum.BED_FEE.getCode(), ChargeItemEnum.BED_FEE.getInfo()));
             // 诊察
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.DIAGNOSTIC_FEE.getCode(),
-                .setLabel(ChargeItemEnum.DIAGNOSTIC_FEE.getInfo()));
+                ChargeItemEnum.DIAGNOSTIC_FEE.getInfo()));
             // 检查
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHECK_FEE.getCode())
+            chargeItemOptions
-                .setLabel(ChargeItemEnum.CHECK_FEE.getInfo()));
+                .add(new ChargeItemOptionDto(ChargeItemEnum.CHECK_FEE.getCode(), ChargeItemEnum.CHECK_FEE.getInfo()));
             // 化验
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode(),
-                .setLabel(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo()));
+                ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo()));
             // 治疗
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode(),
-                .setLabel(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo()));
+                ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo()));
             // 手术
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OPERATION_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.OPERATION_FEE.getCode(),
-                .setLabel(ChargeItemEnum.OPERATION_FEE.getInfo()));
+                ChargeItemEnum.OPERATION_FEE.getInfo()));
             // 护理费
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.NURSING_FEE.getCode())
+            chargeItemOptions.add(
-                .setLabel(ChargeItemEnum.NURSING_FEE.getInfo()));
+                new ChargeItemOptionDto(ChargeItemEnum.NURSING_FEE.getCode(), ChargeItemEnum.NURSING_FEE.getInfo()));
             // 其他
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode(),
-                .setLabel(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo()));
+                ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo()));
             // 挂号
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.REGISTRATION_FEE.getCode())
+            chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.REGISTRATION_FEE.getCode(),
-                .setLabel(ChargeItemEnum.REGISTRATION_FEE.getInfo()));
+                ChargeItemEnum.REGISTRATION_FEE.getInfo()));
             // 其他
-            chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode())
+            chargeItemOptions
-                .setLabel(ChargeItemEnum.OTHER_FEE.getInfo()));
+                .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo()));
         }
         return R.ok(chargeItemOptions);
     }
@@ -157,16 +155,13 @@ public class ItemDefinitionController {
         // 通过 DefinitionType 区分药品定价/器具定价/活动定价
         if (DefinitionTypeEnum.MEDICATION.getCode().equals(chargeItemDefPageDto.getDefinitionType())) {
             queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "med_medication_definition");
-            chargeItemDefinitionPage =
+            chargeItemDefinitionPage = chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper);
-                chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper);
         } else if (DefinitionTypeEnum.DEVICE.getCode().equals(chargeItemDefPageDto.getDefinitionType())) {
             queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "adm_device_definition");
-            chargeItemDefinitionPage =
+            chargeItemDefinitionPage = chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper);
-                chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper);
         } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(chargeItemDefPageDto.getDefinitionType())) {
             queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "wor_activity_definition");
-            chargeItemDefinitionPage =
+            chargeItemDefinitionPage = chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper);
-                chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper);
         }
         return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null));
     }
@@ -196,6 +191,17 @@ public class ItemDefinitionController {
             : R.fail(PromptMsgConstant.Common.M00007, null);
     }
 
+    /**
+     * 修改项目定价
+     *
+     * @return 修改结果
+     */
+    @GetMapping(value = "/status-enum-option")
+    public R<?> getDropdownOption() {
+        return R.ok(Arrays.stream(PublicationStatus.values())
+            .map(status -> new ChargeItemOptionDto(status.getValue(), status.getInfo())).collect(Collectors.toList()));
+    }
+
     /**
      * 采番测试（例子，非常规代码，请勿调用）
      *

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

@@ -6,6 +6,7 @@ package com.openhis.web.datadictionary.dto;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.openhis.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -35,7 +36,7 @@ public class ChargeItemDefPageDto {
     private String totalVolume;
 
     /** 状态 */
-    private Integer statusEnum;
+    private PublicationStatus statusEnum;
 
     /** 单位 */
     private String unitCode;

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

@@ -21,4 +21,9 @@ public class ChargeItemOptionDto {
 
     /** 标签 */
     private String label;
+
+    public ChargeItemOptionDto(Integer value, String info) {
+        this.value = value;
+        this.label = info;
+    }
 }

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

@@ -3,6 +3,7 @@
  */
 package com.openhis.web.datadictionary.dto;
 
+import com.openhis.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -32,7 +33,7 @@ public class ItemDefinitionDto {
     private String title;
 
     /** 状态 */
-    private Integer statusEnum;
+    private PublicationStatus statusEnum;
 
     /** 机构编码 */
     private String orgCode;

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java

@@ -1,7 +1,5 @@
 package com.openhis.web.datadictionary.mapper;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -12,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.administration.domain.ChargeItemDefinition;
 import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto;
-import com.openhis.web.datadictionary.dto.ItemDefSearchParam;
 
 /**
  * 费用定价管理Mapper接口
@@ -31,7 +28,7 @@ public interface ChargeItemDefSearchMapper extends BaseMapper<ChargeItemDefiniti
      * @return 分页查询
      */
     IPage<ChargeItemDefPageDto> getMedList(@Param("page") Page<ChargeItemDefPageDto> page,
-                                           @Param(Constants.WRAPPER) LambdaQueryWrapper<ChargeItemDefPageDto> queryWrapper);
+        @Param(Constants.WRAPPER) LambdaQueryWrapper<ChargeItemDefPageDto> queryWrapper);
 
     /**
      * 器具费用定价分页查询
@@ -41,7 +38,7 @@ public interface ChargeItemDefSearchMapper extends BaseMapper<ChargeItemDefiniti
      * @return 分页查询
      */
     IPage<ChargeItemDefPageDto> getDevList(@Param("page") Page<ChargeItemDefPageDto> page,
-                                           @Param(Constants.WRAPPER) LambdaQueryWrapper<ChargeItemDefPageDto> queryWrapper);
+        @Param(Constants.WRAPPER) LambdaQueryWrapper<ChargeItemDefPageDto> queryWrapper);
 
     /**
      * 活动费用定价分页查询
@@ -51,5 +48,5 @@ public interface ChargeItemDefSearchMapper extends BaseMapper<ChargeItemDefiniti
      * @return 分页查询
      */
     IPage<ChargeItemDefPageDto> getActList(@Param("page") Page<ChargeItemDefPageDto> page,
-                                           @Param(Constants.WRAPPER) LambdaQueryWrapper<ChargeItemDefPageDto> queryWrapper);
+        @Param(Constants.WRAPPER) LambdaQueryWrapper<ChargeItemDefPageDto> queryWrapper);
 }

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java

@@ -1,5 +1,6 @@
 package com.openhis.common.enums;
 import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -16,7 +17,14 @@ public enum PublicationStatus {
 
     UNKNOWN(4, "unknown", "未知");
 
+    PublicationStatus(int value, String code, String info) {
+        this.value = value;
+        this.code = code;
+        this.info = info;
+    }
+
     @EnumValue
+    @JsonValue // 标记响应json值
     private final Integer value;
     private final String code;
     private final String info;

openhis-ui-vue3/package.json

@@ -26,6 +26,7 @@
     "fuse.js": "6.6.2",
     "js-cookie": "3.0.5",
     "jsencrypt": "3.3.2",
+    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "pinia": "2.1.7",
     "vue": "3.3.9",
@@ -37,9 +38,9 @@
     "@vue/compiler-sfc": "3.3.9",
     "sass": "1.69.5",
     "unplugin-auto-import": "0.17.1",
+    "unplugin-vue-setup-extend-plus": "1.0.0",
     "vite": "5.0.4",
     "vite-plugin-compression": "0.5.1",
-    "vite-plugin-svg-icons": "2.0.1",
+    "vite-plugin-svg-icons": "2.0.1"
-    "unplugin-vue-setup-extend-plus": "1.0.0"
   }
 }

openhis-ui-vue3/src/utils/his.js

@@ -0,0 +1,264 @@
+
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+
+// 表单重置
+export function resetForm(refName) {
+  if (this.$refs[refName]) {
+    this.$refs[refName].resetFields();
+  }
+}
+
+// 添加日期范围
+export function addDateRange(params, dateRange, propName) {
+  let search = params;
+  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+  dateRange = Array.isArray(dateRange) ? dateRange : [];
+  if (typeof (propName) === 'undefined') {
+    search.params['beginTime'] = dateRange[0];
+    search.params['endTime'] = dateRange[1];
+  } else {
+    search.params['begin' + propName] = dateRange[0];
+    search.params['end' + propName] = dateRange[1];
+  }
+  return search;
+}
+export function addDateRanges(params, dateRange1, dateRange2, propName) {
+  let search = params;
+  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+  dateRange1 = Array.isArray(dateRange1) ? dateRange1 : [];
+  dateRange2 = Array.isArray(dateRange2) ? dateRange2 : [];
+  if (typeof (propName) === 'undefined') {
+    search.params['beginTime'] = dateRange1[0];
+    search.params['endTime'] = dateRange1[1];
+    search.params['timeFrom'] = dateRange2[0];
+    search.params['timeTo'] = dateRange2[1];
+  } else {
+    search.params['begin' + propName] = dateRange1[0];
+    search.params['end' + propName] = dateRange1[1];
+    search.params['from' + propName] = dateRange2[0];
+    search.params['to' + propName] = dateRange2[1];
+  }
+  return search;
+}
+
+// 回显数据字典
+export function selectDictLabel(datas, value) {
+  if (value === undefined) {
+    return "";
+  }
+  var actions = [];
+  Object.keys(datas).some((key) => {
+    if (datas[key].value == ('' + value)) {
+      actions.push(datas[key].label);
+      return true;
+    }
+  })
+  if (actions.length === 0) {
+    actions.push(value);
+  }
+  return actions.join('');
+}
+
+// 回显数据字典（字符串数组）
+export function selectDictLabels(datas, value, separator) {
+  if (value === undefined || value.length ===0) {
+    return "";
+  }
+  if (Array.isArray(value)) {
+    value = value.join(",");
+  }
+  var actions = [];
+  var currentSeparator = undefined === separator ? "," : separator;
+  var temp = value.split(currentSeparator);
+  Object.keys(value.split(currentSeparator)).some((val) => {
+    var match = false;
+    Object.keys(datas).some((key) => {
+      if (datas[key].value == ('' + temp[val])) {
+        actions.push(datas[key].label + currentSeparator);
+        match = true;
+      }
+    })
+    if (!match) {
+      actions.push(temp[val] + currentSeparator);
+    }
+  })
+  return actions.join('').substring(0, actions.join('').length - 1);
+}
+
+// 字符串格式化(%s )
+export function sprintf(str) {
+  var args = arguments, flag = true, i = 1;
+  str = str.replace(/%s/g, function () {
+    var arg = args[i++];
+    if (typeof arg === 'undefined') {
+      flag = false;
+      return '';
+    }
+    return arg;
+  });
+  return flag ? str : '';
+}
+
+// 转换字符串，undefined,null等转化为""
+export function parseStrEmpty(str) {
+  if (!str || str == "undefined" || str == "null") {
+    return "";
+  }
+  return str;
+}
+
+// 千位分隔
+export function thousandNumber (num) {
+  return String(num).replace(/\B(?=(\d{3})+(?!\d))/g, ','); // 3是千分位，4是万分位
+};
+
+// 数据合并
+export function mergeRecursive(source, target) {
+  for (var p in target) {
+    try {
+      if (target[p].constructor == Object) {
+        source[p] = mergeRecursive(source[p], target[p]);
+      } else {
+        source[p] = target[p];
+      }
+    } catch (e) {
+      source[p] = target[p];
+    }
+  }
+  return source;
+};
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ */
+export function handleTree(data, id, parentId, children) {
+  let config = {
+    id: id || 'id',
+    parentId: parentId || 'parentId',
+    childrenList: children || 'children'
+  };
+
+  var childrenListMap = {};
+  var nodeIds = {};
+  var tree = [];
+
+  for (let d of data) {
+    let parentId = d[config.parentId];
+    if (childrenListMap[parentId] == null) {
+      childrenListMap[parentId] = [];
+    }
+    nodeIds[d[config.id]] = d;
+    childrenListMap[parentId].push(d);
+  }
+
+  for (let d of data) {
+    let parentId = d[config.parentId];
+    if (nodeIds[parentId] == null) {
+      tree.push(d);
+    }
+  }
+
+  for (let t of tree) {
+    adaptToChildrenList(t);
+  }
+
+  function adaptToChildrenList(o) {
+    if (childrenListMap[o[config.id]] !== null) {
+      o[config.childrenList] = childrenListMap[o[config.id]];
+    }
+    if (o[config.childrenList]) {
+      for (let c of o[config.childrenList]) {
+        adaptToChildrenList(c);
+      }
+    }
+  }
+  return tree;
+}
+
+/**
+* 参数处理
+* @param {*} params  参数
+*/
+export function tansParams(params) {
+  let result = ''
+  for (const propName of Object.keys(params)) {
+    const value = params[propName];
+    var part = encodeURIComponent(propName) + "=";
+    if (value !== null && value !== "" && typeof (value) !== "undefined") {
+      if (typeof value === 'object') {
+        for (const key of Object.keys(value)) {
+          if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
+            let params = propName + '[' + key + ']';
+            var subPart = encodeURIComponent(params) + "=";
+            result += subPart + encodeURIComponent(value[key]) + "&";
+          }
+        }
+      } else {
+        result += part + encodeURIComponent(value) + "&";
+      }
+    }
+  }
+  return result
+}
+
+
+// 返回项目路径
+export function getNormalPath(p) {
+  if (p.length === 0 || !p || p == 'undefined') {
+    return p
+  };
+  let res = p.replace('//', '/')
+  if (res[res.length - 1] === '/') {
+    return res.slice(0, res.length - 1)
+  }
+  return res;
+}
+
+// 验证是否为blob格式
+export function blobValidate(data) {
+  return data.type !== 'application/json'
+}

openhis-ui-vue3/src/views/basicmanage/organization/index.vue

@@ -93,14 +93,10 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog title="添加科室" v-model="open" width="500px" append-to-body>
+    <el-dialog title="添加科室" v-model="open" width="600px" append-to-body>
       <el-form ref="orgRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="科室编号" prop="id">
+        <el-form-item label="科室编号" prop="busNo">
-          <el-input v-model="form.id" placeholder="" />
+          <el-input v-model="form.busNo" placeholder="请输入科室编号" />
-          <span
-            >如果不加字段的话 这个前端手动输入 格式可能是 0001.0012.0023
-            加字段的话这个就后端处理了</span
-          >
         </el-form-item>
         <el-form-item label="科室名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入科室名称" />
@@ -126,20 +122,20 @@
               style="width: 100%"
               v-model="form.deptId"
               :data="organization"
-              :props="{ value: 'id', label: 'name', children: 'children' }"
+              :props="{ value: 'busNo', label: 'name', children: 'children' }"
               value-key="id"
               check-strictly
             />
           </el-form-item>
         </el-col>
         <!-- <el-form-item label="状态" prop="status"> </el-form-item> -->
-        <el-form-item label="备注" prop="remark">
+        <!-- <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
             type="textarea"
             placeholder="请输入内容"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -165,60 +161,7 @@ import {
 const { proxy } = getCurrentInstance();
 const { org_type } = proxy.useDict("org_type");
 const loading = ref(true);
-const organization = ref([
+const organization = ref([]);
-  {
-    id: 1,
-    typeEnum: "1",
-    name: "内科系统",
-    status: "启用",
-  },
-  {
-    id: 2,
-    typeEnum: "2",
-    name: "外科系统",
-    status: "启用",
-    children: [
-      {
-        id: 31,
-        typeEnum: "1",
-        name: "外科疗区",
-        status: "停用",
-        children: [
-          {
-            id: 33,
-            typeEnum: "1",
-            name: "外科疗区",
-            status: "启用",
-          },
-          {
-            id: 34,
-            typeEnum: "1",
-            name: "内科疗区",
-            status: "启用",
-          },
-        ],
-      },
-      {
-        id: 32,
-        typeEnum: "1",
-        name: "内科疗区",
-        status: "停用",
-      },
-    ],
-  },
-  {
-    id: 3,
-    typeEnum: "1",
-    name: "中医系统",
-    status: "停用",
-  },
-  {
-    id: 4,
-    typeEnum: "1",
-    name: "护理系统",
-    status: "停用",
-  },
-]);
 const queryParams = ref({});
 const open = ref(false);
 const form = ref({});
@@ -226,6 +169,7 @@ const orgTableRef = ref();
 const orgTypeOption = ref([{}]);
 const selectRowIds = ref([]);
 const rules = ref({
+  busNo: [{ required: true, message: "请输入科室编号", trigger: "change" }],
   name: [
     { required: true, message: "请输入科室名称", trigger: "change" },
     { min: 2, max: 20, message: "长度在 2 到 20 个字符", trigger: "change" },
@@ -245,10 +189,12 @@ function initOption() {
 
 function getPageList() {
   loading.value = false;
-  // getList(queryParams.value).then((res) => {
+  getList(queryParams.value).then((res) => {
-  //   organization.value = res.data.records;
+    organization.value = res.data.records;
-  //   loading.value = false;
+    console.log(res.data.records);
-  // });
+
+    loading.value = false;
+  });
 }
 
 function handleAdd() {
@@ -310,6 +256,8 @@ function handleDisabled(id) {
 }
 
 function handleSelectionChange() {
+  console.log(orgTableRef.value.getSelectionRows());
+
   selectRowIds.value = orgTableRef.value
     .getSelectionRows()
     .map((item) => item.id);

openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 查询费用定价信息列表
+export function listDefinition(query) {
+  return request({
+    url: '/dict-dictionary/definition/item-definition-page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 初始化下拉选
+export function initOption(query) {
+  return request({
+    url: '/dict-dictionary/definition/init',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改费用定价信息
+export function updateDefinition(data) {
+  return request({
+    url: '/dict-dictionary/definition/item-definition',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改费用定价信息
+export function getOptions() {
+  return request({
+    url: '/dict-dictionary/definition/status-enum-option',
+    method: 'get',
+  })
+}

openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue

@@ -0,0 +1,215 @@
+<template>
+  <el-dialog
+    :title="title"
+    v-model="localOpen"
+    width="800px"
+    append-to-body
+    @close="cancel"
+  >
+    <template #header>
+      <div class="custom-header">
+        <span>{{ title }}</span>
+      </div>
+    </template>
+    <div class="scrollable-content">
+      <el-form ref="definitionRef" :model="fromModel" label-width="140px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="项目编号" prop="itemNo">
+              <el-input v-model="fromModel.itemNo" disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="项目名称" prop="chargeName">
+              <el-input v-model="fromModel.chargeName" disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="规格" prop="totalVolume">
+              <el-input v-model="fromModel.totalVolume" disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="单位" prop="unitCode">
+              <el-input v-model="fromModel.unitCode" disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="拆零比" prop="partPercent">
+              <el-input-number
+                v-model="fromModel.partPercent"
+                :min="0"
+                :max="999999.99"
+                :step="0.01"
+                :precision="2"
+                disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label-width="100"
+              label="指导价"
+              prop="conditionYbCode"
+            >
+              <el-input-number
+                v-model="fromModel.conditionYbCode"
+                :min="0"
+                :max="999999.99"
+                :step="0.01"
+                :precision="2"
+                disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="价格" prop="amount">
+              <el-input-number
+                v-model="fromModel.amount"
+                :min="0"
+                :max="999999.99"
+                :step="0.01"
+                :precision="2"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label-width="100"
+              label="拆零最小单位"
+              prop="partMinUnitCode"
+            >
+              <el-input v-model="fromModel.partMinUnitCode" disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item
+              label-width="100"
+              label="拆零指导价"
+              prop="partConditionPrice"
+            >
+              <el-input-number
+                v-model="fromModel.partConditionPrice"
+                :min="0"
+                :max="999999.99"
+                :step="0.01"
+                :precision="2"
+                disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="拆零价格" prop="price">
+              <el-input-number
+                v-model="fromModel.price"
+                :min="0"
+                :max="999999.99"
+                :step="0.01"
+                :precision="2"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="100" label="状态" prop="statusEnum">
+              <el-select
+                v-model="fromModel.statusEnum"
+                placeholder="请选择状态"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label-width="100" label="调价说明" prop="description">
+              <el-input
+                v-model="fromModel.description"
+                style="width: 100%"
+                autosize
+                type="textarea"
+                placeholder="请输入调价说明"
+                maxlength="200"
+                show-word-limit
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { getOptions } from "./definition";
+const { proxy } = getCurrentInstance();
+const { charge_item_status } = proxy.useDict("charge_item_status");
+const emit = defineEmits(["submit", "update:open"]);
+const props = defineProps({
+  title: String,
+  open: Boolean,
+  formData: Object,
+});
+const localOpen = ref(props.open);
+const definitionRef = ref(null);
+const fromModel = ref(props.formData);
+const options = ref([]);
+/**
+ * 提交表单函数
+ */
+const submitForm = () => {
+  // 调用表单引用上的validate方法进行表单验证
+  definitionRef.value.validate((valid) => {
+    if (valid) {
+      // 验证成功，触发'submit'事件并传递表单数据
+      fromModel.value.statusEnum = Number(fromModel.value.statusEnum);
+      // fromModel.value.statusEnum = "active"
+      emit("submit", fromModel.value);
+    } else {
+      // 验证失败，显示错误消息
+      ElMessage.warning("请确认后再提交");
+      return false;
+    }
+  });
+};
+
+/**获取状态下拉列表 */
+const getStatusOptions = () => {
+  getOptions({}).then((response) => {
+    options.value = response.data;
+    console.log(options.value);
+  });
+};
+
+/**
+ * 取消操作的函数
+ */
+const cancel = () => {
+  definitionRef.value.resetFields();
+  emit("update:open", false);
+};
+
+watch(
+  () => props.open,
+  (newVal) => {
+    localOpen.value = newVal;
+    console.log(props.form);
+    fromModel.value = props.formData;
+    getStatusOptions();
+    if (!newVal) {
+      // 如果对话框关闭，重置表单
+      definitionRef.value.resetFields();
+    }
+  }
+);
+</script>
+<style>
+</style>

openhis-ui-vue3/src/views/datadictionary/definition/index.vue

@@ -0,0 +1,790 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+        <el-tab-pane label="药品定价" name="1">
+          <el-row :gutter="16">
+            <el-col :span="4" style="width: 20%">
+              <el-form-item
+                label-width="100"
+                label="收费项目"
+                style="width: 100%"
+                prop="chargeItem"
+              >
+                <el-select
+                  v-model="queryParams.chargeItem"
+                  placeholder="请选择收费项目"
+                  size="large"
+                  style="width: 240px"
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" style="width: 20%">
+              <el-form-item
+                label-width="100"
+                label="名称"
+                style="width: 100%"
+                prop="searchKey"
+              >
+                <el-input
+                  v-model="queryParams.searchKey"
+                  placeholder="名称/编码/拼音"
+                  clearable
+                  @keyup.enter="handleQuery"
+                  @blur="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            v-loading="loading"
+            :data="definitionList"
+            tooltip-effect="dark"
+            :show-overflow-tooltip="true"
+          >
+            <el-table-column
+              type="selection"
+              width="40"
+              align="center"
+              fixed="left"
+            />
+            <el-table-column
+              label="项目编号"
+              width="150"
+              prop="itemNo"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.itemNo ? scope.row.itemNo : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="项目名称"
+              width="150"
+              prop="chargeName"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.chargeName ? scope.row.chargeName : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="规格"
+              width="150"
+              prop="totalVolume"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.totalVolume ? scope.row.totalVolume : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="单位"
+              width="150"
+              prop="unitCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.unitCode ? scope.row.unitCode : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零比"
+              width="150"
+              prop="partPercent"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.partPercent ? scope.row.partPercent : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="指导价"
+              width="150"
+              prop="conditionYbCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.conditionYbCode ? scope.row.conditionYbCode : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="基础价格"
+              width="150"
+              prop="price"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.price ? scope.row.price : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="实际价格"
+              width="150"
+              prop="amount"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.amount ? scope.row.amount : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零最小单位"
+              width="150"
+              prop="partMinUnitCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.partMinUnitCode ? scope.row.partMinUnitCode : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零指导价"
+              width="150"
+              prop="partConditionPrice"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.partConditionPrice
+                    ? scope.row.partConditionPrice
+                    : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零价格"
+              width="150"
+              prop="partPrice"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.partPrice ? scope.row.partPrice : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="调价说明"
+              width="150"
+              prop="description"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.description ? scope.row.description : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="调价时间"
+              width="150"
+              prop="updateTime"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.updateTime ? scope.row.updateTime : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="状态"
+              width="150"
+              prop="statusEnum"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.statusEnum ? "" : "-" }}
+                <dict-tag
+                  :options="charge_item_status"
+                  :value="scope.row.statusEnum"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              min-width="290"
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button link type="primary" @click="handleUpdate(scope.row)"
+                  >修改</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-tab-pane>
+        <el-tab-pane label="器具定价" name="2">
+          <el-row :gutter="16">
+            <el-col :span="4" style="width: 20%">
+              <el-form-item
+                label-width="100"
+                label="收费项目"
+                style="width: 100%"
+                prop="chargeItem"
+              >
+                <el-select
+                  v-model="queryParams.chargeItem"
+                  placeholder="请选择收费项目"
+                  size="large"
+                  style="width: 240px"
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" style="width: 20%">
+              <el-form-item
+                label-width="100"
+                label="名称"
+                style="width: 100%"
+                prop="searchKey"
+              >
+                <el-input
+                  v-model="queryParams.searchKey"
+                  placeholder="名称/编码/拼音"
+                  clearable
+                  @keyup.enter="handleQuery"
+                  @blur="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            v-loading="loading"
+            :data="definitionList"
+            tooltip-effect="dark"
+            :show-overflow-tooltip="true"
+          >
+            <el-table-column
+              type="selection"
+              width="40"
+              align="center"
+              fixed="left"
+            />
+            <el-table-column
+              label="项目编号"
+              width="150"
+              prop="itemNo"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.itemNo ? scope.row.itemNo : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="项目名称"
+              width="150"
+              prop="chargeName"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.chargeName ? scope.row.chargeName : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="规格"
+              width="150"
+              prop="totalVolume"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.totalVolume ? scope.row.totalVolume : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="单位"
+              width="150"
+              prop="unitCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.unitCode ? scope.row.unitCode : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零比"
+              width="150"
+              prop="partPercent"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.partPercent ? thousandNumber(scope.row.partPercent) : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="指导价"
+              width="150"
+              prop="conditionYbCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.conditionYbCode ? thousandNumber(scope.row.conditionYbCode) : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="价格"
+              width="150"
+              prop="price"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零最小单位"
+              width="150"
+              prop="partMinUnitCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.partMinUnitCode ? scope.row.partMinUnitCode : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零指导价"
+              width="150"
+              prop="partConditionPrice"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.partConditionPrice
+                    ? thousandNumber(scope.row.partConditionPrice)
+                    : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零价格"
+              width="150"
+              prop="partPrice"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.partPrice ? thousandNumber(scope.row.partPrice) : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="调价说明"
+              width="150"
+              prop="description"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.description ? scope.row.description : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="调价时间"
+              width="150"
+              prop="updateTime"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.updateTime ? scope.row.updateTime : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="状态"
+              width="150"
+              prop="statusEnum"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.statusEnum ? "" : "-" }}
+                <dict-tag
+                  :options="charge_item_status"
+                  :value="scope.row.statusEnum"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              min-width="290"
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button link type="primary" @click="handleUpdate(scope.row)"
+                  >修改</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-tab-pane>
+        <el-tab-pane label="活动定价" name="3">
+          <el-row :gutter="16">
+            <el-col :span="4" style="width: 20%">
+              <el-form-item
+                label-width="100"
+                label="收费项目"
+                style="width: 100%"
+                prop="chargeItem"
+              >
+                <el-select
+                  v-model="queryParams.chargeItem"
+                  placeholder="请选择收费项目"
+                  size="large"
+                  style="width: 240px"
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" style="width: 20%">
+              <el-form-item
+                label-width="100"
+                label="名称"
+                style="width: 100%"
+                prop="searchKey"
+              >
+                <el-input
+                  v-model="queryParams.searchKey"
+                  placeholder="名称/编码/拼音"
+                  clearable
+                  @keyup.enter="handleQuery"
+                  @blur="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            v-loading="loading"
+            :data="definitionList"
+            tooltip-effect="dark"
+            :show-overflow-tooltip="true"
+          >
+            <el-table-column
+              type="selection"
+              width="40"
+              align="center"
+              fixed="left"
+            />
+            <el-table-column
+              label="项目编号"
+              width="150"
+              prop="itemNo"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.itemNo ? scope.row.itemNo : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="项目名称"
+              width="150"
+              prop="chargeName"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.chargeName ? scope.row.chargeName : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="规格"
+              width="150"
+              prop="totalVolume"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.totalVolume ? scope.row.totalVolume : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="单位"
+              width="150"
+              prop="unitCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.unitCode ? scope.row.unitCode : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零比"
+              width="150"
+              prop="partPercent"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.partPercent ? thousandNumber(scope.row.partPercent) : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="指导价"
+              width="150"
+              prop="conditionYbCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.conditionYbCode ? thousandNumber(scope.row.conditionYbCode) : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="价格"
+              width="150"
+              prop="price"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零最小单位"
+              width="150"
+              prop="partMinUnitCode"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.partMinUnitCode ? scope.row.partMinUnitCode : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零指导价"
+              width="150"
+              prop="partConditionPrice"
+              align="center"
+            >
+              <template #default="scope">
+                {{
+                  scope.row.partConditionPrice
+                    ? thousandNumber(scope.row.partConditionPrice)
+                    : "-"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="拆零价格"
+              width="150"
+              prop="partPrice"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.partPrice ? thousandNumber(scope.row.partPrice) : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="调价说明"
+              width="150"
+              prop="description"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.description ? scope.row.description : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="调价时间"
+              width="150"
+              prop="updateTime"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.updateTime ? moment(new Date(scope.row.updateTime)).format("YYYY-MM-DD HH:mm:ss") : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="状态"
+              width="150"
+              prop="statusEnum"
+              align="center"
+            >
+              <template #default="scope">
+                {{ scope.row.statusEnum ? scope.row.statusEnum : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              min-width="290"
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button link type="primary" @click="handleUpdate(scope.row)"
+                  >修改</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </el-tab-pane>
+      </el-tabs>
+    </el-form>
+    <edit :title="title" :open="open" :formData="form"
+      :charge_item_status="charge_item_status" @submit="submitForm" @update:open="handleOpenChange"
+      @update:form="handleFormChange" />
+  </div>
+</template>
+<script setup>
+import { listDefinition, initOption, updateDefinition } from "./components/definition";
+import Edit from './components/edit.vue'
+import moment from 'moment'
+import { thousandNumber } from '@/utils/his.js'
+
+const activeName = ref("1");
+const showSearch = ref("true");
+const loading = ref(true);
+const definitionList = ref([]);
+const total = ref(0);
+
+const { proxy } = getCurrentInstance();
+const { charge_item_status } = proxy.useDict("charge_item_status");
+const options = ref([]);
+const title = ref("");
+const open = ref(false);
+
+const data = reactive({
+  form:{},
+  queryParams: {
+    search: "",
+    definitionType: "",
+    chargeItem: "",
+    searchKey: "",
+    pageNo: 1,
+    pageSize: 10,
+  },
+});
+
+const { queryParams, form } = toRefs(data);
+const handleClick = (tab, event) => {
+  console.log(tab, event);
+  activeName.value = tab.props.name;
+  queryParams.value.pageNo = 1;
+  handleInit();
+  getList();
+};
+
+/** 查询委托单信息列表 */
+function getList() {
+  loading.value = true;
+  queryParams.value.definitionType = activeName.value;
+  listDefinition(queryParams.value).then((response) => {
+    definitionList.value = response.data.records;
+    total.value = response.data.total;
+    loading.value = false;
+  });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNo = 1;
+  getList();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    itemNo: null,
+    chargeName: null,
+    totalVolume: null,
+    unitCode: null,
+    partPercent: null,
+    conditionYbCode: null,
+    price: null,
+    amount: null,
+    partMinUnitCode: null,
+    partConditionPrice: null,
+    partPrice: null,
+    description: null,
+    statusEnum: null,
+    itemId: null,
+  };
+  proxy.resetForm("einfoRef");
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  form.value = row;
+  open.value = true;
+  title.value = "修改项目定价";
+}
+/** 搜索按钮操作 */
+function handleInit() {
+  queryParams.value.definitionType = activeName.value;
+  initOption(queryParams.value).then((response) => {
+    options.value = response.data;
+  });
+}
+
+const handleOpenChange = (value) => {
+  open.value = value;
+};
+
+const handleFormChange = (newForm) => {
+  form.value = { ...newForm };
+};
+
+/** 提交按钮 */
+function submitForm(form) {
+  updateDefinition(form).then(response => {
+    proxy.$modal.msgSuccess("操作成功");
+    open.value = false;
+    getList();
+  });
+}
+handleInit();
+getList();
+</script>
+<style>
+.demo-tabs > .el-tabs__content {
+  color: #6b778c;
+  font-size: 32px;
+  font-weight: 600;
+}
+.el-input__wrapper {
+  height: 32px;
+}
+.el-input__inner {
+  height: 30px;
+}
+.el-tabs__content{
+  height: 80vh;
+}
+</style>