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

561 [门诊医生站-医嘱] 医嘱录入后，总量单位显示异常，显示为“null”而非诊疗目录配置值

Browse Source
This commit is contained in:
wangjian963
2026-06-01 16:15:40 +08:00
parent 021701c611
commit 17783bd981
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgeryAppServiceImpl.java
View File

@@ -39,6 +39,7 @@ import com.openhis.web.clinicalmanage.appservice.ISurgeryAppService;
import com.openhis.web.clinicalmanage.dto.SurgeryDto;
import com.openhis.web.clinicalmanage.mapper.SurgeryAppMapper;
import com.openhis.workflow.domain.ServiceRequest;
import com.openhis.workflow.domain.ActivityDefinition;
import com.openhis.workflow.service.IActivityDefinitionService;
import com.openhis.workflow.service.IServiceRequestService;
import org.springframework.beans.BeanUtils;
@@ -365,7 +366,21 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
serviceRequest.setPrescriptionNo(prescriptionNo);
serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
serviceRequest.setQuantity(BigDecimal.valueOf(1)); // 请求数量
serviceRequest.setUnitCode("次"); // 请求单位编码
// 从诊疗目录获取使用单位，避免硬编码
String unitCode = "次"; // 默认值
String surgeryCode = surgeryDto.getSurgeryCode();
if (surgeryCode != null && !surgeryCode.isEmpty()) {
ActivityDefinition activityDef = activityDefinitionService.getOne(
new LambdaQueryWrapper<ActivityDefinition>()
.eq(ActivityDefinition::getBusNo, surgeryCode)
.eq(ActivityDefinition::getCategoryCode, "24")
);
if (activityDef != null && activityDef.getPermittedUnitCode() != null
&& !activityDef.getPermittedUnitCode().isEmpty()) {
unitCode = activityDef.getPermittedUnitCode();
}
}
serviceRequest.setUnitCode(unitCode); // 请求单位编码
serviceRequest.setCategoryEnum(24); // 请求类型：24-手术（新值域，避开 adviceType 碰撞）
serviceRequest.setActivityId(surgeryId); // 手术ID作为诊疗定义id
serviceRequest.setPatientId(surgeryDto.getPatientId()); // 患者

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
View File

@@ -14,6 +14,7 @@ import com.core.common.exception.ServiceException;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.MessageUtils;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.DictUtils;
import com.core.common.utils.StringUtils;
import com.core.web.util.TenantOptionUtil;
import com.openhis.administration.domain.Account;
@@ -2240,9 +2241,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 收费状态
requestBaseDto.setChargeStatus_enumText(
EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
// 单位字典翻译失败时回退使用原始值（如手术申请硬编码了中文单位名）
// 单位字典翻译：优先通过 unit_code 字典翻译编码值，失败时回退使用原始值
if (StringUtils.isNotBlank(requestBaseDto.getUnitCode()) && StringUtils.isBlank(requestBaseDto.getUnitCode_dictText())) {
requestBaseDto.setUnitCode_dictText(requestBaseDto.getUnitCode());
String dictLabel = DictUtils.getDictLabel("unit_code", requestBaseDto.getUnitCode());
if (StringUtils.isNotBlank(dictLabel)) {
requestBaseDto.setUnitCode_dictText(dictLabel);
} else {
requestBaseDto.setUnitCode_dictText(requestBaseDto.getUnitCode());
}
}
}
return R.ok(requestBaseInfo);

20
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
View File

@@ -342,7 +342,25 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
surgeryServiceRequest.setPrescriptionNo(prescriptionNo);
surgeryServiceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());
surgeryServiceRequest.setQuantity(BigDecimal.valueOf(1));
surgeryServiceRequest.setUnitCode("次");
// 从诊疗目录获取使用单位，避免硬编码
String unitCode = "次"; // 默认值
if (activityList != null && !activityList.isEmpty()) {
String dtoUnitCode = activityList.get(0).getUnitCode();
if (dtoUnitCode != null && !dtoUnitCode.isEmpty()) {
unitCode = dtoUnitCode;
} else {
// 从 ActivityDefinition 查询使用单位
Long activityId = activityList.get(0).getAdviceDefinitionId();
if (activityId != null) {
ActivityDefinition activityDef = iActivityDefinitionService.getById(activityId);
if (activityDef != null && activityDef.getPermittedUnitCode() != null
&& !activityDef.getPermittedUnitCode().isEmpty()) {
unitCode = activityDef.getPermittedUnitCode();
}
}
}
}
surgeryServiceRequest.setUnitCode(unitCode);
surgeryServiceRequest.setCategoryEnum(24); // 24-手术（新值域，避开 adviceType 碰撞）
// 优先从 activityList 获取手术 ID
if (activityList != null && !activityList.isEmpty()) {