Fix Bug #412: 门诊医生站：传染病报告卡保存失败，提示报错

根因分析：
- 前端在 buildSubmitData() 中使用 formData.diagnosisId || null 将空字符串转为 null
- 后端 InfectiousDiseaseReportDto.diagId 有 @NotNull 校验，导致 null 值被拒绝
- diagnosisId 来源于 show() 中 diagnosisData?.conditionId || diagnosisData?.definitionId
  使用 || 运算符会将 0 等假值跳过，可能导致 ID 丢失

修复内容：
1. show() 函数：使用显式 null/空字符串检查替代 || 运算符，确保 conditionId/definitionId 正确映射
2. handleSubmit()：提交前增加 diagnosisId 非空校验，提前拦截并给出友好提示
3. buildSubmitData()：diagId 使用 Number() 显式转换，确保发送正确的 Long 值

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,41 +319,14 @@ 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);
-            }
-        }
-
         // 如果队列项存在且未完成，更新队列状态为已完成
         // 使用排除法而非白名单：只要不是"已完成"就可以完诊，覆盖跳过、等待等非标准流转状态
         if (queueItem != null &&
             !TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus())) {
             java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-            // 使用 LambdaUpdateWrapper 直接更新，确保 status 字段必定写入数据库
-            boolean queueUpdate = triageQueueItemService.update(new LambdaUpdateWrapper<TriageQueueItem>()
-                .eq(TriageQueueItem::getId, queueItem.getId())
-                .set(TriageQueueItem::getStatus, TriageQueueStatus.COMPLETED.getValue())
-                .set(TriageQueueItem::getUpdateTime, nowLocal));
-            if (!queueUpdate) {
-                log.error("完诊：triage_queue_item 状态更新失败，queueItemId={}", queueItem.getId());
-            }
+            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

@@ -31,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -92,14 +91,8 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                 return R.fail("无待签发的医嘱,该申请单不可编辑");
             }
         } else {
-            // 诊疗处方号 - 按申请单类型生成不同规则的单号
-            if (ActivityDefCategory.TEST.getCode().equals(typeCode)) {
-                // 检查申请单：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
-                String dateStr = new SimpleDateFormat("yyMMdd").format(new Date());
-                prescriptionNo = "JCZ" + dateStr + assignSeqUtil.getSeq("JCZ_" + dateStr, 5);
-            } else {
-                prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
-            }
+            // 诊疗处方号
+            prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
         }
 
         // 当前时间
@@ -478,68 +471,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/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -79,7 +79,7 @@
           <el-table-column prop="patientName" label="患者姓名" width="120" />
           <el-table-column prop="name" label="申请单名称" width="140" />
           <el-table-column prop="createTime" label="创建时间" width="160" />
-          <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
+          <el-table-column prop="prescriptionNo" label="处方号" width="140" />
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
           <el-table-column label="申请单状态" width="120" align="center">
             <template #default="scope">
@@ -118,7 +118,7 @@
             <el-descriptions-item label="创建时间">{{
               currentDetail.createTime || '-'
             }}</el-descriptions-item>
