From c309c4f1844861ccebd947126feb99d57a22542c Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Fri, 28 Mar 2025 15:17:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=9D=90=E7=9B=AE=E5=BD=95up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceManageAppServiceImpl.java | 33 +++++++++++++------ .../controller/DiseaseManageController.java | 2 +- .../datadictionary/dto/DeviceManageDto.java | 16 +++++++-- .../dto/DeviceManageSelParam.java | 2 +- .../datadictionary/dto/DeviceManageUpDto.java | 8 +---- .../dto/DiagnosisTreatmentDto.java | 28 +++++++++++++++- .../mapper/DeviceManageMapper.java | 2 ++ 7 files changed, 68 insertions(+), 23 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java index 7d76b9a4..072e7de6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java @@ -13,6 +13,8 @@ import java.util.stream.Stream; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.openhis.administration.domain.Supplier; +import com.openhis.administration.service.ISupplierService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -74,6 +76,9 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { @Autowired private IItemDefinitionService itemDefinitionServic; + @Autowired + private ISupplierService supplierService; + @Autowired(required = false) AssignSeqUtil assignSeqUtil; @@ -93,14 +98,14 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { .collect(Collectors.toList()); deviceManageInitDto.setStatusFlagOptions(statusEnumOptions); - // 获取执行科室 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT); - List organizations = organizationService.list(queryWrapper); - List exeOrganizations = organizations.stream() - .map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName())) - .collect(Collectors.toList()); - deviceManageInitDto.setExeOrganizations(exeOrganizations); +// // 获取执行科室 +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(Organization::getTypeEnum, OrganizationType.HOSPITAL_DEPARTMENT); +// List organizations = organizationService.list(queryWrapper); +// List exeOrganizations = organizations.stream() +// .map(exeOrg -> new DeviceManageInitDto.exeOrganization(exeOrg.getId(), exeOrg.getName())) +// .collect(Collectors.toList()); +// deviceManageInitDto.setExeOrganizations(exeOrganizations); // // 从枚举中获取器材分类 // List deviceCategories = Stream.of(DeviceCategory.values()) // .map(category -> new DeviceManageInitDto.deviceCategory(category.getValue(), category.getInfo())) @@ -108,10 +113,10 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { // deviceManageInitDto.setDeviceCategories(deviceCategories); // 获取器材 - List devicelList = + List deviceList = sysDictTypeService.selectDictDataByType(CommonConstants.DictName.DEVICE_CATEGORY_CODE); // 从字典中获取器材分类 - List deviceCategories = devicelList.stream() + List deviceCategories = deviceList.stream() .map(category -> new DeviceManageInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel())) .collect(Collectors.toList()); deviceManageInitDto.setDeviceCategories(deviceCategories); @@ -122,6 +127,14 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { .collect(Collectors.toList()); deviceManageInitDto.setStatusYBWeatherOptions(statusYBWeatherOption); + // 查询供应商列表 + List supplierList = supplierService.getList(); + // 供应商信息 + List supplierListOptions = supplierList.stream() + .map(supplier -> new DeviceManageInitDto.supplierListOption(supplier.getId(), supplier.getName())) + .collect(Collectors.toList()); + deviceManageInitDto.setSupplierListOptions(supplierListOptions); + return R.ok(deviceManageInitDto); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java index 60e23a5a..1e51a619 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java @@ -112,7 +112,7 @@ public class DiseaseManageController { * @return */ @GetMapping("/information-one") - public R getDiseaseOne(@PathVariable("id") Long id) { + public R getDiseaseOne(@RequestParam Long id) { DiseaseManageDto diseaseManageDto = new DiseaseManageDto(); // 根据ID查询【病种目录】 ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(id); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java index 23e4cb25..e8569c47 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java @@ -133,13 +133,23 @@ public class DeviceManageDto { private Integer allergenFlag; private String allergenFlag_enumText; - /** 售价 */ - private BigDecimal price; - /** 财务类别 */ + @Dict(dictCode = "fin_type_code") private String itemTypeCode; + private String itemTypeCode_dictText; /** 医保类别 */ + @Dict(dictCode = "med_chrgitm_type") private String ybType; + private String ybType_dictText; + + /** 购入价 */ + private BigDecimal purchasePrice; + + /** 零售价 */ + private BigDecimal retailPrice; + + /** 最高零售价 */ + private BigDecimal maximumRetailPrice; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java index 06ed6a10..10fbb9a7 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java @@ -21,5 +21,5 @@ public class DeviceManageSelParam { /** 状态 */ private Integer statusEnum; - + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java index 9a916ce4..8febe63b 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java @@ -124,11 +124,6 @@ public class DeviceManageUpDto { @NotBlank(message = "适用范围不能为空") private String jurisdiction; - /** 执行科室 */ - @NotNull(message = "执行科室不能为空") - @JsonSerialize(using = ToStringSerializer.class) - private Long ruleId; - /** 器材版本 */ private String version; @@ -155,8 +150,7 @@ public class DeviceManageUpDto { private String itemTypeCode; /** 医保类别 */ - @NotNull(message = "财务类别不能为空") + @NotNull(message = "医保类别不能为空") private String ybType; - } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java index 34d09f69..c6ab1373 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java @@ -2,6 +2,7 @@ package com.openhis.web.datadictionary.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.openhis.common.annotation.Dict; import com.openhis.common.enums.ActivityDefCategory; import com.openhis.common.enums.PublicationStatus; @@ -45,7 +46,9 @@ public class DiagnosisTreatmentDto { private String typeEnum_enumText; /** 使用单位 */ + @Dict(dictCode = "rate_code") private String permittedUnitCode; + private String permittedUnitCode_dictText; /** 医保标记 */ private Integer ybFlag; @@ -74,15 +77,38 @@ public class DiagnosisTreatmentDto { /** 规则id */ private Integer ruleId; - /** 归属科室 */ + /** 所属科室 */ + @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name") @JsonSerialize(using = ToStringSerializer.class) private Long orgId; + private String orgId_dictText; /** 所在位置 */ + @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name") @JsonSerialize(using = ToStringSerializer.class) private Long locationId; + private String locationId_dictText; /** 售价 */ private BigDecimal price; + /** 财务类别 */ + @Dict(dictCode = "fin_type_code") + private String typeCode; + private String typeCode_dictText; + + /** 医保类别 */ + @Dict(dictCode = "med_chrgitm_type") + private String ybType; + private String ybType_dictText; + + /** 购入价 */ + private BigDecimal purchasePrice; + + /** 零售价 */ + private BigDecimal retailPrice; + + /** 最高零售价 */ + private BigDecimal maximumRetailPrice; + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java index 3d2153ba..b6cabe7e 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java @@ -8,6 +8,7 @@ import com.openhis.web.datadictionary.dto.DeviceManageDto; import com.openhis.web.datadictionary.dto.MedicationManageDto; import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; /** * 器材目录 @@ -15,6 +16,7 @@ import org.apache.ibatis.annotations.Param; * @author Wuser * @date 2025/3/26 */ +@Repository public interface DeviceManageMapper { /**