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

更新

Browse Source
This commit is contained in:
liupanting
2025-02-27 13:06:33 +08:00
parent b861e4d4b8
commit 01d960828f
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
View File

@@ -18,7 +18,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R; import com.core.common.core.domain.R;
import com.core.common.core.domain.entity.SysDictData; import com.core.common.core.domain.entity.SysDictData;
import com.core.common.core.domain.entity.SysDictType;
import com.core.common.utils.MessageUtils; import com.core.common.utils.MessageUtils;
import com.core.common.utils.bean.BeanUtils; import com.core.common.utils.bean.BeanUtils;
import com.core.system.service.ISysDictTypeService; import com.core.system.service.ISysDictTypeService;
@@ -80,9 +79,6 @@ public class DiagnosisTreatmentController {
diagnosisTreatmentInitDto.setExeOrganizations(exeOrganizations); diagnosisTreatmentInitDto.setExeOrganizations(exeOrganizations);
// 获取诊疗分类 // 获取诊疗分类
// 查询医疗服务项
SysDictType medical_service_item =
iSysDictTypeService.selectDictTypeByType(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getCode());
// 查询医疗服务项类型 // 查询医疗服务项类型
List<SysDictData> medical_service_items = List<SysDictData> medical_service_items =
iSysDictTypeService.selectDictDataByType(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getCode()); iSysDictTypeService.selectDictDataByType(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getCode());
@@ -94,15 +90,12 @@ public class DiagnosisTreatmentController {
List<DiagnosisTreatmentInitDto.diseaseTreatmentCategory> diseaseTreatmentCategories = new ArrayList<>(); List<DiagnosisTreatmentInitDto.diseaseTreatmentCategory> diseaseTreatmentCategories = new ArrayList<>();
DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory = DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory =
new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(medical_service_item.getDictId(), new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.MEDICAL_SERVICE_ITEM.getValue(),
medical_service_item.getDictName()); ActivityDefCategory.MEDICAL_SERVICE_ITEM.getInfo());
diseaseTreatmentCategory.setChildren(diseaseTreatmentCategoryList); diseaseTreatmentCategory.setChildren(diseaseTreatmentCategoryList);
diseaseTreatmentCategories.add(diseaseTreatmentCategory); diseaseTreatmentCategories.add(diseaseTreatmentCategory);
diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories); diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories);
// 查询手术与治疗
SysDictType medical_service_item2 =
iSysDictTypeService.selectDictTypeByType(ActivityDefCategory.TREATMENT_SURGERY.getCode());
// 查询手术与治疗类型 // 查询手术与治疗类型
List<SysDictData> medical_service_items2 = List<SysDictData> medical_service_items2 =
iSysDictTypeService.selectDictDataByType(ActivityDefCategory.TREATMENT_SURGERY.getCode()); iSysDictTypeService.selectDictDataByType(ActivityDefCategory.TREATMENT_SURGERY.getCode());
@@ -112,10 +105,11 @@ public class DiagnosisTreatmentController {
status.getDictLabel())) status.getDictLabel()))
.collect(Collectors.toList()); .collect(Collectors.toList());
DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory2 = DiagnosisTreatmentInitDto.diseaseTreatmentCategory diseaseTreatmentCategory2 =
new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(medical_service_item2.getDictId(), new DiagnosisTreatmentInitDto.diseaseTreatmentCategory(ActivityDefCategory.TREATMENT_SURGERY.getValue(),
medical_service_item2.getDictName()); ActivityDefCategory.TREATMENT_SURGERY.getInfo());
diseaseTreatmentCategory2.setChildren(diseaseTreatmentCategoryList2); diseaseTreatmentCategory2.setChildren(diseaseTreatmentCategoryList2);
diseaseTreatmentCategories.add(diseaseTreatmentCategory2); diseaseTreatmentCategories.add(diseaseTreatmentCategory2);
diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories); diagnosisTreatmentInitDto.setDiseaseTreatmentCategoryList(diseaseTreatmentCategories);
return R.ok(diagnosisTreatmentInitDto); return R.ok(diagnosisTreatmentInitDto);
} }

4
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
View File

@@ -38,11 +38,11 @@ public class DiagnosisTreatmentInitDto {
*/ */
@Data @Data
public static class diseaseTreatmentCategory { public static class diseaseTreatmentCategory {
private Long value; private Integer value;
private String info; private String info;
private List<diseaseTreatmentType> children = new ArrayList<>(); private List<diseaseTreatmentType> children = new ArrayList<>();
public diseaseTreatmentCategory(Long value, String info) { public diseaseTreatmentCategory(Integer value, String info) {
this.value = value; this.value = value;
this.info = info; this.info = info;
} }