wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
liuhongrui
2025-03-25 16:22:09 +08:00
parent 85a348b2fa
commit 7ca6b93847
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
View File

@@ -17,7 +17,10 @@ import com.core.system.service.ISysDictTypeService;
import com.openhis.administration.domain.Supplier;
import com.openhis.administration.service.ISupplierService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.DeviceCategory;
import com.openhis.common.enums.Whether;
import com.openhis.web.datadictionary.appservice.IItemDefinitionService;
import com.openhis.web.datadictionary.dto.DeviceManageInitDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -99,15 +102,23 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
// 获取药品分类
List<SysDictData> medicalList =
sysDictTypeService.selectDictDataByType(CommonConstants.DictName.MED_CATEGORY_CODE);
// 获取药品分类List
List<MedicationManageInitDto.dictCategoryCode> medicationListOptions = medicalList.stream()
.map(status -> new MedicationManageInitDto.dictCategoryCode(status.getDictValue(), status.getDictLabel()))
// 获取药品分类
List<MedicationManageInitDto.dictCategoryCode> medicationCategories = Stream.of(DeviceCategory.values())
.map(category -> new MedicationManageInitDto.dictCategoryCode(category.getValue(), category.getInfo()))
.collect(Collectors.toList());
//获取是/否 列表
// 获取状态
List<MedicationManageInitDto.statusEnumOption> statusWeatherOption = Stream.of(Whether.values())
.map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
medicationManageInitDto.setStatusFlagOptions(statusEnumOptions);
medicationManageInitDto.setDomainFlagOptions(domainEnumOptions);
medicationManageInitDto.setSupplierListOptions(supplierListOptions);
medicationManageInitDto.setMedicationCategoryCodeOptions(medicationListOptions);
medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories);
medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption);
return R.ok(medicationManageInitDto);
}

7
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
View File

@@ -25,6 +25,8 @@ public class MedicationManageInitDto {
//单位编码
private List<MedicationManageInitDto.dictCategoryCode> unitCodeOptions;
//是/否 状态
private List<statusEnumOption> statusWeatherOptions;
/**
* 状态
*/
@@ -72,10 +74,11 @@ public class MedicationManageInitDto {
*/
@Data
public static class dictCategoryCode {
private String value;
private Integer value;
private String info;
List<dictCategoryCode> children = new ArrayList<>();
public dictCategoryCode(String value, String info) {
public dictCategoryCode(Integer value, String info) {
this.value = value;
this.info = info;
}