feat(operatingroom): 添加手术室类型和所属科室字段支持
- 在手术室管理界面添加类型和所属科室表格列显示 - 添加手术室类型下拉选择功能,支持急诊、择期、日间、复合四种类型 - 添加手术室详情查看页面中的类型字段展示 - 在后端服务中实现手术室类型的字典转换和文本显示 - 添加手术室实体类中的类型和所属机构名称字段 - 更新路由配置注释掉废弃的系统管理相关路径配置
This commit is contained in:
@@ -76,6 +76,26 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
|
||||
operatingRoomPage.getRecords().forEach(e -> {
|
||||
// 状态
|
||||
e.setStatusEnum_dictText(e.getStatusEnum() != null && e.getStatusEnum() == 1 ? "启用" : "停用");
|
||||
// 类型
|
||||
if (e.getRoomTypeEnum() != null) {
|
||||
switch (e.getRoomTypeEnum()) {
|
||||
case 1:
|
||||
e.setRoomTypeEnum_dictText("急诊手术室");
|
||||
break;
|
||||
case 2:
|
||||
e.setRoomTypeEnum_dictText("择期手术室");
|
||||
break;
|
||||
case 3:
|
||||
e.setRoomTypeEnum_dictText("日间手术室");
|
||||
break;
|
||||
case 4:
|
||||
e.setRoomTypeEnum_dictText("复合手术室");
|
||||
break;
|
||||
default:
|
||||
e.setRoomTypeEnum_dictText("未知");
|
||||
break;
|
||||
}
|
||||
}
|
||||
// 拼音码
|
||||
e.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(e.getName()));
|
||||
// 五笔码
|
||||
@@ -105,6 +125,27 @@ public class OperatingRoomAppServiceImpl implements IOperatingRoomAppService {
|
||||
operatingRoomDto.setStatusEnum_dictText(
|
||||
operatingRoom.getStatusEnum() != null && operatingRoom.getStatusEnum() == 1 ? "启用" : "停用");
|
||||
|
||||
// 类型描述
|
||||
if (operatingRoom.getRoomTypeEnum() != null) {
|
||||
switch (operatingRoom.getRoomTypeEnum()) {
|
||||
case 1:
|
||||
operatingRoomDto.setRoomTypeEnum_dictText("急诊手术室");
|
||||
break;
|
||||
case 2:
|
||||
operatingRoomDto.setRoomTypeEnum_dictText("择期手术室");
|
||||
break;
|
||||
case 3:
|
||||
operatingRoomDto.setRoomTypeEnum_dictText("日间手术室");
|
||||
break;
|
||||
case 4:
|
||||
operatingRoomDto.setRoomTypeEnum_dictText("复合手术室");
|
||||
break;
|
||||
default:
|
||||
operatingRoomDto.setRoomTypeEnum_dictText("未知");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// 如果有机构ID,查询机构名称
|
||||
if (operatingRoom.getOrganizationId() != null) {
|
||||
String orgName = commonService.getOrgNameById(operatingRoom.getOrganizationId());
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.openhis.web.basedatamanage.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.common.annotation.Dict;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
@@ -35,6 +36,13 @@ public class OperatingRoomDto implements Serializable {
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 手术室类型
|
||||
*/
|
||||
@Dict(dictCode = "operating_room_type")
|
||||
private Integer roomTypeEnum;
|
||||
private String roomTypeEnum_dictText;
|
||||
|
||||
/**
|
||||
* 所属机构ID
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user