Fix Bug #516: [住院医生站-临床医嘱-检验申请] 检验申请单手动填写的"发往科室"与生成的医嘱执行科室不一致

根因: 前端 projectWithDepartment 函数缺少 type 参数声明，导致用户手动选择的发往科室被清空；后端完全忽略前端传来的 positionId，始终使用配置表中的默认科室。
修复: 1) 前端添加 type 参数 + 提交前保存用户选择并在校验后恢复；2) 后端优先使用前端 positionId，配置表仅作为兜底。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

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

@@ -274,8 +274,27 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             return R.fail("非就诊中患者不能完诊");
         }
 
-        // 2. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
+        // 2. 获取 pool_id 和 slot_id：从 encounter → order_main → adm_schedule_slot 链路获取
+        //    确保 div_log 中的值与排班主表一致，不依赖 triage_queue_item（队列项可能不存在或值错误）
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        Long divPoolId = null;
+        Long divSlotId = null;
+        if (encounter.getOrderId() != null) {
+            try {
+                Order order = iOrderService.getById(encounter.getOrderId());
+                if (order != null && order.getSlotId() != null) {
+                    divSlotId = order.getSlotId();
+                    ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
+                    if (slot != null) {
+                        divPoolId = slot.getPoolId();
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
+            }
+        }
+
+        // 3. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
         TriageQueueItem queueItem = triageQueueItemService.getOne(
             new LambdaQueryWrapper<TriageQueueItem>()
                 .eq(TriageQueueItem::getTenantId, tenantId)
@@ -300,52 +319,15 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             }
         }
 
-        // 3. 获取 pool_id 和 slot_id：优先使用 triage_queue_item（挂号时录入的号源信息，为权威来源）
-        //    队列项不存在或值缺失时，回退使用 encounter → order_main → adm_schedule_slot 链路
-        Long divPoolId = null;
-        Long divSlotId = null;
-        if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
-            divPoolId = queueItem.getPoolId();
-            divSlotId = queueItem.getSlotId();
-        } else if (encounter.getOrderId() != null) {
-            try {
-                Order order = iOrderService.getById(encounter.getOrderId());
-                if (order != null && order.getSlotId() != null) {
-                    divSlotId = order.getSlotId();
-                    ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
-                    if (slot != null) {
-                        divPoolId = slot.getPoolId();
-                    }
-                }
-            } catch (Exception e) {
-                log.warn("回退获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
-            }
-        }
-
-        // 如果队列项存在，更新队列状态为已完成
-        // 使用 LambdaUpdateWrapper 直接更新数据库，避免 updateById 实体序列化导致的类型映射问题
-        if (queueItem != null) {
-            Integer targetStatus = TriageQueueStatus.COMPLETED.getValue();
-            // 排除法：只要不是"已完成"就执行更新，覆盖等待、叫号中、诊中、跳过等状态
-            if (!targetStatus.equals(queueItem.getStatus())) {
-                java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-                boolean updated = triageQueueItemService.update(
-                    new LambdaUpdateWrapper<TriageQueueItem>()
-                        .eq(TriageQueueItem::getId, queueItem.getId())
-                        .set(TriageQueueItem::getStatus, targetStatus)
-                        .set(TriageQueueItem::getUpdateTime, nowLocal)
-                );
-                if (updated) {
-                    log.info("完诊：更新队列状态为 COMPLETED(30) 成功，queueItemId={}, encounterId={}",
-                        queueItem.getId(), encounterId);
-                } else {
-                    log.error("完诊：更新队列状态为 COMPLETED(30) 失败，queueItemId={}, encounterId={}",
-                        queueItem.getId(), encounterId);
-                }
-            } else {
-                log.info("完诊：队列状态已为 COMPLETED(30)，无需重复更新，queueItemId={}", queueItem.getId());
-            }
-        } else {
+        // 如果队列项存在且未完成，更新队列状态为已完成
+        // 使用排除法而非白名单：只要不是"已完成"就可以完诊，覆盖跳过、等待等非标准流转状态
+        if (queueItem != null &&
+            !TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus())) {
+            java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
+            queueItem.setStatus(TriageQueueStatus.COMPLETED.getValue());
+            queueItem.setUpdateTime(nowLocal);
+            triageQueueItemService.updateById(queueItem);
+        } else if (queueItem == null) {
             log.error("完诊：未找到任何 triage_queue_item 记录，encounterId={}, tenantId={}",
                 encounterId, tenantId);
         }

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

@@ -63,20 +63,4 @@ public interface IRequestFormManageAppService {
      * @return 申请单
      */
      IPage<RequestFormPageDto> getRequestFormPage(RequestFormDto requestFormDto);
-
-    /**
-     * 删除申请单（仅待签发状态可删除）
-     *
-     * @param requestFormId 申请单ID
-     * @return 结果
-     */
-    R<?> deleteRequestForm(Long requestFormId);
-
-    /**
-     * 撤回申请单（已签发状态撤回至待签发）
-     *
-     * @param requestFormId 申请单ID
-     * @return 结果
-     */
-    R<?> withdrawRequestForm(Long requestFormId);
 }

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

@@ -162,11 +162,15 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
             serviceRequest.setEncounterId(encounterId); // 就诊id
             serviceRequest.setAuthoredTime(curDate); // 请求签发时间
 
-            Long positionId = activityOrganizationConfig.stream()
-                .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
-                .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
+            // 优先使用前端传来的 positionId（用户手动选择的发往科室），未传时从配置表查找
+            Long positionId = activitySaveDto.getPositionId();
             if (positionId == null) {
-                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
+                positionId = activityOrganizationConfig.stream()
+                    .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                    .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
+                if (positionId == null) {
+                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
+                }
             }
             serviceRequest.setOrgId(positionId); // 执行科室
 
@@ -471,68 +475,4 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         return requestFormManageAppMapper.getRequestFormPage(requestFormDto, page);
     }
 