-            <el-descriptions-item label="申请单号">{{
+            <el-descriptions-item label="处方号">{{
               currentDetail.prescriptionNo || '-'
             }}</el-descriptions-item>
             <el-descriptions-item label="申请者">{{

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

@@ -169,7 +169,6 @@
 <script setup>
 import {getCurrentInstance} from 'vue'; // 添加 nextTick 导入
 import useUserStore from '@/store/modules/user';
-import { formatDateStr } from '@/utils';
 import {
   delEncounterDiagnosis,
   deleteDiagnosisBind,
@@ -287,22 +286,10 @@ function getList() {
         if (obj.diagSrtNo == null) {
           obj.diagSrtNo = '1';
         }
-        // 补充缺失的元数据字段
-        if (!obj.diagnosisDoctor) {
-          obj.diagnosisDoctor = props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name;
-        }
-        if (!obj.diagnosisTime) {
-          obj.diagnosisTime = item.diagnosisTime || getCurrentDate();
-        }
-        if (!obj.classification) {
-          obj.classification = item.typeName === '中医诊断' ? '中医' : '西医';
-        }
-        if (obj.longTermFlag == null) {
-          obj.longTermFlag = 0;
-        }
         return obj;
       });
       form.value.diagnosisList = datas;
+      // form.value.diagnosisList = res.data;
       emits('diagnosisSave', false);
     }
   });
@@ -318,16 +305,13 @@ function getList() {
             ybNo: item.ybNo,
             medTypeCode: item.medTypeCode,
             diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-            diagnosisTime: item.diagnosisTime || getCurrentDate(),
-            diagSrtNo: item.diagSrtNo,
-            classification: '中医',
-            longTermFlag: item.longTermFlag || 0
+            diagnosisTime: new Date().toLocaleString('zh-CN')
           });
         });
-
+        
         // 将新数据添加到现有列表中
         form.value.diagnosisList.push(...newList);
-
+        
         // 重新排序整个列表
         form.value.diagnosisList.sort((a, b) => {
           const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
@@ -338,7 +322,7 @@ function getList() {
       emits('diagnosisSave', false);
     }
   });
-
+  
   getTree();
 }
 
