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

Revert "套餐设置套餐管理完善"

Browse Source 
This reverts commit 6c15f0d4d5.
This commit is contained in:
nanyangbreeze
2026-02-03 15:30:47 +08:00
parent 97af9d5eee
commit a7602057e2
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
View File

@@ -58,14 +58,12 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
@Override @Override
public R<?> organizationLocationInit() { public R<?> organizationLocationInit() {
OrgLocInitDto initDto = new OrgLocInitDto(); OrgLocInitDto initDto = new OrgLocInitDto();
// 位置类型：药库、药房、耗材库 // 位置类型
List<OrgLocInitDto.locationFormOption> chargeItemStatusOptions = new ArrayList<>(); List<OrgLocInitDto.locationFormOption> chargeItemStatusOptions = new ArrayList<>();
chargeItemStatusOptions chargeItemStatusOptions
.add(new OrgLocInitDto.locationFormOption(LocationForm.CABINET.getValue(), LocationForm.CABINET.getInfo())); .add(new OrgLocInitDto.locationFormOption(LocationForm.CABINET.getValue(), LocationForm.CABINET.getInfo()));
chargeItemStatusOptions.add( chargeItemStatusOptions.add(
new OrgLocInitDto.locationFormOption(LocationForm.PHARMACY.getValue(), LocationForm.PHARMACY.getInfo())); new OrgLocInitDto.locationFormOption(LocationForm.PHARMACY.getValue(), LocationForm.PHARMACY.getInfo()));
chargeItemStatusOptions.add(
new OrgLocInitDto.locationFormOption(LocationForm.WAREHOUSE.getValue(), LocationForm.WAREHOUSE.getInfo()));
// 获取科室下拉选列表 // 获取科室下拉选列表
List<Organization> organizationList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null); List<Organization> organizationList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
@@ -91,8 +89,6 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
locationList = locationService.getCabinetList(); locationList = locationService.getCabinetList();
} else if (LocationForm.PHARMACY.getValue().equals(locationForm)) { } else if (LocationForm.PHARMACY.getValue().equals(locationForm)) {
locationList = locationService.getPharmacyList(); locationList = locationService.getPharmacyList();
} else if (LocationForm.WAREHOUSE.getValue().equals(locationForm)) {
locationList = locationService.getWarehouseList();
} }
List<OrgLocInitDto.locationOption> locationOptions = locationList.stream() List<OrgLocInitDto.locationOption> locationOptions = locationList.stream()
.map(location -> new OrgLocInitDto.locationOption(location.getId(), location.getName())) .map(location -> new OrgLocInitDto.locationOption(location.getId(), location.getName()))

18
openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/index.vue
View File

@@ -264,16 +264,14 @@ function getDiseaseTreatmentList() {
console.log(response, 'response诊疗目录分类查询下拉树结构'); console.log(response, 'response诊疗目录分类查询下拉树结构');
pharmacyDepartmentOptions.value = response.data.locationFormOptions; pharmacyDepartmentOptions.value = response.data.locationFormOptions;
departmentOptions.value = response.data.departmentOptions; departmentOptions.value = response.data.departmentOptions;
// 动态加载所有 locationFormOptions 的子节点（包括药库、药房、耗材库） // 调用 getDiseaseInitLoc 并在 then 回调中赋值
if (response.data.locationFormOptions && response.data.locationFormOptions.length > 0) { getDiseaseInitLoc(response.data.locationFormOptions[0].value).then((children) => {
response.data.locationFormOptions.forEach((option, index) => { pharmacyDepartmentOptions.value[0].children = children;
getDiseaseInitLoc(option.value).then((children) => { });
if (pharmacyDepartmentOptions.value && pharmacyDepartmentOptions.value[index]) {
pharmacyDepartmentOptions.value[index].children = children; getDiseaseInitLoc(response.data.locationFormOptions[1].value).then((children) => {
} pharmacyDepartmentOptions.value[1].children = children;
}); });
});
}
console.log(pharmacyDepartmentOptions.value); console.log(pharmacyDepartmentOptions.value);
}); });