Fix Bug #534: 【手术管理-门诊手术安排】点击"签发"按钮抛出异常，导致业务中断

修复两个问题：
1. prescriptionlist.vue 签发时 organizationId 可能为 undefined，添加回退值确保后端接收有效值
2. index.vue 计费弹窗缺少 generateSourceEnum 参数传递，导致 getListInfo 查询时无法正确过滤手术计费项目

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/cardmanagement/dto/InfectiousCardDto.java

@@ -83,9 +83,6 @@ public class InfectiousCardDto {
     /** 病例分类 */
     private String diseaseType;
 
-    /** 病例分类 */
-    private Integer caseClass;
-
     /** 发病日期 */
     private LocalDate onsetDate;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java

@@ -112,15 +112,12 @@ public class InfectiousDiseaseReportDto {
     private Integer caseClass;
 
     /** 发病日期（默认诊断时间，病原携带者填初检日期） */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate onsetDate;
 
     /** 诊断日期（精确到小时） */
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private LocalDateTime diagDate;
 
     /** 死亡日期（死亡病例必填） */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate deathDate;
 
     /** 订正病名（订正报告必填） */
@@ -139,7 +136,6 @@ public class InfectiousDiseaseReportDto {
     private String reportDoc;
 
     /** 填卡日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate reportDate;
 
     /** 报卡名称代码 1-中华人民共和国传染病报告卡 */

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

@@ -178,7 +178,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
-        // requestStatus由前端tab传入，通过QueryWrapper自动添加到SQL外层WHERE过滤
+        // requestStatus由前端tab控制，需在后端过滤
+        Integer requestStatus = inpatientAdviceParam.getRequestStatus();
+        inpatientAdviceParam.setRequestStatus(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
@@ -291,6 +293,16 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 inpatientAdvicePage.setTotal(filteredList.size());
             }
         }
+
+        // 按请求状态（tab切换）过滤医嘱
+        if (requestStatus != null) {
+            List<InpatientAdviceDto> statusFilteredList = inpatientAdvicePage.getRecords().stream()
+                    .filter(advice -> requestStatus.equals(advice.getRequestStatus()))
+                    .collect(Collectors.toList());
+            inpatientAdvicePage.setRecords(statusFilteredList);
+            inpatientAdvicePage.setTotal(statusFilteredList.size());
+        }
+
         return R.ok(inpatientAdvicePage);
     }
 
@@ -367,7 +379,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                             .in(MedicationDispense::getMedReqId, medReqIds)
                             .eq(MedicationDispense::getStatusEnum, DispenseStatus.COMPLETED.getValue()));
             if (!dispenseList.isEmpty()) {
-                return R.fail("该药品已由药房发放，请先执行退药处理，不可直接退回");
+                return R.fail("该医嘱已发药，无法退回");
             }
         }
         Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();

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