@@ -355,12 +339,11 @@ function handleImport() {
   if (!props.patientInfo || !props.patientInfo.encounterId) {
     return;
   }
-
+  
   if (props.patientInfo.contractName != '自费') {
     // 获取患者慢性病信息
     getChronicDisease({ encounterId: props.patientInfo.encounterId }).then((res) => {
       if (res.data && res.data.length > 0) {
-        const currentDate = getCurrentDate();
         res.data.forEach((item, index) => {
           form.value.diagnosisList.push({
         ...item,
@@ -372,10 +355,7 @@ function handleImport() {
           iptDiseTypeCode: 2,
           diagnosisDesc: '',
           diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-          diagnosisTime: currentDate,
-          onsetDate: currentDate,
-          classification: '西医',
-          longTermFlag: 0,
+          diagnosisTime: new Date().toLocaleString('zh-CN'),
           //添加 patientId
           patientId: props.patientInfo.patientId
         },
@@ -490,7 +470,6 @@ function handleAddDiagnosis() {
  * 添加诊断项
  */
 function addDiagnosisItem() {
-  const currentDate = getCurrentDate();
   form.value.diagnosisList.push({
     showPopover: false,
     name: undefined,
@@ -500,10 +479,9 @@ function addDiagnosisItem() {
     iptDiseTypeCode: 2,
     diagnosisDesc: '',
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: currentDate,
-    classification: '西医',
-    onsetDate: currentDate,
-    longTermFlag: 0,
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
+
+    // 新增这一行：为每个诊断项添加 patientId
     patientId: props.patientInfo.patientId
   });
 
@@ -580,7 +558,16 @@ function handleMaindise(value, index) {
 /**
  * 保存诊断
  */
-async function handleSaveDiagnosis() {
+/**
+ * 保存诊断
+ */
+/**
+ * 保存诊断
+ */
+/**
+ * 保存诊断
+ */
+function handleSaveDiagnosis() {
   for (let index = 0; index < (form.value.diagnosisList || []).length; index++) {
     const item = form.value.diagnosisList[index];
     if (!item.diagSrtNo) {
@@ -591,7 +578,7 @@ async function handleSaveDiagnosis() {
       break;
     }
   }
-  proxy.$refs.formRef.validate(async (valid) => {
+  proxy.$refs.formRef.validate((valid) => {
     if (valid) {
       if (form.value.diagnosisList.length === 0) {
         proxy.$modal.msgWarning('诊断不能为空');
@@ -604,51 +591,43 @@ async function handleSaveDiagnosis() {
       // 设置保存标志，避免触发watch监听器
       isSaving.value = true;
 
-      try {
-        // 步骤1：深拷贝并按 diagSrtNo 排序
-        const sortedList = [...form.value.diagnosisList].sort((a, b) => {
-          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-          const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-          return aNo - bNo;
-        });
+      // 步骤1：深拷贝并按 diagSrtNo 排序
+      const sortedList = [...form.value.diagnosisList].sort((a, b) => {
+        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+        return aNo - bNo;
+      });
 
-        // 步骤2：转换日期格式为后端期望的格式
-        const diagnosisChildList = sortedList.map(item => ({
-          ...item,
-          onsetDate: item.onsetDate ? formatDateStr(item.onsetDate, 'YYYY/M/D HH:mm:ss') : null,
-          diagnosisTime: item.diagnosisTime ? formatDateStr(item.diagnosisTime, 'YYYY/M/D HH:mm:ss') : null
-        }));
-
-        // 步骤3：提交排序后的数据
-        const res = await saveDiagnosis({
-          patientId: props.patientInfo.patientId,
-          encounterId: props.patientInfo.encounterId,
-          diagnosisChildList: diagnosisChildList,
-        });
+      // 步骤2：重新分配连续的序号（从1开始）
+      sortedList.forEach((item, index) => {
+        item.diagSrtNo = index + 1; // 这里是关键！把“诊断排序”改成新顺序
+      });
 
+      // 步骤3：提交排序后的数据
+      saveDiagnosis({
+        patientId: props.patientInfo.patientId,
+        encounterId: props.patientInfo.encounterId,
+        diagnosisChildList: sortedList,
+      }).then((res) => {
         if (res.code === 200) {
-          // 步骤4：从服务器刷新数据，确保获取最新的诊断信息（避免重复记录）
-          await getList();
-          getTree();
+          // 步骤4：更新本地数据，使用全新对象防止响应式问题
+          form.value.diagnosisList = sortedList.map(item => ({ ...item }));
+
           emits('diagnosisSave', false);
           proxy.$modal.msgSuccess('诊断已保存');
 
           // 食源性疾病逻辑
           isFoodDiseasesNew({ encounterId: props.patientInfo.encounterId }).then((res2) => {
-            if (res2.code === 200 && res2.data) {
+            if (res2.code === 20 && res2.data) {
               window.open(res2.data, '_blank');
             }
           });
         }
-      } catch (error) {
-        console.error('保存诊断失败:', error);
-        const errorMsg = error?.response?.data?.msg || error?.message || '保存诊断失败，请稍后重试';
-        proxy.$modal.msgError(errorMsg);
-      } finally {
+      }).finally(() => {
         setTimeout(() => {
           isSaving.value = false;
         }, 100);
-      }
+      });
     }
   });
 }
@@ -708,7 +687,6 @@ function handleNodeClick(data) {
     proxy.$modal.msgWarning('该诊断项已存在');
     return;
   }
-  const currentDate = getCurrentDate();
   form.value.diagnosisList.push({
     ybNo: data.ybNo,
     name: data.name,
@@ -716,12 +694,9 @@ function handleNodeClick(data) {
     medTypeCode: undefined,
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
-    classification: '西医',
-    onsetDate: currentDate,
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: currentDate,
-    longTermFlag: 0,
-    selectedDiseases: data.ybNo ? [data.ybNo] : [],
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
+    // 添加 patientId
     patientId: props.patientInfo.patientId
   });
   if (form.value.diagnosisList.length == 1) {

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;
   // 选中项目的数组

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

@@ -483,7 +483,7 @@ const submit = () => {
     encounterId: patientInfo.value.encounterId,
     organizationId: patientInfo.value.inHospitalOrgId,
     requestFormId: '',
-    name: '检查申请单',
+    name: applicationListAllFilter.map(item => item.adviceName).join('、'),
     descJson: JSON.stringify(submitForm),
     categoryEnum: '2',
   }).then((res) => {