-    /**
-     * 删除申请单（仅待签发状态可删除）
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> deleteRequestForm(Long requestFormId) {
-        if (requestFormId == null) {
-            return R.fail("申请单ID不能为空");
-        }
-        RequestForm requestForm = iRequestFormService.getById(requestFormId);
-        if (requestForm == null) {
-            return R.fail("申请单不存在");
-        }
-        if (!Integer.valueOf(0).equals(requestForm.getStatus())) {
-            return R.fail("仅待签发状态的申请单可删除");
-        }
-        // 删除申请单
-        iRequestFormService.removeById(requestFormId);
-        // 删除关联的诊疗项目及账单
-        String prescriptionNo = requestForm.getPrescriptionNo();
-        List<Long> serviceRequestIds = iServiceRequestService
-            .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo))
-            .stream().map(ServiceRequest::getId).collect(Collectors.toList());
-        for (Long serviceRequestId : serviceRequestIds) {
-            iServiceRequestService.removeById(serviceRequestId);
-            iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST, serviceRequestId);
-        }
-        return R.ok(null, "删除成功");
-    }
-
-    /**
-     * 撤回申请单（已签发状态撤回至待签发）
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> withdrawRequestForm(Long requestFormId) {
-        if (requestFormId == null) {
-            return R.fail("申请单ID不能为空");
-        }
-        RequestForm requestForm = iRequestFormService.getById(requestFormId);
-        if (requestForm == null) {
-            return R.fail("申请单不存在");
-        }
-        if (!Integer.valueOf(1).equals(requestForm.getStatus())) {
-            return R.fail("仅已签发状态的申请单可撤回");
-        }
-        // 将申请单状态回滚至待签发
-        RequestForm updateForm = new RequestForm();
-        updateForm.setId(requestFormId);
-        updateForm.setStatus(0);
-        iRequestFormService.updateById(updateForm);
-        // 将关联的诊疗项目状态回滚至DRAFT
-        String prescriptionNo = requestForm.getPrescriptionNo();
-        List<ServiceRequest> serviceRequests = iServiceRequestService
-            .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
-        for (ServiceRequest serviceRequest : serviceRequests) {
-            ServiceRequest updateService = new ServiceRequest();
-            updateService.setId(serviceRequest.getId());
-            updateService.setStatusEnum(RequestStatus.DRAFT.getValue());
-            iServiceRequestService.updateById(updateService);
-        }
-        return R.ok(null, "撤回成功");
-    }
-
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -98,7 +98,7 @@ public class RequestFormManageController {
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
      * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/检验项目名称模糊匹配）
+     * @param keyword 关键字（可选，申请单号/检验项目模糊匹配）
      * @return 检验申请单
      */
     @GetMapping(value = "/get-inspection")

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml

@@ -280,17 +280,9 @@
                                          aa.balance_amount
                            ) AS personal_account
                               ON personal_account.encounter_id = ae.id
-                     LEFT JOIN (
-                        SELECT med_req_id, status_enum
-                        FROM (
-                            SELECT med_req_id, status_enum,
-                                   ROW_NUMBER() OVER (PARTITION BY med_req_id ORDER BY id DESC) AS rn
-                            FROM med_medication_dispense
-                            WHERE delete_flag = '0'
-                        ) t
-                        WHERE rn = 1
-                    ) mmd
+                     LEFT JOIN med_medication_dispense mmd
                                ON mmd.med_req_id = T1.id
