diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java index ee8dbfc0..715b6036 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; import com.core.common.core.domain.R; import com.openhis.web.datadictionary.dto.DeviceManageSelParam; import com.openhis.web.datadictionary.dto.DeviceManageUpDto; +import org.springframework.web.bind.annotation.RequestParam; /** * 器材目录 service @@ -63,7 +64,7 @@ public interface IDeviceManageAppService { * @param id 查询条件 * @return 器材目录查询结果 */ - R getDeviceOne(@PathVariable("id") Long id); + R getDeviceOne(@RequestParam Long id); /** * 器材目录停用 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 015967ab..109fe38a 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 @@ -175,7 +175,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService { * @return 器材目录查询结果 */ @Override - public R getDeviceOne(@PathVariable("id") Long id) { + public R getDeviceOne(@RequestParam Long id) { // 根据ID查询【器材目录】 DeviceDefinition byId = deviceDefinitionService.getById(id); return R.ok(byId); diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java index 8b58c55a..8469e6ee 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java @@ -120,12 +120,18 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo())) .collect(Collectors.toList()); + //拆分属性 + List partAttributeEnumOptions = Stream.of(SplitPropertyCode.values()) + .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo())) + .collect(Collectors.toList()); + medicationManageInitDto.setStatusFlagOptions(statusEnumOptions); medicationManageInitDto.setDomainFlagOptions(domainEnumOptions); medicationManageInitDto.setSupplierListOptions(supplierListOptions); medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories); medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption); medicationManageInitDto.setStatusRestrictedOptions(statusRestrictedOptions); + medicationManageInitDto.setPartAttributeEnumOptions(partAttributeEnumOptions); return R.ok(medicationManageInitDto); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java index b803360a..de991a38 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java @@ -118,7 +118,7 @@ public class DeviceManageController { * @return */ @GetMapping("/information-one") - public R getDeviceOne(@PathVariable("id") Long id) { + public R getDeviceOne(@RequestParam Long id) { return deviceManageAppService.getDeviceOne(id); // // 根据ID查询【器材目录】 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java index 6c2be9b1..8ac5086a 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java @@ -275,5 +275,5 @@ public class MedicationManageDto { /** 最高零售价 */ private BigDecimal maximumRetailPrice; - + } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java index 2051e437..bcf2334b 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java @@ -27,6 +27,8 @@ public class MedicationManageInitDto { private List statusWeatherOptions; // 权限限制 private List statusRestrictedOptions; + // 拆分属性 + private List partAttributeEnumOptions; /** * 状态 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java index f8b14754..a16ce629 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java @@ -234,7 +234,9 @@ public class MedicationManageUpDto { /** 用量限定 */ private BigDecimal usageLimit; + /** 抗生素分类 */ + @Dict(dictCode = "antibiotic_type_code") + private String antibioticCode; + private String antibioticCode_dictText; - - /** 系统类别???? */ } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml index f74ad716..a71f2196 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml @@ -10,7 +10,7 @@ T3.name, T3.py_str, T3.wb_str, - T3.category_enum, + T3.category_code, T3.type_code, T3.unit_code, T3.size, @@ -44,7 +44,7 @@ T1.name, T1.py_str, T1.wb_str, - T1.category_enum, + T1.category_code, T1.type_code, T1.unit_code, T1.size,