diff --git a/openhis-server/core-admin/pom.xml b/openhis-server/core-admin/pom.xml index aae6c29b..227e9fe0 100644 --- a/openhis-server/core-admin/pom.xml +++ b/openhis-server/core-admin/pom.xml @@ -71,42 +71,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java index 40ed4803..c9989f66 100644 --- a/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java +++ b/openhis-server/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java @@ -41,7 +41,8 @@ public class MybatisPlusConfig { public PaginationInnerInterceptor paginationInnerInterceptor() { PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); // 设置数据库类型为mysql - paginationInnerInterceptor.setDbType(DbType.MYSQL); + //paginationInnerInterceptor.setDbType(DbType.MYSQL); + paginationInnerInterceptor.setDbType(DbType.POSTGRE_SQL); // 设置最大单页限制数量，默认 500 条，-1 不受限制 paginationInnerInterceptor.setMaxLimit(-1L); return paginationInnerInterceptor; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java index 2bb28a10..af451290 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java @@ -3,22 +3,34 @@ */ package com.openhis.web.basicservice.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.utils.MessageUtils; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.domain.HealthcareService; -import com.openhis.administration.mapper.LocationMapper; import com.openhis.administration.service.IChargeItemDefinitionService; import com.openhis.administration.service.IHealthcareServiceService; +import com.openhis.common.constant.CommonConstants; +import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.AccountStatus; import com.openhis.common.enums.WhetherContainUnknown; +import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basicservice.dto.HealthcareServiceAddOrUpdateParam; +import com.openhis.web.basicservice.dto.HealthcareServiceDto; import com.openhis.web.basicservice.dto.HealthcareServiceInitDto; import com.openhis.web.basicservice.mapper.HealthcareServiceBizMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -35,34 +47,19 @@ public class HealthcareServiceController { private final IHealthcareServiceService iHealthcareServiceService; private final IChargeItemDefinitionService iChargeItemDefinitionService; - private final HealthcareServiceBizMapper healthcareServiceBizMapper; - private final LocationMapper locationMapper; /** * 服务管理基础数据初始化 */ @GetMapping(value = "/init") - public R init(@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(value = "searchKey", defaultValue = "") String searchKey) { + public R init() { HealthcareServiceInitDto healthcareServiceInitDto = new HealthcareServiceInitDto(); // 活动标记 List activeFlagOptions = Stream.of(AccountStatus.values()) .map(status -> new HealthcareServiceInitDto.activeFlagOption(status.getValue(), status.getInfo())) .collect(Collectors.toList()); healthcareServiceInitDto.setActiveFlagOptions(activeFlagOptions); - /* // 构建查询条件 - QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey, - new HashSet<>(Arrays.asList("name")), null); - Page LocationPage = HisPageUtils.selectPage( - locationMapper, queryWrapper, pageNo, pageSize, Location.class); - List LocationList = LocationPage.getRecords(); - // 位置信息 - List locationIdOptions = LocationList.stream() - .map(location -> new HealthcareServiceInitDto.locationIdOption(location.getId(), location.getName())) - .collect(Collectors.toList()); - healthcareServiceInitDto.setLocationIdOptions(locationIdOptions);*/ // 是否需要预约 List appointmentRequiredFlagOptions = Stream.of(WhetherContainUnknown.values()) .map(wh -> new HealthcareServiceInitDto.appointmentRequiredFlagOption(wh.getValue(), wh.getInfo())) @@ -75,15 +72,76 @@ public class HealthcareServiceController { * 服务管理 新增 */ @PostMapping(value = "/healthcare-service") - public R add(@Validated @RequestBody HealthcareServiceAddOrUpdateParam healthcareServiceAddOrUpdateParam){ + @Transactional(rollbackFor = Exception.class) + public R add(@Validated @RequestBody HealthcareServiceAddOrUpdateParam healthcareServiceAddOrUpdateParam) { // 服务管理-表单数据 HealthcareService healthcareServiceFormData = healthcareServiceAddOrUpdateParam.getHealthcareServiceFormData(); // 费用定价-表单数据 ChargeItemDefinition chargeItemDefinitionFormData = healthcareServiceAddOrUpdateParam.getChargeItemDefinitionFormData(); // 服务管理-新增 HealthcareService healthcareService = iHealthcareServiceService.addHealthcareService(healthcareServiceFormData); + // 同时保存费用定价 + boolean res = iChargeItemDefinitionService.addChargeItemDefinitionByHealthcareService(healthcareService, chargeItemDefinitionFormData); + return res ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[]{"服务管理"})) : + R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00010, null)); + } - return null; + /** + * 服务管理 分页查询 + * + * @param healthcareServiceDto 查询条件 + * @param searchKey 模糊查询关键字 + * @param pageNo 当前页码 + * @param pageSize 查询条数 + * @param request 请求数据 + * @return 列表信息 + */ + @GetMapping(value = "/healthcare-service-page") + public R getHealthcareServicePage(@RequestBody HealthcareServiceDto healthcareServiceDto, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(healthcareServiceDto, searchKey, + new HashSet<>(Arrays.asList("name", "charge_name")), request); + IPage healthcareServicePage = healthcareServiceBizMapper.getHealthcareServicePage( + new Page<>(pageNo, pageSize), CommonConstants.TableName.ADM_HEALTHCARE_SERVICE, queryWrapper); + return R.ok(healthcareServicePage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); + } + + + /** + * 服务管理 编辑 + * + * @param healthcareServiceAddOrUpdateParam 表单数据 + * @return 编辑结果 + */ + @PutMapping(value = "/healthcare-service") + public R edit(@Validated @RequestBody HealthcareServiceAddOrUpdateParam healthcareServiceAddOrUpdateParam) { + // 服务管理-表单数据 + HealthcareService healthcareServiceFormData = healthcareServiceAddOrUpdateParam.getHealthcareServiceFormData(); + boolean res = iHealthcareServiceService.updateHealthcareService(healthcareServiceFormData); + return res ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"服务管理"})) : + R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); + } + + /** + * 服务管理 删除 + * + * @param id ID + * @return 删除结果 + */ + @DeleteMapping(value = "/healthcare-service") + @Transactional(rollbackFor = Exception.class) + public R delete(@RequestParam Long id) { + boolean res = iHealthcareServiceService.removeById(id); + // 同时删除非同定价 + LambdaQueryWrapper QueryWrapper = new LambdaQueryWrapper<>(); + QueryWrapper.eq(ChargeItemDefinition::getInstanceId, id). + eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.ADM_HEALTHCARE_SERVICE); + iChargeItemDefinitionService.remove(QueryWrapper); + return res ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[]{"服务管理"})) : + R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java new file mode 100644 index 00000000..1ab735fd --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java @@ -0,0 +1,95 @@ +package com.openhis.web.basicservice.dto; + +import com.openhis.common.annotation.Dict; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * 服务管理 Dto + */ +@Data +@Accessors(chain = true) +public class HealthcareServiceDto { + /** + * ID + */ + private Long id; + + /** + * 活动标记 + */ + private Integer activeFlag; + + /** + * 提供部门ID + */ + @Dict(dictTable = "adm_organization",dictCode = "id",dictText = "name") + private Long offeredOrgId; + private String offeredOrgId_dictText; + + /** + * 服务分类 + */ + @Dict(dictCode = "category_code") + private String categoryCode; + private String categoryCode_dictText; + + /** + * 服务类型 + */ + @Dict(dictCode = "service_type_code") + private String typeCode; + private String typeCode_dictText; + + /** + * 服务专业 + */ + @Dict(dictCode = "specialty_code") + private String specialtyCode; + private String specialtyCode_dictText; + + /** + * 地点 + */ + @Dict(dictTable = "adm_location",dictCode = "id",dictText = "name") + private Long locationId; + private String locationId_dictText; + + /** + * 服务名称 + */ + private String name; + + /** + * 说明 + */ + private String comment; + + /** + * 额外细节 + */ + private String extraDetails; + + /** + * 联系方式 + */ + private String contact; + + /** + * 预约要求 + */ + private Integer appointmentRequiredFlag; + + /** + * 名称 + */ + private String chargeName; + + /** + * 基础价格 + */ + private BigDecimal price; + +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java index e57a2a5f..bf6b20fb 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceInitDto.java @@ -6,7 +6,7 @@ import lombok.experimental.Accessors; import java.util.List; /** - * 服务管理 基础数据 + * 服务管理 init基础数据 */ @Data @Accessors(chain = true) @@ -14,7 +14,6 @@ public class HealthcareServiceInitDto { private List activeFlagOptions; - //private List locationIdOptions; private List appointmentRequiredFlagOptions; @@ -32,20 +31,6 @@ public class HealthcareServiceInitDto { } } -/* *//** - * 位置信息 - *//* - @Data - public static class locationIdOption { - private Long value; - private String label; - - public locationIdOption(Long value, String label) { - this.value = value; - this.label = label; - } - }*/ - /** * 是否需要预约 */ diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java index a4444503..7f4e1b22 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/mapper/HealthcareServiceBizMapper.java @@ -1,5 +1,11 @@ package com.openhis.web.basicservice.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.openhis.web.basicservice.dto.HealthcareServiceDto; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; /** @@ -7,4 +13,17 @@ import org.springframework.stereotype.Repository; */ @Repository public interface HealthcareServiceBizMapper { + + /** + * 服务管理 分页查询 + * + * @param page 分页参数 + * @param tableName 定价表名 + * @param queryWrapper 查询条件 + * @return 列表信息 + */ + IPage getHealthcareServicePage(@Param("page") Page page, + @Param("tableName") String tableName, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java index dbcdaed0..338f10d9 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java @@ -3,25 +3,29 @@ */ package com.openhis.web.datadictionary.controller; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; +import java.util.stream.Stream; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.Supplier; +import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.service.ISupplierService; import com.openhis.common.constant.PromptMsgConstant; -import com.openhis.web.datadictionary.dto.SupplierDto; -import com.openhis.web.datadictionary.dto.SupplierSearchParam; +import com.openhis.common.enums.SupplierType; +import com.openhis.common.utils.HisPageUtils; +import com.openhis.common.utils.HisQueryUtils; +import com.openhis.web.datadictionary.dto.*; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.openhis.clinical.domain.ConditionDefinition; -import com.openhis.clinical.service.IConditionDefinitionService; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,81 +38,86 @@ import javax.servlet.http.HttpServletRequest; * @date 2025-02-21 */ @RestController -@RequestMapping("/data-dictionary-supplier") +@RequestMapping("/data-dictionary/supplier") @Slf4j @AllArgsConstructor public class SupplierManagementController { private final ISupplierService supplierService; + private final SupplierMapper supplierMapper; + + /** + * 厂商/产地初始化 + * + * @return + */ + @GetMapping("/information-init") + public R getSupplierInit() { + SupplierInitDto supplierInitDto = new SupplierInitDto(); + // 获取厂商/产地种类 + List supplierTypeOption = Stream.of(SupplierType.values()) + .map(status -> new SupplierInitDto.supplierTypeOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + supplierInitDto.setSupplierTypeOptions(supplierTypeOption); + return R.ok(supplierInitDto); + } /** * 厂商/产地查询 * * @param supplierSearchParam 查询条件 + * @param searchKey 查询条件-模糊查询 * @param pageNo 查询条件 * @param pageSize 查询条件 * @return 厂商/产地查询结果 */ @GetMapping(value = "/get-supplier-list") public R getSupplierList(SupplierSearchParam supplierSearchParam, + @RequestParam(value = "searchKey", defaultValue = "") String searchKey, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) { - // 查询条件初始化 - Supplier supplier = new Supplier(); - BeanUtils.copyProperties(supplierSearchParam, supplier); - - // 查询 - Page supplierPage = supplierService.getPage(supplier,pageNo,pageSize); - // 定义【入库单据分页列表DTO】的分页，传入【页码】、【行数】、及上面分页的【总数】 - Page returnPage = - new Page<>(supplierPage.getCurrent(), supplierPage.getSize(), supplierPage.getTotal()); -// supplierPage -// supplierPage.map(item -> { -// SupplierDto supplierDto = new SupplierDto(); -// BeanUtils.copyProperties(item, supplierDto); // 使用 BeanUtils 复制属性 -// // 如果有特殊字段需要手动转换，可以在这里处理 -// return supplierDto; -// }); - - return R.ok(returnPage); + // 构建查询条件 + QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(supplierSearchParam, + searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request); + // 设置排序 + queryWrapper.orderByAsc("bus_no"); + // 分页查询 + Page supplierPage = + HisPageUtils.selectPage(supplierMapper, queryWrapper, pageNo, pageSize, SupplierDto.class); + // 返回【病种目录列表DTO】分页 + return R.ok(supplierPage); } /** * 添加供应商信息 * - * @param supplierDto 供应商信息 + * @param supplierUpDto 供应商信息 */ @PostMapping("/add-supplier") - public R addSupplyRequest(@Validated @RequestBody SupplierDto supplierDto) { - // 初始化参数 - Supplier supplier = new Supplier(); - BeanUtils.copyProperties(supplierDto, supplier); - // 如果业务上不需要其它处理 直接调用service的保存方法 - boolean saveSupplierSuccess = supplierService.save(supplier); + public R addSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) { - if (!saveSupplierSuccess) { - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); - } - - return saveSupplierSuccess - ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"厂商/供应商信息"})) - : R.fail(PromptMsgConstant.Common.M00007, null); + Supplier supplierInfo = new Supplier(); + BeanUtils.copyProperties(supplierUpDto, supplierInfo); + return supplierService.addSupplier(supplierInfo) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00008, null)); } /** * 编辑供应商信息 * - * @param supplierDto 供应商信息 + * @param supplierUpDto 供应商信息 */ @PutMapping("/edit-supplier") - public R editSupplyRequest(@Validated @RequestBody SupplierDto supplierDto) { - // 初始化参数 - Supplier supplier = new Supplier(); - BeanUtils.copyProperties(supplierDto, supplier); + public R editSupplyRequest(@Validated @RequestBody SupplierUpDto supplierUpDto) { - return supplierService.updateById(supplier) ? - R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"})) - : R.fail(PromptMsgConstant.Common.M00007, null); + Supplier supplier = new Supplier(); + BeanUtils.copyProperties(supplierUpDto, supplier); + + // 更新供应商信息信息 + return supplierService.updateById(supplier) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"厂商/供应商信息"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } @@ -120,10 +129,56 @@ public class SupplierManagementController { */ @GetMapping(value = "/get-supplier-detail") public R getSupplierDetail(@RequestParam(name = "id", required = true) String supplierId) { + SupplierDto supplierDto = new SupplierDto(); + // 根据ID查询【供应商信息】 + Supplier supplier = supplierService.getById(supplierId); + BeanUtils.copyProperties(supplier, supplierDto); + return R.ok(supplierDto); + } + /** + * 厂商/产地停用 + * + * @param ids 厂商/产地ID列表 + * @return + */ + @PutMapping("/information-stop") + public R editSupplierStop(@RequestBody List ids) { + List supplierList = new CopyOnWriteArrayList<>(); - // 查询 - Supplier supplierDetail = supplierService.getById(supplierId); - return R.ok(supplierDetail); + // 取得更新值 + for (Long detail : ids) { + Supplier supplier = new Supplier(); + supplier.setId(detail); + supplier.setActiveFlag(0); + supplierList.add(supplier); + } + // 更新厂商/产地信息 + return supplierService.updateBatchById(supplierList) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); + } + + /** + * 厂商/产地启用 + * + * @param ids 厂商/产地ID列表 + * @return + */ + @PutMapping("/information-start") + public R editSupplierStart(@RequestBody List ids) { + List supplierList = new CopyOnWriteArrayList<>(); + + // 取得更新值 + for (Long detail : ids) { + Supplier supplier = new Supplier(); + supplier.setId(detail); + supplier.setActiveFlag(1); + supplierList.add(supplier); + } + // 更新厂商/产地信息 + return supplierService.updateBatchById(supplierList) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"疾病目录"})) + : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java index f57eff9e..89c11304 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java @@ -5,6 +5,8 @@ package com.openhis.web.datadictionary.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.experimental.Accessors; @@ -22,6 +24,7 @@ import java.util.Date; public class SupplierDto { /** ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 编号 */ @@ -52,5 +55,6 @@ public class SupplierDto { private Integer activeFlag; /** 机构编号 */ + @JsonSerialize(using = ToStringSerializer.class) private Long orgId; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java new file mode 100644 index 00000000..b6957a7f --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java @@ -0,0 +1,33 @@ +package com.openhis.web.datadictionary.dto; + +import java.util.ArrayList; +import java.util.List; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 厂商/产地初始dto + * + * @author dh + * @date 2025-02-28 + */ +@Data +@Accessors(chain = true) +public class SupplierInitDto { + private List supplierTypeOptions; + + /** + * 状态 + */ + @Data + public static class supplierTypeOption { + private Integer value; + private String info; + + public supplierTypeOption(Integer value, String info) { + this.value = value; + this.info = info; + } + } +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java index 71fe59ec..65f1b91a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java @@ -24,16 +24,11 @@ public class SupplierSearchParam implements Serializable { */ @Schema(description = "编号") private String busNo; - /** - * 名称* - */ - @Schema(description = "名称") - private String name; /** * 名称* */ @Schema(description = "供应商类型") - private String typeEnum; + private Integer typeEnum; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java new file mode 100644 index 00000000..f7035121 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java @@ -0,0 +1,71 @@ +/* + * Copyright ©2023 CJB-CNIT Team. All rights reserved + */ +package com.openhis.web.datadictionary.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 供应商保存dto + * + * @author dh + * @date 2025-02-24 + */ +@Data +@Accessors(chain = true) +public class SupplierUpDto { + + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** 编号 */ + @NotBlank(message = "编号不能为空") + private String busNo; + + /** 名称 */ + @NotBlank(message = "名称不能为空") + private String name; + + /** 类型 */ + @NotNull(message = "类型不能为空") + private Integer typeEnum; + + /** 地址 */ + @NotBlank(message = "地址不能为空") + private String address; + + /** 拼音码 */ + @NotBlank(message = "拼音码不能为空") + private String pyStr; + + /** 五笔码 */ + @NotBlank(message = "五笔码不能为空") + private String wbStr; + + /** 联系人电话 */ + @NotBlank(message = "联系人电话不能为空") + private String phone; + + /** 联系人邮箱 */ + @NotBlank(message = "联系人邮箱不能为空") + private String email; + + /** 活动标识 */ + private Integer activeFlag; + + /** 机构编号 */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orgId; +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java index c5f75df0..7d046023 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java @@ -223,7 +223,7 @@ public class PatientInformationController { return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); } - return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"病人信息"})); + return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"})); } /** @@ -249,11 +249,7 @@ public class PatientInformationController { Page patientInformationPage = new Page<>(pageNo, pageSize, total); patientInformationPage.setRecords(listPatients); - if (patientInformationPage == null || patientInformationPage.getRecords().isEmpty()) { - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); - } - return R.ok(patientInformationPage, - MessageUtils.createMessage(PromptMsgConstant.Common.M00009, new Object[] {"病人信息"})); + return R.ok(patientInformationPage); } } diff --git a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties b/openhis-server/openhis-application/src/main/resources/i18n/messages.properties index dec8fe35..31c39ddf 100644 --- a/openhis-server/openhis-application/src/main/resources/i18n/messages.properties +++ b/openhis-server/openhis-application/src/main/resources/i18n/messages.properties @@ -42,4 +42,5 @@ apl.common.M00005={0}删除成功 apl.common.M00006=操作失败,该数据已被他人删除,请刷新后重试 apl.common.M00007=操作失败,该数据已被他人更改,请刷新后重试 apl.common.M00008=请勿重复提交 -apl.common.M00009=查询成功 \ No newline at end of file +apl.common.M00009=查询成功 +apl.common.M00010=操作失败,请联系管理员 \ No newline at end of file diff --git a/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml index 85dec8ae..bd9f4ffd 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/basicservice/HealthcareServiceBizMapper.xml @@ -4,4 +4,49 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + \ No newline at end of file diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml index 5f27675b..74cd19fe 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml @@ -42,12 +42,25 @@ - AND busNo LIKE CONCAT(#{busNo}, '%') + AND pt.bus_no LIKE CONCAT('%',#{busNo}, '%') - AND name LIKE CONCAT(#{name}, '%') + + + + AND pt.name LIKE CONCAT('%', #{name}, '%') + + + + AND pt.py_str LIKE CONCAT('%', #{name}, '%') + + + + AND (pt.name LIKE CONCAT('%', #{name}, '%') OR pt.py_str LIKE CONCAT('%', #{name}, '%')) + + ORDER BY pt.bus_no @@ -62,12 +75,25 @@ - AND busNo LIKE CONCAT(#{busNo}, '%') + AND pt.bus_no LIKE CONCAT('%',#{busNo}, '%') - AND name LIKE CONCAT(#{name}, '%') + + + + AND pt.name LIKE CONCAT('%', #{name}, '%') + + + + AND pt.py_str LIKE CONCAT('%', #{name}, '%') + + + + AND (pt.name LIKE CONCAT('%', #{name}, '%') OR pt.py_str LIKE CONCAT('%', #{name}, '%')) + + diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java index 14871d87..16c0a30d 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java @@ -52,5 +52,10 @@ public class PromptMsgConstant { */ String M00009 = "apl.common.M00009"; + /** + * 操作失败,请联系管理员 + */ + String M00010 = "apl.common.M00010"; + } } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java index adbfdd2a..fb63ec88 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java @@ -38,8 +38,8 @@ public class ChargeItemDefinition extends HisBaseEntity { /** 状态 */ private PublicationStatus statusEnum; - /** 机构编码 */ - private String orgCode; + /** 机构ID */ + private Long orgId; /** 描述 */ private String description; @@ -60,7 +60,7 @@ public class ChargeItemDefinition extends HisBaseEntity { private String typeCode; /** 医保类别 */ - private Integer ybType; + private String ybType; /** 是否使用详细价格规则 */ private Integer conditionFlag; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java index e2c99a71..8e7dabbc 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemDefinitionService.java @@ -3,6 +3,7 @@ package com.openhis.administration.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.administration.domain.ChargeItemDefinition; +import com.openhis.administration.domain.HealthcareService; /** * 费用定价管理Service接口 @@ -14,17 +15,17 @@ public interface IChargeItemDefinitionService extends IService getPage(ChargeItemDefinition chargeItemDefinition, Integer pageNo, Integer pageSize); /** * 新增费用定价 - * + * * @param chargeItemDefinition 新增内容 * @return 新增结果 */ @@ -32,9 +33,20 @@ public interface IChargeItemDefinitionService extends IService { + /** + * 服务管理 新增 + * @param healthcareService 表单信息 + * @return 入库后信息 + */ HealthcareService addHealthcareService(HealthcareService healthcareService); + /** + * 服务管理 编辑 + * @param healthcareService 表单信息 + * @return 编辑结果 + */ + boolean updateHealthcareService(HealthcareService healthcareService); + } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java index 4291d475..52d2f9aa 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/ISupplierService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.core.common.core.domain.R; import com.openhis.administration.domain.Supplier; +import com.openhis.clinical.domain.ConditionDefinition; import com.openhis.workflow.domain.SupplyRequest; import org.springframework.web.bind.annotation.RequestParam; @@ -17,15 +18,10 @@ import javax.servlet.http.HttpServletRequest; */ public interface ISupplierService extends IService { /** - * 查询厂商/供应商分页列表 + * 新增供应商 * - * @param supplier 查询条件 - * @param pageNo 查询条件 - * @param pageSize 查询条件 - * @return 供应申请列表 + * @param supplier 病种目录实体 + * @return */ - Page getPage(Supplier supplier, Integer pageNo, Integer pageSize); - - - + boolean addSupplier(Supplier supplier); } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java index 9165da6b..8b9f238d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemDefinitionServiceImpl.java @@ -1,5 +1,7 @@ package com.openhis.administration.service.impl; +import com.openhis.administration.domain.HealthcareService; +import com.openhis.common.constant.CommonConstants; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,6 +11,7 @@ import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.mapper.ChargeItemDefinitionMapper; import com.openhis.administration.service.IChargeItemDefinitionService; import com.openhis.common.enums.DelFlag; +import org.springframework.transaction.annotation.Transactional; /** * 费用定价管理Service业务层处理 @@ -18,19 +21,19 @@ import com.openhis.common.enums.DelFlag; */ @Service public class ChargeItemDefinitionServiceImpl extends ServiceImpl - implements IChargeItemDefinitionService { + implements IChargeItemDefinitionService { /** * 获取分页列表 * * @param chargeItemDefinition 查询条件 - * @param pageNo 页码 - * @param pageSize 页面大小 + * @param pageNo 页码 + * @param pageSize 页面大小 * @return 分页列表 */ @Override public Page getPage(ChargeItemDefinition chargeItemDefinition, Integer pageNo, - Integer pageSize) { + Integer pageSize) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ChargeItemDefinition::getDeleteFlag, DelFlag.NO.getValue()); @@ -73,4 +76,26 @@ public class ChargeItemDefinitionServiceImpl extends ServiceImpl 0; } } + + + /** + * 通过服务管理新增费用定价 + * + * @param healthcareService 服务管理 + * @param chargeItemDefinition 费用定价 + * @return 新增结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean addChargeItemDefinitionByHealthcareService(HealthcareService healthcareService, ChargeItemDefinition chargeItemDefinition) { + // 服务管理主键id + if (healthcareService.getId() != null) { + chargeItemDefinition.setInstanceTable(CommonConstants.TableName.ADM_HEALTHCARE_SERVICE); + chargeItemDefinition.setInstanceId(healthcareService.getId()); + return baseMapper.insert(chargeItemDefinition) > 0; + } else { + return false; + } + } + } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java index caf6c4eb..73f49d45 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java @@ -1,11 +1,11 @@ package com.openhis.administration.service.impl; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.HealthcareService; import com.openhis.administration.mapper.HealthcareServiceMapper; import com.openhis.administration.service.IHealthcareServiceService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 服务项目管理Service业务层处理 @@ -16,10 +16,34 @@ import com.openhis.administration.service.IHealthcareServiceService; @Service public class HealthcareServiceServiceImpl extends ServiceImpl implements IHealthcareServiceService { + + /** + * 服务管理 新增 + * + * @param healthcareService 表单信息 + * @return 入库后信息 + */ @Override - public HealthcareService addHealthcareService(HealthcareService healthcareService){ + @Transactional(rollbackFor = Exception.class) + public HealthcareService addHealthcareService(HealthcareService healthcareService) { baseMapper.insert(healthcareService); return healthcareService; } + /** + * 服务管理 编辑 + * + * @param healthcareService 表单信息 + * @return 编辑结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateHealthcareService(HealthcareService healthcareService) { + if (healthcareService.getId() == null) { + return false; + } else { + return baseMapper.updateById(healthcareService) > 0; + } + } + } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java index 6b5447d3..136dcb90 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/SupplierServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.utils.StringUtils; import com.core.common.utils.bean.BeanUtils; +import com.openhis.clinical.domain.ConditionDefinition; +import com.openhis.clinical.mapper.ConditionDefinitionMapper; import com.openhis.common.enums.DelFlag; import com.openhis.workflow.domain.SupplyRequest; import lombok.AllArgsConstructor; @@ -14,6 +16,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.administration.domain.Supplier; import com.openhis.administration.mapper.SupplierMapper; import com.openhis.administration.service.ISupplierService; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 供应商管理Service业务层处理 @@ -25,43 +30,28 @@ import com.openhis.administration.service.ISupplierService; @Service @AllArgsConstructor public class SupplierServiceImpl extends ServiceImpl implements ISupplierService { - private final SupplierMapper supplierMapper; /** - * 查询厂商/产地列表 + * 新增供应商 * - * @param supplier 查询条件 - * @param pageNo 查询条件 - * @param pageSize 查询条件 - * @return 厂商/产地列表 + * @param supplier 厂商/产地实体 + * @return */ @Override - public Page getPage(Supplier supplier, Integer pageNo, Integer pageSize) { - Page supplierList = new Page<>(); -// // 判断入库数量 -// if (supplyRequest.getItemQuantity() != 0) { -// // 查询供应申请信息列表 -// supplyRequestList = supplyRequestMapper.selectPage(new Page<>(pageNo, pageSize), -// new LambdaQueryWrapper().eq(SupplyRequest::getDeleteFlag, DelFlag.NO.getValue())); -// } else { -// return null; -// } - - // 设置查询条件 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(supplier.getBusNo())) { - lambdaQueryWrapper.eq(Supplier::getBusNo, supplier.getBusNo()); + @Transactional(rollbackFor = Exception.class) + public boolean addSupplier(Supplier supplier) { + // 根据病种编码判断病种是否存在 + List suppliers = + supplierMapper.selectList(new LambdaQueryWrapper() + .eq(Supplier::getBusNo, supplier.getBusNo())); + if (suppliers.size() > 0) { + return false; } - if (StringUtils.isNotEmpty(supplier.getName())) { - lambdaQueryWrapper.eq(Supplier::getName, supplier.getName()); + // 新增供应商 + int insert = supplierMapper.insert(supplier); + if (insert != 1) { + return false; } - if (StringUtils.isNotNull(supplier.getTypeEnum())) { - lambdaQueryWrapper.eq(Supplier::getTypeEnum, supplier.getTypeEnum()); - } - lambdaQueryWrapper.eq(Supplier::getDeleteFlag, DelFlag.NO.getValue()); - - supplierList = supplierMapper.selectPage(new Page<>(pageNo, pageSize), lambdaQueryWrapper); - // 返回入库信息列表 - return supplierList; + return true; } } \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js new file mode 100644 index 00000000..c5945411 --- /dev/null +++ b/openhis-ui-vue3/src/views/basicmanage/supplier/components/supplier.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/openhis"; + +// 查询病种目录列表 +export function getSupplierList(query) { + return request({ + url: '/data-dictionary/supplier/get-supplier-list', + method: 'get', + params: query + }) +} + +// 查询病种目录详细 +export function getSupplierOne(id) { + return request({ + url: '/data-dictionary/supplier/get-supplier-detail/' + parseStrEmpty(id), + method: 'get' + }) +} + +// 新增病种目录 +export function addSupplier(data) { + return request({ + url: '/data-dictionary/supplier/add-supplier', + method: 'post', + data: data + }) +} + +// 修改病种目录 +export function editSupplier(data) { + return request({ + url: '/data-dictionary/supplier/edit-supplier', + method: 'put', + data: data + }) +} + +// // 删除病种目录 +// export function delUser(userId) { +// return request({ +// url: '/system/user/' + userId, +// method: 'delete' +// }) +// } + +// 停用病种目录 +export function stopSupplier(ids) { + return request({ + url: '/data-dictionary/supplier/information-stop', + method: 'put', + data: ids + }) +} + +// 启用病种目录 +export function startSupplier(ids) { + return request({ + url: '/data-dictionary/supplier/information-start', + method: 'put', + data: ids + }) +} \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue new file mode 100644 index 00000000..43a99615 --- /dev/null +++ b/openhis-ui-vue3/src/views/basicmanage/supplier/index.vue @@ -0,0 +1,504 @@ + + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/catalog/device/components/device.js b/openhis-ui-vue3/src/views/catalog/device/components/device.js index d48b4b78..879ec8b3 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/device.js +++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js @@ -3,6 +3,7 @@ import { parseStrEmpty } from "@/utils/openhis"; // 查询器材目录列表 export function getDeviceList(query) { + console.log(query,'aaaaa') return request({ url: '/datadictionary/device/information-page', method: 'get', diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue index c64dc23c..8fe85121 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue @@ -30,7 +30,11 @@ - + @@ -106,12 +110,13 @@ - + /> --> + @@ -137,13 +142,13 @@ - + - + @@ -153,7 +158,7 @@ - + -