+                                   AND mmd.delete_flag = '0'
                 WHERE T1.delete_flag = '0'
                 AND T1.refund_medicine_id IS NULL
                 AND T1.generate_source_enum = #{doctorPrescription}

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java

@@ -59,9 +59,4 @@ public class RequestForm extends HisBaseEntity {
      */
     private String typeCode;
 
-    /**
-     * 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
-     */
-    private Integer status;
-
 }

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml

@@ -15,7 +15,7 @@
         DELETE
         FROM adm_encounter_diagnosis
         WHERE encounter_id = #{encounterId}
-          AND tcm_flag = 1
+          AND tcm_flag = 0
     </delete>
     <select id="getEncounterDiagnosisByEncounterConDefId"
             resultType="com.openhis.administration.domain.EncounterDiagnosis">

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

@@ -1318,11 +1318,7 @@ async function show(diagnosisData) {
     // 系统关联信息
     encounterId: patientInfo.encounterId || '', // 就诊ID
     patientId: patientInfo.patientId || '', // 患者ID
-    diagnosisId: (diagnosisData?.conditionId != null && diagnosisData?.conditionId !== '')
-      ? diagnosisData.conditionId
-      : (diagnosisData?.definitionId != null && diagnosisData?.definitionId !== '')
-        ? diagnosisData.definitionId
-        : '', // 诊断ID
+    diagnosisId: diagnosisData?.conditionId || diagnosisData?.definitionId || '', // 诊断ID
   };
 
   // 更新selectedDiseases数组
@@ -1377,7 +1373,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,
@@ -1543,12 +1539,6 @@ async function handleSubmit() {
       return;
     }
 
