Merge remote-tracking branch 'origin/develop' into develop

561 [门诊医生站-医嘱] 医嘱录入后，总量单位显示异常，显示为“null”而非诊疗目录配置值
544 【智能分诊】排队队列列表无法显示“完诊”状态患者且缺失历史队列查询功能
505 【业务逻辑缺陷】药品医嘱已由药房发药，护士仍能在“医嘱校对”模块执行“退回”操作

.agentforge/analysis/556.md

@@ -0,0 +1,27 @@
+# Bug #556 Analysis
+
+## Title
+【门诊医生站-检验】新增检验申请单时就诊卡号/执行时间未自动回显，且项目列表冗余显示"套餐"文字
+
+## Root Cause Analysis
+
+### Issue 1: 就诊卡号未自动回显
+- **Code**: `inspectionApplication.vue:886` - `formData.medicalrecordNumber = props.patientInfo.identifierNo || ''`
+- **Root Cause**: Logic is correct but depends on `props.patientInfo.identifierNo` being populated. The watch on `props.patientInfo` (line 2074) triggers `initData()`. The card number field itself is correctly bound. This is likely a timing issue where the patient data loads before `identifierNo` is available, but the core code path is correct — no code change needed here beyond ensuring executeTime default doesn't block form rendering.
+
+### Issue 2: 执行时间未默认填充当前系统时间
+- **Code**: `inspectionApplication.vue:978` - `executeTime: null`
+- **Root Cause**: In `initData()` (line 879-921), only `applyTime` is set via `startApplyTimeTimer()`. `formData.executeTime` is never assigned a default value. Similarly in `resetForm()` (line 1550), `executeTime` remains `null`.
+- **Fix**: Add `formData.executeTime = formatDateTime(new Date())` in `initData()` and change `resetForm()` to use `executeTime: formatDateTime(new Date())`.
+
+### Issue 3: 项目列表冗余显示"套餐"文字
+- **Code**: `inspectionApplication.vue:1190` - Already fixed with `packageName` check. But `inspectionApplication.vue:2000` in `loadApplicationToForm()` still uses loose check: `item.feePackageId != null || item.itemName?.includes('套餐')`.
+- **Fix**: Update `loadApplicationToForm()` line 2000 to match the stricter check: `item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`.
+
+## Files to Modify
+- `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue`
+
+## Changes
+1. `initData()`: Add `formData.executeTime = formatDateTime(new Date())` after line 899
+2. `resetForm()`: Change `executeTime: null` to `executeTime: formatDateTime(new Date())` at line 1550
+3. `loadApplicationToForm()`: Fix `isPackage` logic at line 2000

.agentforge/bugs/556-analysis.md

@@ -0,0 +1,53 @@
+# Bug #556 分析报告
+
+## 问题描述
+【门诊医生站-检验】新增检验申请单时：
+1. 就诊卡号字段为空，未自动带出患者就诊卡号
+2. 执行时间字段未自动填充，仅显示占位提示
+3. 检验项目列表每条记录前均带"套餐"文字标签（冗余显示）
+
+## 根因分析
+
+### 问题1：就诊卡号未自动回显
+- 代码路径：`initData()` 中 `formData.medicalrecordNumber = props.patientInfo.identifierNo || ''`
+- 数据绑定：`v-model="formData.medicalrecordNumber"`
+- `props.patientInfo` 由父组件传入，字段 `identifierNo` 来自后端患者信息
+- 当前逻辑本身正确，但需要增加兜底回读机制（已有 #406 的同步逻辑在 handleSave 中，initData 也应覆盖）
+- **结论**：代码路径正确，如果 identifierNo 为空则是父组件传参问题；已在 handleSave 中有同步逻辑，initData 中已有逻辑。无需额外修复。
+
+### 问题2：执行时间未自动填充
+- 根因：`formData.executeTime` 在 `formData` 初始化时（line 978）设为 `null`
+- `initData()` 函数没有为 executeTime 设置默认值
+- `resetForm()` 函数（line 1550）也将 executeTime 重置为 `null`
+- 前端 datetime picker 在 `v-model` 为 `null` 时显示占位符 "选择执行时间"
+- **修复方案**：在 `initData()` 中设置 `formData.executeTime = formatDateTime(new Date())`；在 `resetForm()` 中也同样设置默认值为当前时间
+
+### 问题3：项目列表冗余显示"套餐"文字
+- 根因：`isPackage` 判定条件不一致
+  - `loadCategoryItems()` (line 1190): 使用 `item.feePackageId != null && ... && item.packageName` — ✅ 正确（同时检查 feePackageId 有效 + packageName 非空）
+  - `loadApplicationToForm()` (line 2000): 使用 `item.feePackageId != null || item.itemName?.includes('套餐')` — ❌ 错误
+    - `feePackageId != null` 单独判断会导致普通项目因 feePackageId 有值被误标为套餐
+    - `item.itemName?.includes('套餐')` 更是直接按名称文字判断，极不准确
+- 影响位置：
+  - 检验项目选择区（line 566）：`<el-tag v-if="item.isPackage">套餐</el-tag>`
+  - 已选项目列表（line 617）：`<el-tag v-if="item.isPackage">套餐</el-tag>`
+  - 检验信息详情表格（line 448）：`<el-tag v-if="scope.row.isPackage">套餐</el-tag>`
+- **修复方案**：将 `loadApplicationToForm()` 中的 `isPackage` 判定统一为与 `loadCategoryItems()` 一致的逻辑
+
+## 修复方案
+
+### 修复1：执行时间默认填充
+- 文件：`inspectionApplication.vue`
+- 位置：`initData()` 函数，在已有患者信息赋值后添加 `formData.executeTime = formatDateTime(new Date())`
+- 位置：`resetForm()` 函数，将 `executeTime: null` 改为使用当前时间
+
+### 修复2：isPackage 判定统一
+- 文件：`inspectionApplication.vue`
+- 位置：`loadApplicationToForm()` 函数 line 2000
+- 旧代码：`const isPackage = item.feePackageId != null || item.itemName?.includes('套餐')`
+- 新代码：`const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`
+
+## 验收标准
+1. 新增检验申请单时，执行时间字段自动填充当前系统时间（YYYY-MM-DD HH:mm:ss 格式）
+2. 检验项目列表中，只有真正的套餐项目前显示"套餐"标签，普通项目不显示
+3. 就诊卡号在有患者信息时正常显示

openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java

@@ -1,6 +1,7 @@
 package com.core.framework.config;
 
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -34,7 +35,9 @@ public class ApplicationConfig {
             // 设置日期格式为 yyyy/M/d HH:mm:ss，支持多种格式反序列化
             builder.simpleDateFormat("yyyy/M/d HH:mm:ss");
             // 添加JavaTimeModule支持，用于LocalDateTime
-            builder.modules(new JavaTimeModule());
+            JavaTimeModule javaTimeModule = new JavaTimeModule();
+            javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            builder.modules(javaTimeModule);
             builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss")));
         };
     }

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

