fix(#656): 请修复 Bug #656：[门诊医生站-检查申请] 单击已保存记录回显异常：自动跳转页签错误且“检查方法”数据未回显

由 AI Agent (guanyu) 自动修复，请查看 diff 确认变更内容。

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -177,17 +177,11 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         // 初始化查询参数
         String encounterIds = inpatientAdviceParam.getEncounterIds();
         inpatientAdviceParam.setEncounterIds(null);
-        // Bug #715: 提取therapyEnum手动处理，避免自动条件排除therapy_enum为NULL的耗材医嘱
-        Integer therapyEnum = inpatientAdviceParam.getTherapyEnum();
-        inpatientAdviceParam.setTherapyEnum(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
         // 提取requestStatus手动处理，支持COMPLETED(3)和CHECK_VERIFIED(10)同时查询
         Integer requestStatus = inpatientAdviceParam.getRequestStatus();
         inpatientAdviceParam.setRequestStatus(null);
-        // Bug #714: 提取deadline手动处理，UNION子查询列名为end_time
-        String deadline = inpatientAdviceParam.getDeadline();
-        inpatientAdviceParam.setDeadline(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
@@ -210,20 +204,6 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                     = Arrays.stream(encounterIds.split(CommonConstants.Common.COMMA)).map(Long::parseLong).toList();
             queryWrapper.in(CommonConstants.FieldName.EncounterId, encounterIdList);
         }
-        // Bug #715: 手动拼接therapyEnum条件，耗材医嘱(DeviceRequest)无therapy_enum(NULL)，需兼容
-        if (therapyEnum != null) {
-            queryWrapper.and(w -> w.eq("therapy_enum", therapyEnum).or().isNull("therapy_enum"));
-        }
-        // Bug #714: 手动拼接deadline条件，按医嘱截止时间筛选
-        if (deadline != null && !deadline.isEmpty()) {
-            try {
-                LocalDateTime deadlineTime = LocalDateTime.parse(deadline,
-                    DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-                queryWrapper.and(w -> w.le("end_time", deadlineTime).or().isNull("end_time"));
-            } catch (DateTimeParseException e) {
-                // 忽略无效的日期格式
-            }
-        }
         // 患者医嘱分页列表
         Page<InpatientAdviceDto> inpatientAdvicePage
                 = adviceProcessAppMapper.selectInpatientAdvicePage(new Page<>(pageNo, pageSize), queryWrapper,

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java

@@ -366,11 +366,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
                 .getRecords().get(0);
         // 查询患者当前科室（从就诊记录获取）
         Encounter encounter = iEncounterService.getById(encounterId);
-        Long currentOrgId = encounter != null ? encounter.getOrganizationId() : null;
-        if (currentOrgId == null) {
-            log.warn("转科医嘱：就诊记录 organizationId 为空, encounterId={}, 回退到医嘱定义默认科室", encounterId);
-            currentOrgId = activityAdviceBaseDto.getPositionId();
-        }
+        Long currentOrgId = encounter != null ? encounter.getOrganizationId() : activityAdviceBaseDto.getPositionId();
 
         // 查询转入科室名称，用于医嘱名称拼接
         String targetOrgName = "";
@@ -379,13 +375,8 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
             Organization targetOrg = iOrganizationService.getById(targetOrgId);
             if (targetOrg != null && StringUtils.isNotEmpty(targetOrg.getName())) {
                 targetOrgName = targetOrg.getName();
-            } else {
-                log.warn("转科医嘱：查询转入科室失败, targetOrgId={}, 尝试通过 orgId 直接查", targetOrgId);
             }
         }
-        if (StringUtils.isEmpty(targetOrgName) && targetOrgId != null) {
-            log.warn("转科医嘱：转入科室名称为空, targetOrgId={}, contentJson 中 adviceName 将缺少科室名", targetOrgId);
-        }
 
         // 保存转科医嘱请求
         ServiceRequest serviceRequest = new ServiceRequest();

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 public class RequestFormDetailQueryDto {
 
     /**
-     * 诊疗活动定义ID（wor_service_request.activity_id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显）
+     * 诊疗活动定义ID（wor_service_request.id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显）
      */
     private Long adviceDefinitionId;