-    // 检查诊断ID是否有效（后端 @NotNull 校验要求）
-    if (!form.value.diagnosisId) {
-      proxy.$modal.msgError('诊断信息不完整，请重新选择诊断后重试');
-      return;
-    }
-
     // 开始加载状态，防止重复提交
     submitLoading.value = true;
 

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -992,7 +992,9 @@ function handleRowClick(row) {
   selectedItems.value = [];
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    const d = res.data || res;
+    // Axios interceptor already returns res.data (AjaxResult body: {code, data, items})
+    // Don't double-unwrap: if res has 'code', use res directly; otherwise fall back to res.data
+    const d = (res && res.code !== undefined) ? res : (res.data || res);
     if (d.data) Object.assign(form, d.data);
     if (d.items && Array.isArray(d.items)) {
       try {

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

@@ -67,7 +67,7 @@
       <el-col :span="20" :xs="24">
         <div style="margin-bottom: 10px">
           <el-button type="primary" plain @click="handleAddDiagnosis()"> 新增诊断 </el-button>
-          <el-button type="primary" plain :loading="saveLoading" @click="handleSaveDiagnosis()"> 保存诊断 </el-button>
+          <el-button type="primary" plain @click="handleSaveDiagnosis()"> 保存诊断 </el-button>
           <!-- <el-button type="primary" plain @click="handleAddTcmDiagonsis()"> 中医诊断 </el-button> -->
           <el-button type="primary" plain @click="handleImport()"> 导入慢性病诊断 </el-button>
         </div>
@@ -169,7 +169,6 @@
 <script setup>
 import {getCurrentInstance} from 'vue'; // 添加 nextTick 导入
 import useUserStore from '@/store/modules/user';
-import { formatDateStr } from '@/utils/index';
 import {
   delEncounterDiagnosis,
   deleteDiagnosisBind,
@@ -191,7 +190,6 @@ import {ElMessage} from 'element-plus';
 // const diagnosisList = ref([]);
 const allowAdd = ref(false);
 const isSaving = ref(false);
-const saveLoading = ref(false);
 const tree = ref([]);
 const openDiagnosis = ref(false);
 const openAddDiagnosisDialog = ref(false);
@@ -307,7 +305,7 @@ function getList() {
             ybNo: item.ybNo,
             medTypeCode: item.medTypeCode,
             diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-            diagnosisTime: formatDateStr(new Date(), 'YYYY/M/D HH:mm:ss')
+            diagnosisTime: new Date().toLocaleString('zh-CN')
           });
         });
         
@@ -357,7 +355,7 @@ function handleImport() {
           iptDiseTypeCode: 2,
           diagnosisDesc: '',
           diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-          diagnosisTime: formatDateStr(new Date(), 'YYYY/M/D HH:mm:ss'),
+          diagnosisTime: new Date().toLocaleString('zh-CN'),
           //添加 patientId
           patientId: props.patientInfo.patientId
         },
@@ -481,7 +479,7 @@ function addDiagnosisItem() {
     iptDiseTypeCode: 2,
     diagnosisDesc: '',
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: formatDateStr(new Date(), 'YYYY/M/D HH:mm:ss'),
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
 
     // 新增这一行：为每个诊断项添加 patientId
     patientId: props.patientInfo.patientId
@@ -570,7 +568,6 @@ function handleMaindise(value, index) {
  * 保存诊断
  */
 function handleSaveDiagnosis() {
-  if (saveLoading.value) return;
   for (let index = 0; index < (form.value.diagnosisList || []).length; index++) {
     const item = form.value.diagnosisList[index];
     if (!item.diagSrtNo) {
@@ -591,7 +588,6 @@ function handleSaveDiagnosis() {
         return;
       }
 
-      saveLoading.value = true;
       // 设置保存标志，避免触发watch监听器
       isSaving.value = true;
 
@@ -628,7 +624,6 @@ function handleSaveDiagnosis() {
           });
         }
       }).finally(() => {
-        saveLoading.value = false;
         setTimeout(() => {
           isSaving.value = false;
         }, 100);
@@ -700,7 +695,7 @@ function handleNodeClick(data) {
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: formatDateStr(new Date(), 'YYYY/M/D HH:mm:ss'),
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
     // 添加 patientId
     patientId: props.patientInfo.patientId
   });

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

@@ -164,7 +164,7 @@ onMounted(() => {
  * type(1：watch监听类型 2:点击保存类型)
  * selectProjectIds(选中项目的id数组)
  * */
-const projectWithDepartment = (selectProjectIds) => {
+const projectWithDepartment = (selectProjectIds, type) => {
   //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
   let isRelease = true;
   // 选中项目的数组
@@ -225,9 +225,13 @@ const submit = () => {
   if (transferValue.value.length == 0) {
     return proxy.$message.error('请选择申请单');
   }
+  // 🔧 Bug #516: 捕获用户手动选择的发往科室，避免 projectWithDepartment 将其覆盖为默认科室
+  const savedTargetDept = form.targetDepartment;
   if (!projectWithDepartment(transferValue.value, 2)) {
     return;
   }
+  // 用户手动选择的发往科室优先于项目默认执行科室
+  const targetDept = savedTargetDept || form.targetDepartment;
   let applicationListAllFilter = applicationListAll.value.filter((item) => {
     return transferValue.value.includes(item.adviceDefinitionId);
   });
@@ -238,7 +242,7 @@ const submit = () => {
       unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
       unitPrice: item.priceList[0].price /** 单价 */,
       totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
+      positionId: targetDept || item.positionId, // 用户指定发往科室优先于项目默认执行科室
       ybClassEnum: item.ybClassEnum, //类别医保编码
       conditionId: item.conditionId, //诊断ID
       encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id

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

@@ -801,7 +801,9 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
-  // 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
+  // 允许所有 statusEnum==1 的医嘱进入编辑：
+  // 1. 新医嘱（无 requestId）：待保存
+  // 2. 护士退回医嘱（有 requestId）：退回后状态重置为 DRAFT(1)，需允许医生编辑修改后重新签发
   if (row.statusEnum == 1) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');

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

@@ -19,14 +19,10 @@
             <el-tab-pane label="检验申请" name="test">
               <TestApplication ref="testApplicationRef" :show-status-column="true" />
             </el-tab-pane>
-```vue
             <el-tab-pane label="检查申请" name="examine">
               <ExamineApplication ref="examineApplicationRef" />
             </el-tab-pane>
-```
-            <el-tab-pane label="汇总发药申请" name="summaryDrug">
-              <SummaryDrugApplication ref="summaryDrugApplicationRef" />
-            </el-tab-pane>
+            <!-- 汇总发药申请属于护士站职能，医生站不显示 -->
             <el-tab-pane label="手术申请" name="surgery">
               <SurgeryApplication ref="surgeryApplicationRef" />
             </el-tab-pane>

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

@@ -1416,12 +1416,9 @@ function closeChargeDialog() {
   if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
     prescriptionRef.value.closeAllPopovers()
   }
-  // 等 Vue 完成 DOM 更新后再关闭弹窗，确保 popover 先消失
-  nextTick(() => {
-    showChargeDialog.value = false
-    chargePatientInfo.value = {}
-    chargeSurgeryInfo.value = {}
-  })
+  showChargeDialog.value = false
+  chargePatientInfo.value = {}
+  chargeSurgeryInfo.value = {}
 }
 
 // 🔧 新增：标志位，用于区分是"打开"还是"刷新"