@@ -169,11 +169,9 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
                 if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                     orgLoc.getStartTime(), orgLoc.getEndTime())) {
                     Organization org = organizationService.getById(organizationLocation.getOrganizationId());
-                    if (org == null) {
-                        continue;
-                    }
+                    String organizationName = org != null ? org.getName() : ("科室[" + organizationLocation.getOrganizationId() + "]已删除");
                     return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
-                        + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + org.getName() + "时间冲突");
+                        + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
                 }
 
         if (orgLocQueryDto.getId() != null) {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java

@@ -215,7 +215,10 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
                 if (surgery != null) {
                     surgery.setStatusEnum(1); // 1 = 已排期
                     surgery.setUpdateTime(new Date());
-                    
+                    // Bug #558: 手术安排时同步写入手术室确认时间和确认人
+                    surgery.setOperatingRoomConfirmTime(new Date());
+                    surgery.setOperatingRoomConfirmUser(loginUser.getUsername());
+
                     // 填充缺失的申请科室和主刀医生名称
                     fillSurgeryMissingNames(surgery);
                     

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java

@@ -147,6 +147,6 @@ public interface IDoctorStationAdviceAppService {
      */
     IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
 
-    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
+    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode);
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationEmrAppService.java

@@ -63,17 +63,21 @@ public interface IDoctorStationEmrAppService {
      * 获取待写病历列表
      *
      * @param doctorId 医生ID
-     * @return 待写病历列表
+     * @param pageNo 当前页码
+     * @param pageSize 每页条数
+     * @param patientName 患者姓名（可选）
+     * @return 待写病历分页数据
      */
-    R<?> getPendingEmrList(Long doctorId);
+    R<?> getPendingEmrList(Long doctorId, Integer pageNo, Integer pageSize, String patientName);
 
     /**
      * 获取待写病历数量
      *
      * @param doctorId 医生ID
+     * @param patientName 患者姓名（可选）
      * @return 待写病历数量
      */
-    R<?> getPendingEmrCount(Long doctorId);
+    R<?> getPendingEmrCount(Long doctorId, String patientName);
 
     /**
      * 检查患者是否需要写病历

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

@@ -2205,6 +2205,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             // 收费状态
             requestBaseDto.setChargeStatus_enumText(
                     EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
+            // 单位字典翻译失败时回退使用原始值（如手术申请硬编码了中文单位名）
+            if (StringUtils.isNotBlank(requestBaseDto.getUnitCode()) && StringUtils.isBlank(requestBaseDto.getUnitCode_dictText())) {
+                requestBaseDto.setUnitCode_dictText(requestBaseDto.getUnitCode());
+            }
         }
         return R.ok(requestBaseInfo);
     }
@@ -2566,12 +2570,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     }
 
     @Override
-    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
+    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode) {
         IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getExaminationPage(
                 new Page<>(pageNo, pageSize),
                 PublicationStatus.ACTIVE.getValue(),
                 organizationId,
-                searchKey);
+                searchKey,
+                categoryCode);
         return result;
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java

@@ -29,6 +29,7 @@ import com.openhis.document.service.IEmrTemplateService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService;
 import com.openhis.web.doctorstation.dto.EmrTemplateDto;
 import com.openhis.web.doctorstation.dto.PatientEmrDto;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
 /**
  * 医生站-电子病历 应用实现类
  */
+@Slf4j
 @Service
 public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppService {
 
@@ -60,13 +62,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     IDocRecordService docRecordService;
 
     @Resource
-    private EncounterMapper encounterMapper;
-
-    @Resource
-    private PatientMapper patientMapper;
-
-    @Resource
-    private com.openhis.administration.mapper.EncounterParticipantMapper encounterParticipantMapper;
+    private com.openhis.web.doctorstation.mapper.DoctorStationEmrAppMapper doctorStationEmrAppMapper;
 
     /**
      * 添加病人病历信息
@@ -223,52 +219,35 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      * @return 待写病历列表
      */
     @Override
-    public R<?> getPendingEmrList(Long doctorId) {
-        // 由于Encounter实体中没有jzPractitionerUserId字段，我们需要通过关联查询来获取相关信息
-        // 使用医生工作站的mapper来查询相关数据
-        // 这里我们直接使用医生工作站的查询逻辑
+    public R<?> getPendingEmrList(Long doctorId, Integer pageNo, Integer pageSize, String patientName) {
+        List<Map<String, Object>> allRows = doctorStationEmrAppMapper.getPendingEmrList(doctorId, patientName);
+        int total = allRows.size();
 
-        // 查询当前医生负责的、状态为"就诊中"但还没有写病历的患者
-        // 需要通过EncounterParticipant表来关联医生信息
-        List<Encounter> encounters = encounterMapper.selectList(
-            new LambdaQueryWrapper<Encounter>()
-                .eq(Encounter::getStatusEnum, EncounterStatus.IN_PROGRESS.getValue())
-        );
-
-        // 过滤出由指定医生负责且还没有写病历的就诊记录
-        List<Map<String, Object>> pendingEmrs = new ArrayList<>();
-        for (Encounter encounter : encounters) {
-            // 检查该就诊记录是否已经有病历
-            Emr existingEmr = emrService.getOne(
-                new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounter.getId())
-            );
-
-            // 检查该就诊是否由指定医生负责
-            boolean isAssignedToDoctor = isEncounterAssignedToDoctor(encounter.getId(), doctorId);
-
-            if (existingEmr == null && isAssignedToDoctor) {
-                // 如果没有病历且由该医生负责，则添加到待写病历列表
-                Map<String, Object> pendingEmr = new java.util.HashMap<>();
-
-                // 获取患者信息
-                Patient patient = patientMapper.selectById(encounter.getPatientId());
-
-                pendingEmr.put("encounterId", encounter.getId());
-                pendingEmr.put("patientId", encounter.getPatientId());
-                pendingEmr.put("patientName", patient != null ? patient.getName() : "未知");
-                pendingEmr.put("gender", patient != null ? patient.getGenderEnum() : null);
-                // 使用出生日期计算年龄
-                pendingEmr.put("age", patient != null && patient.getBirthDate() != null ?
-                    calculateAge(patient.getBirthDate()) : null);
-                // 使用创建时间作为挂号时间
-                pendingEmr.put("registerTime", encounter.getCreateTime());
-                pendingEmr.put("busNo", encounter.getBusNo()); // 病历号
-
-                pendingEmrs.add(pendingEmr);
-            }
+        // 分页截取
+        int fromIndex = (pageNo - 1) * pageSize;
+        int toIndex = Math.min(fromIndex + pageSize, total);
+        List<Map<String, Object>> pageRows;
+        if (fromIndex >= total) {
+            pageRows = new ArrayList<>();
+        } else {
+            pageRows = allRows.subList(fromIndex, toIndex);
         }
 
-        return R.ok(pendingEmrs);
+        // 计算年龄列
+        for (Map<String, Object> row : pageRows) {
+            Object birthDate = row.get("birthDate");
+            if (birthDate instanceof Date) {
+                row.put("age", calculateAge((Date) birthDate));
+            } else {
+                row.put("age", null);
+            }
+            row.remove("birthDate");
+        }
+
+        Map<String, Object> result = new java.util.HashMap<>();
+        result.put("rows", pageRows);
+        result.put("total", total);
+        return R.ok(result);
     }
 
     /**
@@ -278,14 +257,9 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      * @return 待写病历数量
      */
     @Override
-    public R<?> getPendingEmrCount(Long doctorId) {
-        // 获取待写病历列表，然后返回数量
-        R<?> result = getPendingEmrList(doctorId);
-        if (result.getCode() == 200) {
-            List<?> pendingEmrs = (List<?>) result.getData();
-            return R.ok(pendingEmrs.size());
-        }
-        return R.ok(0);
+    public R<?> getPendingEmrCount(Long doctorId, String patientName) {
+        Long count = doctorStationEmrAppMapper.getPendingEmrCount(doctorId, patientName);
+        return R.ok(count != null ? count.intValue() : 0);
     }
 
     /**
@@ -306,24 +280,6 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
         return R.ok(needWrite);
     }
 
-    /**
-     * 检查就诊是否分配给指定医生
-     *
-     * @param encounterId 就诊ID
-     * @param doctorId 医生ID
-     * @return 是否分配给指定医生
-     */
-    private boolean isEncounterAssignedToDoctor(Long encounterId, Long doctorId) {
-        // 查询就诊参与者表，检查是否有指定医生的接诊记录
-        com.openhis.administration.domain.EncounterParticipant participant =
-            encounterParticipantMapper.selectOne(
-                new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<com.openhis.administration.domain.EncounterParticipant>()
-                    .eq(com.openhis.administration.domain.EncounterParticipant::getEncounterId, encounterId)
-                    .eq(com.openhis.administration.domain.EncounterParticipant::getPractitionerId, doctorId)
-            );
-
-        return participant != null;
-    }
 
     /**
      * 根据出生日期计算年龄

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java

@@ -226,8 +226,9 @@ public class DoctorStationAdviceController {
             @RequestParam(value = "organizationId", required = false) Long organizationId,
             @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
-            @RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
-        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey));
+            @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+            @RequestParam(value = "categoryCode", defaultValue = "23") String categoryCode) {
+        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey, categoryCode));
     }
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/PendingEmrController.java

@@ -26,34 +26,36 @@ public class PendingEmrController {
      * 获取待写病历列表
      *
      * @param doctorId 医生ID
-     * @return 待写病历列表
+     * @param pageNo 当前页码
+     * @param pageSize 每页条数
+     * @param patientName 患者姓名（可选）
+     * @return 待写病历分页数据
      */
     @GetMapping("/pending-list")
-    public R<?> getPendingEmrList(@RequestParam(required = false) Long doctorId) {
-        // 如果没有传递医生ID，则使用当前登录用户ID
+    public R<?> getPendingEmrList(@RequestParam(required = false) Long doctorId,
+                                   @RequestParam(defaultValue = "1") Integer pageNum,
+                                   @RequestParam(defaultValue = "10") Integer pageSize,
+                                   @RequestParam(required = false) String patientName) {
         if (doctorId == null) {
-            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getUserId();
+            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getPractitionerId();
         }
-
-        // 调用服务获取待写病历列表
-        return iDoctorStationEmrAppService.getPendingEmrList(doctorId);
+        return iDoctorStationEmrAppService.getPendingEmrList(doctorId, pageNum, pageSize, patientName);
     }
 
     /**
      * 获取待写病历数量
-     * 
+     *
      * @param doctorId 医生ID
+     * @param patientName 患者姓名（可选）
      * @return 待写病历数量
      */
     @GetMapping("/pending-count")
-    public R<?> getPendingEmrCount(@RequestParam(required = false) Long doctorId) {
-        // 如果没有传递医生ID，则使用当前登录用户ID
+    public R<?> getPendingEmrCount(@RequestParam(required = false) Long doctorId,
+                                    @RequestParam(required = false) String patientName) {
         if (doctorId == null) {
-            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getUserId();
+            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getPractitionerId();
         }
-        
-        // 调用服务获取待写病历数量
-        return iDoctorStationEmrAppService.getPendingEmrCount(doctorId);
+        return iDoctorStationEmrAppService.getPendingEmrCount(doctorId, patientName);
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java

@@ -203,6 +203,7 @@ public interface DoctorStationAdviceAppMapper {
     IPage<SurgeryItemDto> getExaminationPage(@Param("page") Page<SurgeryItemDto> page,
             @Param("statusEnum") Integer statusEnum,
             @Param("organizationId") Long organizationId,
-            @Param("searchKey") String searchKey);
+            @Param("searchKey") String searchKey,
+            @Param("categoryCode") String categoryCode);
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java

@@ -1,11 +1,20 @@
 package com.openhis.web.doctorstation.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 医生站-电子病历 应用Mapper
  */
 @Repository
 public interface DoctorStationEmrAppMapper {
 
+    List<Map<String, Object>> getPendingEmrList(@Param("doctorId") Long doctorId,
+                                                 @Param("patientName") String patientName);
+
+    Long getPendingEmrCount(@Param("doctorId") Long doctorId,
+                            @Param("patientName") String patientName);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -359,6 +359,24 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 medRequestList.add(item);
             }
         }
+        // 校验医嘱是否已执行，已执行的医嘱需要先取消执行后才能退回
+        List<Long> allRequestIds = performInfoList.stream().map(PerformInfoDto::getRequestId).toList();
+        List<Procedure> allProcedures = procedureService.list(
+                new LambdaQueryWrapper<Procedure>()
+                        .in(Procedure::getRequestId, allRequestIds)
+                        .eq(Procedure::getDeleteFlag, "0"));
+        Set<Long> executedIds = allProcedures.stream()
+                .filter(p -> EventStatus.COMPLETED.getValue().equals(p.getStatusEnum()))
+                .map(Procedure::getId)
+                .collect(Collectors.toSet());
+        Set<Long> cancelledRefundIds = allProcedures.stream()
+                .filter(p -> EventStatus.CANCEL.getValue().equals(p.getStatusEnum()) && p.getRefundId() != null)
+                .map(Procedure::getRefundId)
+                .collect(Collectors.toSet());
+        executedIds.removeAll(cancelledRefundIds);
+        if (!executedIds.isEmpty()) {
+            return R.fail("该医嘱已执行，请先取消执行后再退回");
+        }
         // 校验药品医嘱是否已发药，已发药的医嘱不允许退回
         if (!medRequestList.isEmpty()) {
             List<Long> medReqIds = medRequestList.stream().map(PerformInfoDto::getRequestId).toList();

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java

@@ -133,47 +133,13 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     @Override
     public IPage<PatientBaseInfoDto> getPatientInfo(PatientBaseInfoDto patientBaseInfoDto, String searchKey,
             Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        // 获取登录者信息
+        // 构建基础查询条件
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long userId = loginUser.getUserId();
-        Integer tenantId = loginUser.getTenantId().intValue();
-        
-        // 先构建基础查询条件
         QueryWrapper<PatientBaseInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(
                 patientBaseInfoDto, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name,
                         CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
                 request);
         
-        // 检查是否是精确ID查询（从门诊挂号页面跳转时使用）
-        boolean hasExactIdQuery = (patientBaseInfoDto.getId() != null);
-        
-        // 只有非精确ID查询时，才添加医生患者过滤条件
-        if (!hasExactIdQuery) {
-            // 查询当前用户对应的医生信息
-            LambdaQueryWrapper<com.openhis.administration.domain.Practitioner> practitionerQuery = new LambdaQueryWrapper<>();
-            practitionerQuery.eq(com.openhis.administration.domain.Practitioner::getUserId, userId);
-            // 使用list()避免TooManyResultsException异常，然后取第一个记录
-            List<com.openhis.administration.domain.Practitioner> practitionerList = practitionerService.list(practitionerQuery);
-            com.openhis.administration.domain.Practitioner practitioner = practitionerList != null && !practitionerList.isEmpty() ? practitionerList.get(0) : null;
-            
-            // 如果当前用户是医生，添加医生患者过滤条件
-            if (practitioner != null) {
-                // 查询该医生作为接诊医生（ADMITTER, code="1"）和挂号医生（REGISTRATION_DOCTOR, code="12"）的所有就诊记录的患者ID
-                List<Long> doctorPatientIds = patientManageMapper.getPatientIdsByPractitionerId(
-                        practitioner.getId(),
-                        Arrays.asList(ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode()),
-                        tenantId);
-                
-                if (doctorPatientIds != null && !doctorPatientIds.isEmpty()) {
-                    // 添加患者ID过滤条件 - 注意：这里使用列名而不是表别名
-                    queryWrapper.in("id", doctorPatientIds);
-                } else {
-                    // 如果没有相关患者，返回空结果
-                    queryWrapper.eq("id", -1); // 设置一个不存在的ID
-                }
-            }
-            // 如果不是医生，查询所有患者
-        }
         
         IPage<PatientBaseInfoDto> patientInformationPage
                 = patientManageMapper.getPatientPage(new Page<>(pageNo, pageSize), queryWrapper);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.enums.DelFlag;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
@@ -17,6 +18,8 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
 import com.openhis.document.domain.RequestForm;
 import com.openhis.document.service.IRequestFormService;
+import com.openhis.lab.domain.Specimen;
+import com.openhis.lab.service.ISpecimenService;
 import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
 import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
@@ -67,6 +70,39 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     @Resource
     IActivityDefinitionService iActivityDefinitionService;
 
+    @Resource
+    ISpecimenService iSpecimenService;
+
+    /**
+     * 校验当前用户是否有权操作该申请单（申请者本人或管理员）
+     */
+    private R<?> validateRequestFormPermission(RequestForm requestForm) {
+        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            return null;
+        }
+        Long currentPractitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        Long requesterId = requestForm.getRequesterId();
+        if (currentPractitionerId == null || requesterId == null
+            || !currentPractitionerId.equals(requesterId)) {
+            return R.fail("无操作权限，仅申请开立者或管理员可操作");
+        }
+        return null;
+    }
+
+    /**
+     * 校验关联医嘱是否已采证（存在已采集/已接收标本则不可撤回）
+     */
+    private boolean hasCollectedSpecimen(List<Long> serviceRequestIds) {
+        if (serviceRequestIds == null || serviceRequestIds.isEmpty()) {
+            return false;
+        }
+        long count = iSpecimenService.count(
+            new LambdaQueryWrapper<Specimen>()
+                .in(Specimen::getServiceId, serviceRequestIds)
+                .ge(Specimen::getCollectionStatusEnum, SpecCollectStatus.COLLECTED.getValue()));
+        return count > 0;
+    }
+
     /**
      * 保存申请单
      *
@@ -528,12 +564,17 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         if (requestForm == null) {
             return R.fail("申请单不存在");
         }
+        R<?> permissionResult = validateRequestFormPermission(requestForm);
+        if (permissionResult != null) {
+            return permissionResult;
+        }
         String prescriptionNo = requestForm.getPrescriptionNo();
 
         // 查询该申请单下所有 ServiceRequest（含子项）
         List<ServiceRequest> serviceRequests = iServiceRequestService.list(
             new LambdaQueryWrapper<ServiceRequest>()
-                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
+                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo)
+                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
         if (serviceRequests == null || serviceRequests.isEmpty()) {
             return R.fail("未找到关联的诊疗医嘱");
         }
@@ -563,7 +604,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         // 4. 删除申请单
         iRequestFormService.removeById(requestFormId);
 
-        log.info("检查申请单删除成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
+        log.info("检验申请单删除成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
         return R.ok("删除成功");
     }
 
@@ -576,32 +617,43 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         if (requestForm == null) {
             return R.fail("申请单不存在");
         }
+        R<?> permissionResult = validateRequestFormPermission(requestForm);
+        if (permissionResult != null) {
+            return permissionResult;
+        }
         String prescriptionNo = requestForm.getPrescriptionNo();
 
         // 查询该申请单下所有 ServiceRequest
         List<ServiceRequest> serviceRequests = iServiceRequestService.list(
             new LambdaQueryWrapper<ServiceRequest>()
-                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
+                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo)
+                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
         if (serviceRequests == null || serviceRequests.isEmpty()) {
             return R.fail("未找到关联的诊疗医嘱");
         }
 
+        List<Long> serviceRequestIds = serviceRequests.stream()
+            .map(ServiceRequest::getId).collect(Collectors.toList());
+
+        // 校验：标本已采集则不可撤回
+        if (hasCollectedSpecimen(serviceRequestIds)) {
+            return R.fail("标本已采集，无法撤回");
+        }
+
         // 校验：只有已签发(status=2)的申请单可撤回
         boolean allActive = serviceRequests.stream()
             .allMatch(sr -> RequestStatus.ACTIVE.getValue().equals(sr.getStatusEnum()));
         if (!allActive) {
-            return R.fail("只有已签发状态的申请单可撤回");
+            return R.fail("只有已签发且未采证的申请单可撤回");
         }
 
-        // 将所有 ServiceRequest 状态改回待签发(DRAFT=0)
-        List<Long> serviceRequestIds = serviceRequests.stream()
-            .map(ServiceRequest::getId).collect(Collectors.toList());
+        // 将所有 ServiceRequest 状态改回待签发，与申请单展示状态同步
         iServiceRequestService.update(
             new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue()),
             new LambdaUpdateWrapper<ServiceRequest>()
                 .in(ServiceRequest::getId, serviceRequestIds));
 
-        log.info("检查申请单撤回成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
+        log.info("检验申请单撤回成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
         return R.ok("撤回成功");
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java

@@ -31,8 +31,8 @@ public class HomeController {
         HomeStatisticsDto statisticsDto = homeStatisticsService.getHomeStatistics();
 
         // 获取待写病历数量
-        Long userId = SecurityUtils.getLoginUser().getUserId();
-        R<?> pendingEmrCount = doctorStationEmrAppService.getPendingEmrCount(userId);
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        R<?> pendingEmrCount = doctorStationEmrAppService.getPendingEmrCount(practitionerId, null);
 
         // 将待写病历数量添加到统计数据中
         statisticsDto.setPendingEmr((Integer) pendingEmrCount.getData());

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java

@@ -74,7 +74,6 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             .eq(TriageQueueItem::getTenantId, tenantId)
             .eq(TriageQueueItem::getQueueDate, qd)
             .eq(TriageQueueItem::getDeleteFlag, "0")
-            .ne(TriageQueueItem::getStatus, TriageQueueStatus.COMPLETED.getValue())
             .orderByAsc(TriageQueueItem::getQueueOrder);
         
         // 如果指定了科室，按科室过滤；否则查询所有科室（全科模式）
@@ -92,14 +91,6 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
                 }
             });
         }
-
-        // 双重保险：再次过滤掉 COMPLETED 状态的患者（防止数据库中有异常数据）
-        if (list != null && !list.isEmpty()) {
-            int beforeSize = list.size();
-            list = list.stream()
-                .filter(item -> !TriageQueueStatus.COMPLETED.getValue().equals(item.getStatus()))
-                .collect(java.util.stream.Collectors.toList());
-        }
         return R.ok(list);
     }
 

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -897,7 +897,7 @@
         LIMIT #{limit} OFFSET #{offset}
     </select>
 
-    <!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
+    <!-- 检查/检验项目专用分页查询：仅查指定 category_code + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
     <select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             t1.ID AS advice_definition_id,
@@ -919,7 +919,7 @@
             ON t3.id = t1.org_id
             AND t3.delete_flag = '0'
         WHERE t1.delete_flag = '0'
-          AND t1.category_code = '23'
+          AND t1.category_code = #{categoryCode}
           <if test="searchKey != null and searchKey != ''">
               AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
           </if>

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml

@@ -4,4 +4,38 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationEmrAppMapper">
 
-</mapper>
+    <select id="getPendingEmrList" resultType="java.util.HashMap">
+        SELECT e.id AS "encounterId",
+               e.patient_id AS "patientId",
+               p.name AS "patientName",
+               p.gender_enum AS "gender",
+               p.birth_date AS "birthDate",
+               e.create_time AS "registerTime",
+               e.bus_no AS "busNo"
+        FROM adm_encounter e
+        INNER JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.practitioner_id = #{doctorId}
+        LEFT JOIN adm_patient p ON e.patient_id = p.id
+        LEFT JOIN doc_emr emr ON e.id = emr.encounter_id
+        WHERE e.status_enum = 2
+          AND emr.id IS NULL
+        <if test="patientName != null and patientName != ''">
+            AND p.name LIKE CONCAT('%', #{patientName}, '%')
+        </if>
+        ORDER BY e.create_time DESC
+    </select>
+
+    <select id="getPendingEmrCount" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM adm_encounter e
+        INNER JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.practitioner_id = #{doctorId}
+        LEFT JOIN doc_emr emr ON e.id = emr.encounter_id
+        WHERE e.status_enum = 2
+          AND emr.id IS NULL
+        <if test="patientName != null and patientName != ''">
+            AND e.patient_id IN (
+                SELECT id FROM adm_patient WHERE name LIKE CONCAT('%', #{patientName}, '%')
+            )
+        </if>
+    </select>
+
+</mapper>

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -35,21 +35,27 @@
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
                              AND ws.status_enum = 8
                        ) THEN 6
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.status_enum = 5
+                       ) THEN 7
                        WHEN EXISTS (
                            SELECT 1 FROM wor_service_request ws
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
                              AND ws.status_enum = 3
                        ) THEN 5
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           INNER JOIN lab_specimen ls ON ls.service_id = ws.id
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ls.collection_status_enum >= 1
+                       ) THEN 4
                        WHEN EXISTS (
                            SELECT 1 FROM wor_service_request ws
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
                              AND ws.status_enum = 2
                        ) THEN 1
-                       WHEN EXISTS (
-                           SELECT 1 FROM wor_service_request ws
-                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
-                             AND ws.status_enum = 5
-                       ) THEN 7
                        ELSE 0
                    END AS computed_status
             FROM doc_request_form AS drf

openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -79,11 +79,13 @@ public class OpSchedule extends HisBaseEntity {
     private String surgerySite;
 
     /** 入院时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime admissionTime;
 
     /** 入手术室时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime entryTime;
 
     /** 手术室编码 */
@@ -142,19 +144,23 @@ public class OpSchedule extends HisBaseEntity {
     private String assistant3Code;
 
     /** 手术开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /** 手术结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     /** 麻醉开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime anesStart;
 
     /** 麻醉结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime anesEnd;
 
     /** 手术状态 */

openhis-ui-vue3/src/utils/medicalConstants.js

@@ -220,3 +220,18 @@ export function getSlotStatusDescription(value) {
 export function getSlotStatusClass(status) {
   return SlotStatusClassMap[status] || 'status-unbooked';
 }
+
+/**
+ * 诊疗项目分类代码（对应后端 ActivityDefCategory 枚举）
+ * wor_activity_definition.category_code 字段
+ */
+export const ActivityCategory = {
+  /** 治疗 */
+  TREATMENT: '21',
+  /** 检验 */
+  PROOF: '22',
+  /** 检查 */
+  TEST: '23',
+  /** 手术 */
+  PROCEDURE: '24',
+};

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -749,22 +749,26 @@ function handleInfectiousDiseaseReport() {
     '手足口病': '0311',
   };
 
-  // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
-  const allSelectedDiseases = form.value.diagnosisList
-    .filter(d => d.name && d.hasInfectiousReport !== 1)
-    .map(d => diseaseNameToCode[d.name] || null)
-    .filter(code => code);
+  // 获取所有命中传染病映射的诊断，但跳过已有已提交报卡的诊断
+  const infectiousDiagnoses = form.value.diagnosisList
+    .map(d => ({
+      diagnosis: d,
+      diseaseCode: d.name && d.hasInfectiousReport !== 1 ? diseaseNameToCode[d.name] : null
+    }))
+    .filter(item => item.diseaseCode);
+
+  const allSelectedDiseases = infectiousDiagnoses.map(item => item.diseaseCode);
 
   if (allSelectedDiseases.length === 0) {
     return;
   }
 
-  // 优先使用主诊断（同样跳过已有报卡的）
-  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
-  const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
+  // 优先使用命中传染病映射的主诊断，否则使用第一条命中的传染病诊断
+  const mainInfectiousDiagnosis = infectiousDiagnoses.find(item => item.diagnosis.maindiseFlag === 1)?.diagnosis;
+  const firstInfectiousDiagnosis = infectiousDiagnoses[0].diagnosis;
 
   const diagnosisToShow = {
-    ...(mainDiagnosis || firstDiagnosis),
+    ...(mainInfectiousDiagnosis || firstInfectiousDiagnosis),
     selectedDiseases: allSelectedDiseases
   };
 

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue

@@ -1442,7 +1442,7 @@ async function buildSubmitData() {
   const submitData = {
     cardNo: formData.cardNo,
     visitId: props.patientInfo?.encounterId || formData.encounterId || null,
-    diagId: formData.diagnosisId ? Number(formData.diagnosisId) : null,
+    diagId: formData.diagnosisId || null,
     patId: formData.patientId || null,
     idType: 1, // 默认身份证
     idNo: formData.idNo,

openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -898,6 +898,9 @@ const initData = async () => {
     // 申请日期实时更新（启动定时器）
     startApplyTimeTimer()
 
+    // 执行时间默认填充当前系统时间
+    formData.executeTime = formatDateTime(new Date())
+
     // 获取主诊断信息
     try {
       const res = await getEncounterDiagnosis(props.patientInfo.encounterId)
@@ -1185,9 +1188,9 @@ const loadCategoryItems = async (categoryKey, loadMore = false) => {
 
     // 映射数据格式（从检验项目维护页面的数据结构映射）
     const mappedItems = records.map(item => {
-      // 套餐项目处理：套餐项目使用套餐金额，普通项目使用零售价
-      // BugFix#404: 增加对空字符串的判断，避免空字符串被误认为有效套餐ID
-      const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null'
+      // 套餐项目处理：需同时满足 feePackageId 有效且 packageName 非空
+      // BugFix#556: 增加 packageName 联合判断，避免普通项目因 feePackageId 有值被误标为套餐
+      const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName
       const itemPrice = isPackage
         ? (parseFloat(item.packageAmount || 0) || parseFloat(item.retailPrice || 0) || parseFloat(item.price || 0))
         : (parseFloat(item.retailPrice || 0) || parseFloat(item.price || 0))

openhis-ui-vue3/src/views/doctorstation/components/pendingEmr/index.vue

@@ -89,8 +89,14 @@ const getList = async () => {
     const response = await listPendingEmr(queryParams)
     // 根据后端返回的数据结构调整
     if (response.code === 200) {
-      emrList.value = response.data || []
-      total.value = Array.isArray(response.data) ? response.data.length : 0
+      const data = response.data
+      if (data && data.rows !== undefined) {
+        emrList.value = data.rows || []
+        total.value = data.total || 0
+      } else {
+        emrList.value = Array.isArray(data) ? data : []
+        total.value = emrList.value.length
+      }
     } else {
       ElMessage.error(response.msg || '获取待写病历列表失败')
       emrList.value = []

openhis-ui-vue3/src/views/doctorstation/pendingEmr.vue

@@ -113,10 +113,17 @@ const getList = async () => {
   loading.value = true
   try {
     const response = await listPendingEmr(queryParams)
-    // 根据后端返回的数据结构调整
     if (response.code === 200) {
-      emrList.value = response.data || []
-      total.value = Array.isArray(response.data) ? response.data.length : 0
+      const data = response.data
+      if (data && data.rows !== undefined) {
+        // 新分页格式 {rows, total}
+        emrList.value = data.rows || []
+        total.value = data.total || 0
+      } else {
+        // 兼容旧格式（数组）
+        emrList.value = Array.isArray(data) ? data : []
+        total.value = emrList.value.length
+      }
     } else {
       ElMessage.error(response.msg || '获取待写病历列表失败')
       emrList.value = []

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue

@@ -115,20 +115,20 @@
             </template>
           </el-table-column>
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="280">
             <template #default="scope">
-              <!-- 待签发：可修改、删除 -->
-              <template v-if="isPendingStatus(scope.row)">
-                <el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
-                <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
+              <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+              <template v-if="canManageRow(scope.row)">
+                <template v-if="isPendingStatus(scope.row)">
+                  <el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
+                  <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+                <template v-else-if="isWithdrawableStatus(scope.row)">
+                  <el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
+                </template>
               </template>
-              <!-- 已签发：可撤回 -->
-              <template v-else-if="isIssuedStatus(scope.row)">
-                <el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
-              </template>
-              <!-- 已采证、已送检、报告已出、已作废：仅查看详情 -->
-              <template v-else>
-                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+              <template v-if="isReportStatus(scope.row)">
+                <el-button link type="success" @click="handleViewReport(scope.row)">查看报告</el-button>
               </template>
             </template>
           </el-table-column>
@@ -228,7 +228,10 @@ import {patientInfo} from '../../store/patient.js';
 import {getInspection, deleteRequestForm, withdrawRequestForm, getProofResult} from './api';
 import {getDepartmentList} from '@/api/public.js';
 import LaboratoryTests from '../order/applicationForm/laboratoryTests.vue';
-import {saveInspection} from '../order/applicationForm/api.js';
+import useUserStore from '@/store/modules/user';
+import auth from '@/plugins/auth';
+
+const userStore = useUserStore();
 
 const { proxy } = getCurrentInstance();
 
@@ -378,10 +381,25 @@ const isPendingStatus = (row) => {
   return status === undefined || status === null || status === '' || String(status) === '0';
 };
 
-const isIssuedStatus = (row) => String(getBillStatus(row)) === '1';
+const isWithdrawableStatus = (row) => String(getBillStatus(row)) === '1';
 
 const isReportStatus = (row) => ['6', '8'].includes(String(getBillStatus(row)));
 
+/**
+ * 是否可管理该申请单：申请者本人或管理员
+ */
+const canManageRow = (row) => {
+  if (auth.hasRole('admin')) {
+    return true;
+  }
+  const currentPractitionerId = userStore.practitionerId;
+  const requesterId = row?.requesterId;
+  if (!currentPractitionerId || !requesterId) {
+    return false;
+  }
+  return String(currentPractitionerId) === String(requesterId);
+};
+
 const sortByCreateTimeDesc = (a, b) => {
   const aTime = a?.createTime ? new Date(a.createTime).getTime() : 0;
   const bTime = b?.createTime ? new Date(b.createTime).getTime() : 0;
@@ -586,9 +604,9 @@ const submitEditForm = () => {
  */
 const handleDelete = async (row) => {
   try {
-    await proxy.$modal?.confirm?.(`确定要删除申请单 "${row.prescriptionNo}" 吗？此操作不可恢复。`);
+    await proxy.$modal?.confirm?.('确认作废该申请单吗？作废后不可撤销');
   } catch {
-    return; // 用户取消
+    return;
   }
 
   try {
@@ -605,13 +623,15 @@ const handleDelete = async (row) => {
 };
 
 /**
- * 撤回检验申请单（已签发状态撤回至待签发）
+ * 撤回检验申请单（已签发且未采证状态可撤回）
  */
 const handleWithdraw = async (row) => {
   try {
-    await proxy.$modal?.confirm?.(`确定要撤回申请单 "${row.prescriptionNo}" 吗？撤回后将恢复为待签发状态。`);
+    await proxy.$modal?.confirm?.(
+      '确认撤回该申请单吗？撤回后申请单及关联医嘱将恢复为待签发状态，护士站将同步更新。'
+    );
   } catch {
-    return; // 用户取消
+    return;
   }
 
   try {
@@ -740,6 +760,10 @@ defineExpose({
 
 .report-status-tag {
   cursor: pointer;
+  background-color: #f0f9eb !important;
+  border-color: #67c23a !important;
+  color: #529b2e !important;
+  font-weight: 600;
 }
 
 @keyframes rotating {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue

@@ -17,17 +17,14 @@
           style="width: 300px; margin-bottom: 10px"
         >
           <template #append>
-            <el-button @click="handleSearch">搜索</el-button>
+            <el-button @click="handleSearch" :loading="loading">搜索</el-button>
           </template>
         </el-input>
-        <span v-if="!searchKey" class="total-count">共 {{ totalCount }} 项</span>
-        <span v-else class="total-count">搜索到 {{ filteredCount }} 项 / 共 {{ totalCount }} 项</span>
+        <span class="total-count">共 {{ totalCount }} 项</span>
       </div>
       <el-transfer
         v-model="transferValue"
         :data="transferData"
-        filter-placeholder="项目代码/名称"
-        filterable
         :titles="['未选择', '已选择']"
       />
     </div>
@@ -136,7 +133,8 @@
 <script setup name="LaboratoryTests">
 import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch, computed} from 'vue';
 import {patientInfo} from '../../../store/patient.js';
-import {getApplicationList, saveInspection} from './api';
+import {getExaminationPage, saveInspection} from './api';
+import {ActivityCategory} from '@/utils/medicalConstants';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {ElMessage} from 'element-plus';
@@ -173,9 +171,8 @@ const skipDeptAutoFill = ref(false);
 // 将已加载的全部数据转为 transfer 组件所需的格式
 const buildTransferData = (records) => {
   return records.map((item) => {
-    const priceInfo = item.priceList?.[0] || {};
-    const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-    const unit = item.unitCode_dictText || item.unitCode || '';
+    const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
+    const unit = item.unitCodeDictText || item.unitCode || '';
     return {
       adviceDefinitionId: item.adviceDefinitionId,
       orgId: item.orgId,
@@ -185,7 +182,8 @@ const buildTransferData = (records) => {
   });
 };
 
-// 加载全部数据（不分页，一次性拉取）
+const selectedItemsCache = ref(new Map());
+
 const loadAllData = async () => {
   if (!patientInfo.value?.inHospitalOrgId) {
     applicationListAll.value = [];
@@ -193,13 +191,12 @@ const loadAllData = async () => {
   }
   loading.value = true;
   try {
-    // 使用大 pageSize 一次性拉取所有启用状态的检验类诊疗项目
-    const res = await getApplicationList({
-      pageSize: 9999,
+    const res = await getExaminationPage({
+      pageSize: 100,
       pageNo: 1,
-      categoryCode: '22',
+      categoryCode: ActivityCategory.PROOF,
       organizationId: patientInfo.value.inHospitalOrgId,
-      adviceTypes: [3], // 1 药品 2 耗材 3 诊疗
+      searchKey: searchKey.value,
     });
     if (res.code !== 200) {
       proxy.$message.error(res.message);
@@ -208,8 +205,9 @@ const loadAllData = async () => {
     }
     applicationListAll.value = res.data?.records || [];
     totalCount.value = res.data?.total || 0;
-    // 检验项目列表为异步加载，编辑回显必须在数据就绪后执行，否则已选区一直为空
-    applyEditTransferSelection()
+    if (!searchKey.value) {
+      applyEditTransferSelection();
+    }
   } catch (e) {
     proxy.$message.error('获取检验项目列表失败');
     applicationListAll.value = [];
@@ -218,32 +216,18 @@ const loadAllData = async () => {
   }
 };
 
-// 根据搜索关键词过滤数据
-const filterData = (key) => {
-  if (!key || key.trim() === '') {
-    return applicationListAll.value;
-  }
-  const lowerKey = key.toLowerCase().trim();
-  return applicationListAll.value.filter((item) => {
-    return (
-      item.adviceName?.toLowerCase().includes(lowerKey) ||
-      item.pyStr?.toLowerCase().includes(lowerKey) ||
-      item.adviceBusNo?.toLowerCase().includes(lowerKey)
-    );
-  });
-};
-
-// transfer 组件实际显示的数据（受搜索词影响）
-const transferData = computed(() => buildTransferData(filterData(searchKey.value)));
-// 当前显示的条数
-const filteredCount = computed(() => filterData(searchKey.value).length);
+const transferData = computed(() => buildTransferData(applicationListAll.value));
 
 const getList = async () => {
   await loadAllData();
 };
 
+let searchTimer = null;
 const handleSearch = () => {
-  // 搜索时保持已选中的项目不受影响
+  clearTimeout(searchTimer);
+  searchTimer = setTimeout(() => {
+    loadAllData();
+  }, 300);
 };
 // 编辑初始化标志：避免 applyEditTransferSelection 设置 transferValue 时触发 projectWithDepartment 覆盖 descJson 中的科室值
 const isInitializing = ref(false);
@@ -302,13 +286,17 @@ const projectWithDepartment = (selectProjectIds, type) => {
   const arr = [];
   // 根据选中的项目id查找对应的项目（从全部原始数据中查找）
   selectProjectIds.forEach((element) => {
-    const searchData = applicationListAll.value.find((item) => {
+    let searchData = applicationListAll.value.find((item) => {
       return element == item.adviceDefinitionId;
     });
+    if (!searchData) {
+      searchData = selectedItemsCache.value.get(element);
+    }
     if (searchData) {
       const priceInfo = searchData.priceList?.[0] || {};
-      const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-      const unit = searchData.unitCode_dictText || searchData.unitCode || '';
+      const price = searchData.price != null ? Number(searchData.price).toFixed(2)
+        : priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+      const unit = searchData.unitCodeDictText || searchData.unitCode_dictText || searchData.unitCode || '';
       arr.push({
         adviceDefinitionId: searchData.adviceDefinitionId,
         orgId: searchData.orgId,
@@ -371,6 +359,12 @@ watch(
   (newValue) => {
     if (skipDeptAutoFill.value) return;
     if (isInitializing.value) return;
+    newValue.forEach((id) => {
+      if (!selectedItemsCache.value.has(id)) {
+        const item = applicationListAll.value.find((i) => i.adviceDefinitionId == id);
+        if (item) selectedItemsCache.value.set(id, item);
+      }
+    });
     projectWithDepartment(newValue, 1);
   }
 );
@@ -455,13 +449,14 @@ watch(
   }
 )
 
-// 编辑模式下，项目字典加载完成后重新回显已选项目
+// 编辑模式下，项目字典首次加载完成后回显已选项目（搜索刷新不重置）
 watch(
   () => applicationListAll.value,
   () => {
     if (!props.editData?.requestFormId) return;
     if (!props.editData.requestFormDetailList?.length) return;
     if (!applicationListAll.value.length) return;
+    if (searchKey.value) return;
 
     const selectedIds = [];
     props.editData.requestFormDetailList.forEach((detail) => {
@@ -486,26 +481,29 @@ const submit = () => {
   if (!projectWithDepartment(transferValue.value, 2)) {
     return;
   }
-  let applicationListAllFilter = applicationListAll.value.filter((item) => {
-    return transferValue.value.includes(item.adviceDefinitionId);
-  });
-  applicationListAllFilter = applicationListAllFilter.map((item) => {
+  let applicationListAllFilter = transferValue.value.map((id) => {
+    let item = applicationListAll.value.find((i) => i.adviceDefinitionId == id);
+    if (!item) {
+      item = selectedItemsCache.value.get(id);
+    }
+    if (!item) return null;
+    const priceInfo = item.priceList?.[0] || {};
     return {
       adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
       quantity: 1, // /** 请求数量 */
-      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
-      unitPrice: item.priceList[0].price /** 单价 */,
-      totalPrice: item.priceList[0].price /** 总价 */,
+      unitCode: item.unitCode || priceInfo.unitCode || '' /** 请求单位编码 */,
+      unitPrice: item.price ?? priceInfo.price ?? 0 /** 单价 */,
+      totalPrice: item.price ?? priceInfo.price ?? 0 /** 总价 */,
       positionId: form.targetDepartment || item.positionId, // 用户指定发往科室优先于项目默认执行科室
-      ybClassEnum: item.ybClassEnum, //类别医保编码
-      conditionId: item.conditionId, //诊断ID
-      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
-      adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
-      definitionDetailId: item.definitionDetailId, //费用定价子表ID */
+      ybClassEnum: item.ybClassEnum || '', //类别医保编码
+      conditionId: item.conditionId || '', //诊断ID
+      encounterDiagnosisId: item.encounterDiagnosisId || '', //就诊诊断id
+      adviceType: item.adviceType || 3, ///** 医嘱类型 */
+      definitionId: item.chargeItemDefinitionId || priceInfo.definitionId || '', //费用定价主表ID */
+      definitionDetailId: item.definitionDetailId || priceInfo.definitionDetailId || '', //费用定价子表ID */
       accountId: patientInfo.value.accountId, // // 账户id
     };
-  });
+  }).filter(Boolean);
   const params = {
     activityList: applicationListAllFilter,
     patientId: patientInfo.value.patientId, //患者ID
@@ -520,6 +518,7 @@ const submit = () => {
     if (res.code === 200) {
       proxy.$message.success(isEditMode.value ? '修改成功' : res.msg);
       transferValue.value = [];
+      selectedItemsCache.value.clear();
       emits('submitOk');
     } else {
       proxy.$message.error(res.message);

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue

@@ -207,6 +207,7 @@ import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {getExaminationPage, saveCheckd} from './api';
+import {ActivityCategory} from '@/utils/medicalConstants';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import {WarningFilled, Warning, Refresh, Files, Document, EditPen, Aim, DocumentCopy} from '@element-plus/icons-vue';
 
@@ -276,6 +277,7 @@ const getList = () => {
     pageNo: 1,
     pageSize: 5000,
     searchKey: '',
+    categoryCode: ActivityCategory.TEST,
   })
     .then((res) => {
       if (res.code === 200 && res.data?.records) {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -198,7 +198,7 @@
                     v-model="scope.row.adviceName"
                     placeholder="请选择项目"
                     @input="handleChange"
-                    @click="handleFocus(scope.row, scope.$index)"
+                    @focus="handleFocus(scope.row, scope.$index)"
                     @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
                     @keydown="
                       (e) => {
@@ -640,6 +640,10 @@ function getListInfo(addNewRow) {
           };
         })
         .sort((a, b) => {
+          // 没有 requestTime 的项（新增/组套添加）排在最前面
+          if (!a.requestTime && !b.requestTime) return 0;
+          if (!a.requestTime) return -1;
+          if (!b.requestTime) return 1;
           return new Date(b.requestTime) - new Date(a.requestTime);
         });
       getGroupMarkers(); // 更新标记
@@ -896,31 +900,16 @@ function handleDiagnosisChange(item) {
 function handleFocus(row, index) {
   rowIndex.value = index;
   row.showPopover = true;
+  // Bug #555: handleFocus 只负责开 popover 和初始化查询参数，搜索由 handleChange 统一处理
+  // 避免异步 refresh 用旧闭包 searchKey 覆盖 handleChange 的搜索结果
   const adviceType = row.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
-  // 用 adviceType + categoryCode 组合查找匹配的选项
-  const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
-  const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-  // If the row has an explicit adviceType (saved/existing row), use its own categoryCode.
-  // If no type is selected (new row), use empty string for global search across all categories.
-  const categoryCode = selectedItem ? selectedItem.categoryCode : (row.adviceType != null ? (row.categoryCode || '') : '');
-  const searchKey = row.adviceName || '';
-
-  nextTick(() => {
-    nextTick(() => {
-      const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
-      if (tableRef && tableRef.refresh) {
-        tableRef.refresh(adviceType, categoryCode, searchKey);
-      } else {
-        // fallback: 如果双重 nextTick 仍未挂载，延迟 100ms 再试
-        setTimeout(() => {
-          const tableRef2 = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
-          if (tableRef2 && tableRef2.refresh) {
-            tableRef2.refresh(adviceType, categoryCode, searchKey);
-          }
-        }, 100);
-      }
-    });
-  });
+  let categoryCode = '';
+  if (row.adviceType !== undefined) {
+    const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
+    const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
+    categoryCode = selectedItem ? selectedItem.categoryCode : (row.categoryCode || '');
+  }
+  adviceQueryParams.value = { adviceType, categoryCode, searchKey: '' };
 }
 
 function handleBlur(row) {
@@ -929,20 +918,24 @@ function handleBlur(row) {
 
 function handleChange(value) {
   adviceQueryParams.value.searchKey = value;
-  // 搜索词变化时，调用当前行子组件的 refresh 方法
-  const index = rowIndex.value;
-  if (index >= 0) {
-    const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
-    if (tableRef && tableRef.refresh) {
-      const row = filterPrescriptionList.value[index];
-      const adviceType = row?.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
-      // 用 adviceType + categoryCode 组合查找匹配的选项
+  // @focus 已先于 @input 执行，rowIndex 必定有效
+  const currentIndex = rowIndex.value;
+  if (currentIndex < 0) return;
+  const row = filterPrescriptionList.value[currentIndex];
+  // popover 被 blur 关闭后，用户继续输入时自行打开
+  if (!row.showPopover) {
+    row.showPopover = true;
+  }
+  const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[currentIndex] : adviceTableRef.value;
+  if (tableRef && tableRef.refresh) {
+    const adviceType = row?.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
+    let categoryCode = '';
+    if (row?.adviceType !== undefined) {
       const selectValue = (adviceType == 1 && row?.categoryCode) ? '1-' + row.categoryCode : adviceType;
       const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-      // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
-      const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
-      tableRef.refresh(adviceType, categoryCode, value);
+      categoryCode = selectedItem ? selectedItem.categoryCode : (adviceQueryParams.value.categoryCode || '');
     }
+    tableRef.refresh(adviceType, categoryCode, value);
   }
 }
 
@@ -1579,11 +1572,24 @@ function handleSaveGroup(orderGroupList) {
 
   let successCount = 0;
 
+  // 收集所有要添加的新行，最后统一 unshift 到数组开头（置顶显示）
+  const newRows = [];
+
+  // 记录循环前的数组长度，用于清理循环中创建的临时行
+  const originalLength = prescriptionList.value.length;
+
   orderGroupList.forEach((item) => {
-    rowIndex.value = prescriptionList.value.length;
+    // 使用临时索引，先追加到末尾用于 setValue 填充
+    const tempIndex = prescriptionList.value.length;
+    prescriptionList.value[tempIndex] = {
+      uniqueKey: nextId.value++,
+      isEdit: false,
+      statusEnum: 1,
+    };
 
     if (!item) {
       console.warn('组套中的项目为空');
+      prescriptionList.value.splice(tempIndex, 1);
       return;
     }
 
@@ -1609,18 +1615,12 @@ function handleSaveGroup(orderGroupList) {
       therapyEnum: item.orderDetailInfos?.therapyEnum || '1',
     };
 
-    // 预初始化空行（组套项带预填值，设为 false 让明细字段在表格中直接展示）
-    prescriptionList.value[rowIndex.value] = {
-      uniqueKey: nextId.value++,
-      isEdit: false,
-      statusEnum: 1,
-    };
-
+    rowIndex.value = tempIndex;
     setValue(mergedDetail);
 
     // 创建新的处方项目
     const newRow = {
-      ...prescriptionList.value[rowIndex.value],
+      ...prescriptionList.value[tempIndex],
       patientId: patientInfo.value.patientId,
       encounterId: patientInfo.value.encounterId,
       accountId: accountId.value,
@@ -1639,12 +1639,12 @@ function handleSaveGroup(orderGroupList) {
       orgId: resolveOrgId(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
       // 🔧 修复：同时存储 orgName，确保树匹配不到时仍有中文名称可显示
       orgName: findOrgName(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
-      dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
+      dbOpType: prescriptionList.value[tempIndex].requestId ? '2' : '1',
       conditionId: conditionId.value,
       conditionDefinitionId: conditionDefinitionId.value,
       encounterDiagnosisId: encounterDiagnosisId.value,
       diagnosisName: diagnosisName.value,
-      therapyEnum: prescriptionList.value[rowIndex.value]?.therapyEnum || mergedDetail.therapyEnum || '1',
+      therapyEnum: prescriptionList.value[tempIndex]?.therapyEnum || mergedDetail.therapyEnum || '1',
       // 🔧 修复：确保组套医嘱的 categoryEnum 被正确映射，防止后端 NPE
       categoryEnum: mergedDetail?.categoryEnum || mergedDetail?.categoryCode || item?.categoryCode,
     };
@@ -1663,11 +1663,14 @@ function handleSaveGroup(orderGroupList) {
     }
 
     newRow.contentJson = JSON.stringify(newRow);
-    prescriptionList.value[rowIndex.value] = newRow;
+    newRows.push(newRow);
     successCount++;
   });
-  
-  if (successCount > 0) {
+
+  // 清理循环中创建的临时行，统一添加到数组开头（置顶显示）
+  if (newRows.length > 0) {
+    prescriptionList.value.splice(originalLength); // 移除循环中追加到末尾的临时行
+    prescriptionList.value.unshift(...newRows);
     proxy.$modal.msgSuccess(`成功添加 ${successCount} 个医嘱项`);
   }
 }

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -740,58 +740,59 @@
         </el-form-item>
       </el-form>
 
-      <!-- 结果表格区 -->
-      <el-table
-        ref="applyTableRef"
-        v-loading="applyLoading"
-        :data="applyList"
-        row-key="surgeryNo"
-        @row-click="handleApplyRowClick"
-        :row-class-name="tableRowClassName"
-        style="width: 100%"
-        max-height="340"
-        :scroll="{ y: 340 }"
-      >
-        <el-table-column type="selection" width="55" :selectable="handleSelectable" />
-        <el-table-column label="ID" align="center" width="80" fixed>
-          <template #default="{ $index }">
-            {{ (applyQueryParams.pageNo - 1) * applyQueryParams.pageSize + $index + 1 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="姓名" align="center" prop="name" width="100" />
-        <el-table-column label="手术单号" align="center" prop="surgeryNo" width="120" />
-        <el-table-column label="手术名称" align="center" prop="descJson.surgeryName" min-width="140" show-overflow-tooltip />
-        <el-table-column label="申请科室" align="center" width="100" prop="applyDeptName" />
-        <el-table-column label="手术类型" align="center" width="90">
-          <template #default="scope">
-            {{ getSurgeryTypeName(scope.row.surgeryType) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="手术等级" align="center" width="90">
-          <template #default="scope">
-            {{ getSurgeryLevelName(scope.row.surgeryLevel || scope.row.descJson?.surgeryLevel) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="麻醉方式" align="center" width="90">
-          <template #default="scope">
-            {{ getAnesthesiaName(scope.row.anesthesiaTypeEnum) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="主刀医生" align="center" width="100" prop="mainSurgeonName" />
-      </el-table>
-
-      <!-- 底部分页区 -->
-      <div class="pagination-container apply-pagination">
-        <pagination
-          v-show="applyTotal > 0"
-          :total="applyTotal"
-          :page="applyQueryParams.pageNo"
-          :limit="applyQueryParams.pageSize"
-          @update:page="val => applyQueryParams.pageNo = val"
-          @update:limit="val => applyQueryParams.pageSize = val"
-          @pagination="getSurgicalScheduleList"
-        />
-      </div>
+      <!-- 结果表格卡片 -->
+      <el-card shadow="never" class="apply-card">
+        <el-table
+          ref="applyTableRef"
+          v-loading="applyLoading"
+          :data="applyList"
+          row-key="surgeryNo"
+          @row-click="handleApplyRowClick"
+          :row-class-name="tableRowClassName"
+          style="width: 100%"
+          max-height="320"
+        >
+          <el-table-column type="selection" width="55" :selectable="handleSelectable" />
+          <el-table-column label="ID" align="center" width="80" fixed>
+            <template #default="{ $index }">
+              {{ (applyQueryParams.pageNo - 1) * applyQueryParams.pageSize + $index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="name" width="100" />
+          <el-table-column label="手术单号" align="center" prop="surgeryNo" width="120" />
+          <el-table-column label="手术名称" align="center" prop="descJson.surgeryName" min-width="140" show-overflow-tooltip />
+          <el-table-column label="申请科室" align="center" width="100" prop="applyDeptName" />
+          <el-table-column label="手术类型" align="center" width="90">
+            <template #default="scope">
+              {{ getSurgeryTypeName(scope.row.surgeryType) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="手术等级" align="center" width="90">
+            <template #default="scope">
+              {{ getSurgeryLevelName(scope.row.surgeryLevel || scope.row.descJson?.surgeryLevel) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="麻醉方式" align="center" width="90">
+            <template #default="scope">
+              {{ getAnesthesiaName(scope.row.anesthesiaTypeEnum) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="主刀医生" align="center" width="100" prop="mainSurgeonName" />
+        </el-table>
+        <!-- 分页在卡片内部 -->
+        <div class="apply-pagination">
+          <pagination
+            v-show="applyTotal > 0"
+            :total="applyTotal"
+            :page="applyQueryParams.pageNo"
+            :limit="applyQueryParams.pageSize"
+            layout="total, sizes, prev, pager, next"
+            @update:page="val => applyQueryParams.pageNo = val"
+            @update:limit="val => applyQueryParams.pageSize = val"
+            @pagination="getSurgicalScheduleList"
+          />
+        </div>
+      </el-card>
       <!-- 底部操作区 -->
       <template #footer>
         <div class="dialog-footer" style="padding-top: 12px; border-top: 1px solid #ebeef5">
@@ -2339,19 +2340,35 @@ function getRowClassName({ row, rowIndex }) {
   margin-left: 10px;
 }
 
-/* 手术申请查询弹窗 — 分页与footer间距 */
+/* 手术申请查询弹窗 — flex 布局确保分页不溢出 */
 .surgery-apply-dialog :deep(.el-dialog__body) {
+  display: flex;
+  flex-direction: column;
   padding-bottom: 16px;
+  overflow: hidden;
 }
 .surgery-apply-dialog :deep(.el-dialog__footer) {
-  padding-top: 8px;
+  padding-top: 0;
+}
+.surgery-apply-dialog :deep(.apply-card) {
+  flex: 1;
+  overflow: hidden;
+  min-height: 0;
+}
+.surgery-apply-dialog :deep(.apply-card .el-card__body) {
+  overflow-y: auto;
 }
 .surgery-apply-dialog :deep(.apply-pagination) {
-  padding-top: 12px;
-  padding-bottom: 16px;
+  display: flex;
+  justify-content: flex-end;
+  padding-top: 8px;
+  border-top: 1px solid #ebeef5;
+}
+.surgery-apply-dialog :deep(.apply-pagination .pagination-container) {
+  margin-top: 0;
 }
 .surgery-apply-dialog :deep(.apply-pagination .el-pagination) {
-  margin-right: 80px;
+  position: static;
 }
 
 /* 选中行样式 */
@@ -2367,17 +2384,33 @@ function getRowClassName({ row, rowIndex }) {
 
 <style>
 /* 手术申请查询弹窗 — 非 scoped 确保穿透 teleport */
-.surgery-apply-dialog .apply-pagination {
-  padding-top: 12px !important;
-  padding-bottom: 16px !important;
-}
-.surgery-apply-dialog .apply-pagination .el-pagination {
-  margin-right: 80px !important;
-}
 .surgery-apply-dialog .el-dialog__body {
+  display: flex !important;
+  flex-direction: column !important;
   padding-bottom: 16px !important;
+  overflow: hidden !important;
 }
 .surgery-apply-dialog .el-dialog__footer {
+  padding-top: 0 !important;
+}
+.surgery-apply-dialog .apply-card {
+  flex: 1 !important;
+  overflow: hidden !important;
+  min-height: 0 !important;
+}
+.surgery-apply-dialog .apply-card .el-card__body {
+  overflow-y: auto !important;
+}
+.surgery-apply-dialog .apply-pagination {
+  display: flex !important;
+  justify-content: flex-end !important;
   padding-top: 8px !important;
+  border-top: 1px solid #ebeef5 !important;
+}
+.surgery-apply-dialog .apply-pagination .pagination-container {
+  margin-top: 0 !important;
+}
+.surgery-apply-dialog .apply-pagination .el-pagination {
+  position: static !important;
 }
 </style>

openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue

@@ -88,16 +88,16 @@
           </el-table>
         </div>
         <div class="candidate-actions">
-          <el-button 
-            type="primary" 
-            :disabled="selectedCandidates.length === 0"
+          <el-button
+            type="primary"
+            :disabled="selectedCandidates.length === 0 || isQueryingHistory"
             @click="handleAddToQueue"
           >
             加入队列 >>
           </el-button>
-          <el-button 
-            type="primary" 
-            :disabled="filteredCandidatePoolList.length === 0"
+          <el-button
+            type="primary"
+            :disabled="filteredCandidatePoolList.length === 0 || isQueryingHistory"
             @click="handleAddAllToQueue"
           >
             一键加入队列
@@ -109,6 +109,19 @@
       <div class="right-panel">
         <div class="panel-header">
           <span class="panel-title">② 智能队列 (全科)</span>
+          <div class="history-query">
+            <el-date-picker
+              v-model="queryDate"
+              type="date"
+              placeholder="选择日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              size="small"
+              style="width: 150px"
+            />
+            <el-button type="primary" size="small" @click="handleHistoryQuery">查询</el-button>
+            <el-button size="small" @click="handleTodayQuery">今天</el-button>
+          </div>
         </div>
         <div class="table-container">
           <el-table
@@ -173,25 +186,25 @@
         </div>
         <div class="display-options">
           <div class="queue-actions-left">
-            <el-button 
-              type="danger" 
-              :disabled="!selectedQueueRow"
+            <el-button
+              type="danger"
+              :disabled="!selectedQueueRow || isQueryingHistory"
               size="small"
               @click="handleRemoveFromQueue"
             >
               &lt;&lt; 移出队列
             </el-button>
-            <el-button 
-              type="info" 
-              :disabled="!selectedQueueRow || !canMoveUp"
+            <el-button
+              type="info"
+              :disabled="!selectedQueueRow || !canMoveUp || isQueryingHistory"
               size="small"
               @click="handleMoveUp"
             >
               ↑
             </el-button>
-            <el-button 
-              type="info" 
-              :disabled="!selectedQueueRow || !canMoveDown"
+            <el-button
+              type="info"
+              :disabled="!selectedQueueRow || !canMoveDown || isQueryingHistory"
               size="small"
               @click="handleMoveDown"
             >
@@ -259,30 +272,35 @@
           <div class="control-buttons">
             <el-button
               type="primary"
+              :disabled="isQueryingHistory"
               @click="handleSelectCall"
             >
               选呼
             </el-button>
             <el-button
               type="success"
+              :disabled="isQueryingHistory"
               @click="handleNextPatient"
             >
               下一患者
             </el-button>
             <el-button
               type="warning"
+              :disabled="isQueryingHistory"
               @click="handleSkip"
             >
               跳过
             </el-button>
             <el-button
               type="primary"
+              :disabled="isQueryingHistory"
               @click="handleComplete"
             >
               完成
             </el-button>
             <el-button
               type="info"
+              :disabled="isQueryingHistory"
               @click="handleRequeue"
             >
               过号重排
@@ -682,6 +700,14 @@ const showOnlyWaiting = ref(false)
 // Bug #411：诊室过滤，替代原来的科室下拉框（selectedDept/departmentList 已移除）
 const selectedRoom = ref('all')
 
+// 历史队列查询日期 (默认当天)
+const getTodayStr = () => {
+  const now = new Date()
+  return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`
+}
+const queryDate = ref(getTodayStr())
+const isQueryingHistory = computed(() => queryDate.value !== getTodayStr())
+
 // 修复【#397】：动态获取当前科室名称
 const currentDeptName = computed(() => {
   return userStore.deptName || userStore.orgName || '心内科'
@@ -901,14 +927,12 @@ const mapFrontendStatusToBackend = (status) => {
 }
 
 // 从数据库加载队列
-const loadQueueFromDb = async () => {
+const loadQueueFromDb = async (dateStr) => {
   try {
     // Bug #411：不再按科室选筛加载，后端默认按当前登录人科室查询
     const organizationId = undefined
-    // 只查询今天的患者
-    const today = new Date()
-    const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`
-    const res = await getTriageQueueList({ organizationId, date: todayStr }).catch((err) => {
+    const queryDateStr = dateStr || queryDate.value
+    const res = await getTriageQueueList({ organizationId, date: queryDateStr }).catch((err) => {
       console.error('【心内科】loadQueueFromDb 请求异常：', err)
       return { code: 500, msg: err?.message || '请求失败', data: null }
     })
@@ -931,10 +955,6 @@ const loadQueueFromDb = async () => {
     originalQueueList.value = list
       .map((it) => {
         const frontendStatus = mapBackendStatusToFrontend(it.status)
-        // 调试日志：检查状态映射
-        if (list.length <= 5) {
-          console.log('【心内科】状态映射：后端状态=', it.status, '-> 前端状态=', frontendStatus, '患者=', it.patientName)
-        }
         // 计算等待时间：基于创建时间（createTime）
         let waitingTime = '00:00'
         if (it.createTime) {
@@ -972,15 +992,7 @@ const loadQueueFromDb = async () => {
           organizationId: it.organizationId
         }
       })
-      .filter((item) => {
-        // 过滤掉"已完成"状态的患者，不显示在队列中
-        if (item.status === '已完成') {
-          console.log('【心内科】过滤掉已完成状态的患者：', item.patientName)
-          return false
-        }
-        return true
-      })
-    
+
     // 调试日志：检查查找结果
     const callingCount = originalQueueList.value.filter(i => i.status === '叫号中').length
     const waitingCount = originalQueueList.value.filter(i => i.status === '等待').length
@@ -1196,9 +1208,6 @@ const formatSecondsToMmSs = (totalSeconds) => {
 const filteredQueueList = computed(() => {
   let filtered = originalQueueList.value
 
-  // 先过滤掉"已完成"状态的患者（无论什么情况都不显示）
-  filtered = filtered.filter(item => item.status !== '已完成')
-
   // 再按诊室过滤
   if (selectedRoom.value !== 'all') {
     filtered = filtered.filter(item => item.room === selectedRoom.value)
@@ -1627,6 +1636,26 @@ const handleRefresh = async () => {
   ElMessage.success('已刷新（已从数据库恢复队列）')
 }
 
+// 历史队列查询
+const handleHistoryQuery = async () => {
+  if (!queryDate.value) {
+    ElMessage.warning('请选择查询日期')
+    return
+  }
+  console.log('【心内科】历史队列查询：', queryDate.value)
+  await loadQueueFromDb(queryDate.value)
+  if (isQueryingHistory.value) {
+    ElMessage.success(`已加载 ${queryDate.value} 的队列数据`)
+  }
+}
+
+// 回到今天
+const handleTodayQuery = async () => {
+  queryDate.value = getTodayStr()
+  await loadQueueFromDb(getTodayStr())
+  ElMessage.success('已切换到今天队列')
+}
+
 // 退出
 const handleExit = () => {
   ElMessage.info('退出功能待实现')
@@ -2165,12 +2194,21 @@ onUnmounted(() => {
         padding: 15px 20px;
         border-bottom: 2px solid #409eff;
         background-color: #f8f9fa;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
 
         .panel-title {
           font-size: 16px;
           font-weight: bold;
           color: #333;
         }
+
+        .history-query {
+          display: flex;
+          gap: 8px;
+          align-items: center;
+        }
       }
 
       .table-container {