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 ba18dc02..56582f40 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 @@ -11,16 +11,6 @@ import java.util.stream.Stream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.core.common.core.domain.entity.SysDictData; -import com.core.common.utils.ChineseConvertUtils; -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; @@ -30,19 +20,27 @@ import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; +import com.core.common.core.domain.entity.SysDictData; +import com.core.common.utils.ChineseConvertUtils; import com.core.common.utils.MessageUtils; import com.core.common.utils.SecurityUtils; import com.core.common.utils.bean.BeanUtils; import com.core.common.utils.poi.ExcelUtil; +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.constant.PromptMsgConstant; import com.openhis.common.enums.ApplicableScope; import com.openhis.common.enums.PublicationStatus; +import com.openhis.common.enums.Whether; import com.openhis.common.utils.EnumUtils; import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDefinition; import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.service.IMedicationDefinitionService; import com.openhis.medication.service.IMedicationService; +import com.openhis.web.datadictionary.appservice.IItemDefinitionService; import com.openhis.web.datadictionary.appservice.IMedicationManageAppService; import com.openhis.web.datadictionary.dto.MedicationManageDto; import com.openhis.web.datadictionary.dto.MedicationManageInitDto; @@ -103,11 +101,11 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi List medicalList = sysDictTypeService.selectDictDataByType(CommonConstants.DictName.MED_CATEGORY_CODE); // 获取药品分类 - List medicationCategories = Stream.of(DeviceCategory.values()) - .map(category -> new MedicationManageInitDto.dictCategoryCode(category.getValue(), category.getInfo())) + List medicationCategories = medicalList.stream().map( + category -> new MedicationManageInitDto.dictCategoryCode(category.getDictValue(), category.getDictLabel())) .collect(Collectors.toList()); - //获取是/否 列表 + // 获取是/否 列表 // 获取状态 List statusWeatherOption = Stream.of(Whether.values()) .map(status -> new MedicationManageInitDto.statusEnumOption(status.getValue(), status.getInfo())) @@ -118,7 +116,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi medicationManageInitDto.setSupplierListOptions(supplierListOptions); medicationManageInitDto.setMedicationCategoryCodeOptions(medicationCategories); medicationManageInitDto.setStatusWeatherOptions(statusWeatherOption); - + return R.ok(medicationManageInitDto); } @@ -279,7 +277,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi // 新增子表外来药品目录 boolean insertMedicationSuccess = medicationService.addMedication(medicationDetail); // 添加药品成功后,添加相应的条件价格表信息 - boolean insertItemDefinitionSuccess = itemDefinitionServic.addItem(medicationManageUpDto,medicationDetail); + boolean insertItemDefinitionSuccess = itemDefinitionServic.addItem(medicationManageUpDto, medicationDetail); return (insertMedicationSuccess || insertItemDefinitionSuccess) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"药品目录"})) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java index 2e79edad..62936fa3 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java @@ -103,6 +103,7 @@ public class DiagnosisTreatmentController { .stream().map(status -> new DiagnosisTreatmentInitDto.diseaseTreatmentType(status.getDictValue(), status.getDictLabel())) .collect(Collectors.toList()); + DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory2 = new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.TREATMENT_SURGERY.getValue(), ActivityDefCategory.TREATMENT_SURGERY.getInfo()); 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 8017726a..c432b5af 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 @@ -3,7 +3,6 @@ package com.openhis.web.datadictionary.dto; import java.util.ArrayList; import java.util.List; -import com.openhis.web.inventorymanage.dto.PurchaseInventoryInitDto; import lombok.Data; import lombok.experimental.Accessors; @@ -18,15 +17,16 @@ import lombok.experimental.Accessors; public class MedicationManageInitDto { private List statusFlagOptions; private List domainFlagOptions; - //供应商 + // 供应商 private List supplierListOptions; - //药品类型 + // 药品类型 private List medicationCategoryCodeOptions; - //单位编码 + // 单位编码 private List unitCodeOptions; - //是/否 状态 + // 是/否 状态 private List statusWeatherOptions; + /** * 状态 */ @@ -74,11 +74,11 @@ public class MedicationManageInitDto { */ @Data public static class dictCategoryCode { - private Integer value; + private String value; private String info; - List children = new ArrayList<>(); + private List children = new ArrayList<>(); - public dictCategoryCode(Integer value, String info) { + public dictCategoryCode(String value, String info) { this.value = value; this.info = info; }