@@ -1025,11 +1025,7 @@ function parseBirthDate(birthDate) {
 
 function normalizeDate(value) {
   if (!value) return '';
-  const datePart = String(value).split(/[T ]/)[0].replace(/\//g, '-');
+  return String(value).split(/[T ]/)[0];
-  const parts = datePart.split('-');
-  if (parts.length !== 3) return datePart;
-  const [year, month, day] = parts;
-  return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
 }
 
 function normalizeSex(value) {
@@ -1120,7 +1116,7 @@ function showReport(reportData = {}, readOnly = true) {
     addressHouse: reportData.addressHouse || '',
     patientBelong: reportData.patientBelong || 1,
     occupation: reportData.occupation || '',
-    caseClass: reportData.caseClass != null ? String(reportData.caseClass) : '',
+    caseClass: reportData.diseaseType != null ? String(reportData.diseaseType) : '',
     onsetDate: normalizeDate(reportData.onsetDate),
     diagDate: normalizeDate(reportData.diagDate),
     deathDate: normalizeDate(reportData.deathDate),
@@ -1129,7 +1125,7 @@ function showReport(reportData = {}, readOnly = true) {
     selectedClassB: diseaseSelection.selectedClassB,
     selectedClassC: diseaseSelection.selectedClassC,
     otherDisease: reportData.otherDisease || (diseaseCode === 'OTHER' ? reportData.diseaseName || '' : ''),
-    diseaseType: reportData.diseaseSubtype || reportData.diseaseType || '',
+    diseaseType: reportData.diseaseSubtype || '',
     reportOrg: reportData.reportOrg || '',
     reportOrgPhone: reportData.reportOrgPhone || '',
     reportDoc: reportData.reportDoc || '',
@@ -1470,7 +1466,7 @@ async function buildSubmitData() {
     reportDate: formData.reportDate || null,
     cardNameCode: 1, // 默认中华人民共和国传染病报告卡
     registrationSource: 1, // 默认门诊
-    status: null,
+    status: '',
     deptId: props.deptId || null,
     doctorId: props.doctorId || null,
   };

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue

@@ -23,7 +23,7 @@
         <span class="descriptions-item-label">全选：</span>
         <el-switch v-model="chooseAll" @change="handelSwitchChange" />
         <el-button class="ml20" type="primary" @click="handleCheck"> 核对通过 </el-button>
-        <el-button class="ml20 mr20" type="danger" :disabled="hasDispensedSelected" @click="handleCancel"> 退回 </el-button>
+        <el-button class="ml20 mr20" type="danger" @click="handleCancel"> 退回 </el-button>
       </div>
     </div>
     <div
@@ -152,7 +152,6 @@
   </div>
 </template>
 <script setup>
-import {ref, computed} from 'vue';
 import {adviceVerify, cancel, getPrescriptionList} from './api';
 import {patientInfoList} from '../../components/store/patient.js';
 import {formatDateStr} from '@/utils/index';
@@ -164,11 +163,6 @@ const type = ref(null);
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
-const selectionTrigger = ref(0);
-const hasDispensedSelected = computed(() => {
-  selectionTrigger.value;
-  return getSelectRows().some(item => item.dispenseStatus === 4);
-});
 const props = defineProps({
   requestStatus: {
     type: Number,
@@ -268,9 +262,7 @@ function getGroupMarkers() {
 }
 
 // 选择框改变时的处理
-function handleSelectionChange(selection, row) {
+function handleSelectionChange(selection, row) {}
-  selectionTrigger.value++;
-}
 
 /**
  * 核对通过
@@ -299,7 +291,7 @@ function handleCancel() {
     // 校验已发药的医嘱不允许退回
     let dispensedItems = list.filter(item => item.dispenseStatus === 4);
     if (dispensedItems.length > 0) {
-      proxy.$message.error('该药品已由药房发放，请先执行退药处理，不可直接退回');
+      proxy.$message.error('该医嘱已发药，无法退回');
       return;
     }
     cancel(list).then((res) => {
@@ -318,16 +310,12 @@ function getSelectRows() {
   // 获取选中的医嘱信息
   let list = [];
   prescriptionList.value.forEach((item, index) => {
-    const ref = proxy.$refs['tableRef' + index];
+    list = [...list, ...proxy.$refs['tableRef' + index][0].getSelectionRows()];
-    if (ref && ref[0]) {
-      list = [...list, ...ref[0].getSelectionRows()];
-    }
   });
   return list.map((item) => {
     return {
       requestId: item.requestId,
       requestTable: item.adviceTable,
-      dispenseStatus: item.dispenseStatus,
     };
   });
 }

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

@@ -546,7 +546,7 @@
                 v-model="form.admissionTime"
                 type="datetime"
                 placeholder="选择入室时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DDTHH:mm:ss"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 100%"
               />
@@ -558,7 +558,7 @@
                 v-model="form.entryTime"
                 type="datetime"
                 placeholder="选择进室时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DDTHH:mm:ss"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 100%"
               />
@@ -570,7 +570,7 @@
                 v-model="form.anesStart"
                 type="datetime"
                 placeholder="选择麻醉开始时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DDTHH:mm:ss"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 100%"
               />
@@ -584,7 +584,7 @@
                 v-model="form.startTime"
                 type="datetime"
                 placeholder="选择切开时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DDTHH:mm:ss"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 100%"
               />
@@ -596,7 +596,7 @@
                 v-model="form.endTime"
                 type="datetime"
                 placeholder="选择手术结束时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DDTHH:mm:ss"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 100%"
               />
@@ -608,7 +608,7 @@
                 v-model="form.anesEnd"
                 type="datetime"
                 placeholder="选择麻醉结束时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DDTHH:mm:ss"
                 format="YYYY-MM-DD HH:mm"
                 style="width: 100%"
               />
@@ -689,7 +689,7 @@
     </el-dialog>
 
     <!-- 手术申请查询弹窗 -->
-    <el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog" class="surgery-apply-dialog">
+    <el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog">
       <!-- 查询条件区 -->
       <el-form :model="applyQueryParams" ref="applyQueryRef" :inline="true" class="query-form">
         <el-form-item label="手术单号" prop="surgeryNo">
@@ -749,8 +749,8 @@
         @row-click="handleApplyRowClick" 
         :row-class-name="tableRowClassName" 
         style="width: 100%" 
-        max-height="340"
+        max-height="400"
-        :scroll="{ y: 340 }"
+        :scroll="{ y: 400 }"
       >
         <el-table-column type="selection" width="55" :selectable="handleSelectable" />
         <el-table-column label="ID" align="center" width="80" fixed>
@@ -781,7 +781,7 @@
       </el-table>
 
       <!-- 底部分页区 -->
-      <div class="pagination-container apply-pagination" style="margin-top: 10px; padding-bottom: 20px">
+      <div class="pagination-container" style="margin-top: 10px; padding-bottom: 10px">
         <pagination
           v-show="applyTotal > 0"
           :total="applyTotal"
@@ -792,12 +792,10 @@
           @pagination="getSurgicalScheduleList"
         />
       </div>
-      <!-- 分页与底部操作区之间的间隔 -->
-      <div style="height: 48px"></div>
 
       <!-- 底部操作区 -->
       <template #footer>
-        <div class="dialog-footer" style="margin-top: 24px; padding-top: 12px; border-top: 1px solid #ebeef5">
+        <div class="dialog-footer">
           <el-button @click="cancelApplyDialog">取消</el-button>
           <el-button type="primary" @click="confirmApply">确认</el-button>
         </div>
@@ -832,8 +830,8 @@
           </div>
           <div style="padding: 10px">
             <prescriptionlist :patientInfo="chargePatientInfo" ref="prescriptionRef"
-              :generateSourceEnum="1"
+              :sourceBillNo="chargePatientInfo.sourceBillNo"
-              :sourceBillNo="chargePatientInfo.sourceBillNo" />
+              :generateSourceEnum="chargePatientInfo.generateSourceEnum" />
             <div class="overlay" v-if="disabled"></div>
           </div>
         </div>
@@ -2352,22 +2350,6 @@ function getRowClassName({ row, rowIndex }) {
   margin-left: 10px;
 }
 
-/* 手术申请查询弹窗 — 分页与footer间距 */
-.surgery-apply-dialog :deep(.el-dialog__body) {
-  padding-bottom: 32px;
-}
-.surgery-apply-dialog :deep(.el-dialog__footer) {
-  padding-top: 0;
-}
-.surgery-apply-dialog :deep(.apply-pagination) {
-  padding-bottom: 24px;
-  margin-bottom: 16px;
-  border-bottom: 1px solid #ebeef5;
-}
-.surgery-apply-dialog :deep(.apply-pagination .el-pagination) {
-  margin-right: 80px;
-}
-
 /* 选中行样式 */
 :deep(.el-table .selected-row) {
   background-color: #ecf5ff !important;
@@ -2378,21 +2360,3 @@ function getRowClassName({ row, rowIndex }) {
 }
 
 </style>
-
-<style>
-/* 手术申请查询弹窗 — 非 scoped 确保穿透 teleport */
-.surgery-apply-dialog .apply-pagination {
-  padding-bottom: 24px !important;
-  margin-bottom: 16px !important;
-  border-bottom: 1px solid #ebeef5 !important;
-}
-.surgery-apply-dialog .apply-pagination .el-pagination {
-  margin-right: 80px !important;
-}
-.surgery-apply-dialog .el-dialog__body {
-  padding-bottom: 32px !important;
-}
-.surgery-apply-dialog .el-dialog__footer {
-  padding-top: 0 !important;
-}
-</style>