bug524 [门诊/医生个人报卡管理] 传染病报告卡保存后数据回显失败：病例分类、日期及分型字段为空

[门诊手术安排]“手术申请查询”弹窗底部，分页组件与界底部元素重叠，影响操作。

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

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

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

@@ -1107,7 +1107,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
             }
-            medicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            medicationRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
             medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
             medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1153,7 +1155,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
                 chargeItem.setStatusEnum(2); // 已生成医嘱
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                        ? adviceSaveDto.getGenerateSourceEnum()
+                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
@@ -1247,7 +1251,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             deviceRequest.setCreateBy(currentUsername);
             deviceRequest.setCreateTime(curDate);
             deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
-            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+            deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue());
             deviceRequest.setQuantity(boundDevice.getQuantity());
             deviceRequest.setUnitCode(boundDevice.getUnitCode());
             deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum());
@@ -1313,7 +1319,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             deviceChargeItem.setCreateTime(curDate);
             deviceChargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
             deviceChargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
-            deviceChargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+            deviceChargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue());
             deviceChargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号，与药品一致
             deviceChargeItem.setPatientId(adviceSaveDto.getPatientId());
             deviceChargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 耗材类型
@@ -1542,7 +1550,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
             }
-            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             deviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
             deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
             deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1605,7 +1615,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setCreateTime(curDate);          // 补全创建时间
                 chargeItem.setStatusEnum(2); // 已生成医嘱
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                        ? adviceSaveDto.getGenerateSourceEnum()
+                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -1906,7 +1918,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (is_save) {
                 serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
             }
-            serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            serviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                    ? adviceSaveDto.getGenerateSourceEnum()
+                    : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
             serviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
             serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
             serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -1957,7 +1971,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 chargeItem.setCreateTime(curDate);          // 补全创建时间
                 chargeItem.setStatusEnum(2); // 已生成医嘱
                 chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+                chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
+                        ? adviceSaveDto.getGenerateSourceEnum()
+                        : GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
                 chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
                 chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
                 chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id

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

@@ -112,12 +112,15 @@ 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;
 
     /** 订正病名（订正报告必填） */
@@ -136,6 +139,7 @@ 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,8 +178,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
-        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
-        inpatientAdviceParam.setRequestStatus(null);
+        // requestStatus由前端tab传入，通过QueryWrapper自动添加到SQL外层WHERE过滤
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
@@ -368,7 +367,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-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -90,7 +90,6 @@
             drf.create_time AS apply_time,
             os.surgery_nature AS surgeryType,
             cs.incision_level AS incisionLevel,
-            fc.contract_name AS feeType,
             os.fee_type AS feeType,
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os

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

@@ -75,7 +75,8 @@
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
-        SELECT wsr.quantity,
+        SELECT wsr.activity_id AS activity_id,
+               wsr.quantity,
                wsr.unit_code,
                COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
                aci.total_price
@@ -147,9 +148,9 @@
                 fc.contract_name AS fee_type,
                 COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
             FROM doc_request_form drf
-            LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
-            LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
-            LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
+            INNER JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
+            INNER JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
+            INNER JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
             LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
             LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
             LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'
@@ -184,6 +185,8 @@
                 </if>
                 AND drf.delete_flag = '0'
                 AND os.schedule_id IS NULL
+                <!-- 已取消(4)、已完成(3)的手术申请不参与门诊手术安排查找 -->
+                AND cs.status_enum NOT IN (3, 4)
             </where>
             ORDER BY drf.create_time DESC
     </select>

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java

@@ -39,7 +39,12 @@ public enum GenerateSource implements HisEnumInterface {
     /**
      * 自动滚费
      */
-    AUTO_ROLL_FEES(5, "5", "自动滚费");
+    AUTO_ROLL_FEES(5, "5", "自动滚费"),
+
+    /**
+     * 手术计费
+     */
+    SURGERY_BILLING(6, "6", "手术计费");
 
     private final Integer value;
     private final String code;

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -1046,8 +1046,10 @@ function handleSave() {
       chargeItemId: item.chargeItemId,
     };
   });
+  // 确保 organizationId 不为 undefined（手术计费场景下可能缺失 orgId）
+  const orgId = props.patientInfo.orgId || props.patientInfo.effectiveOrgId || 1;
   savePrescriptionSign({
-    organizationId: props.patientInfo.orgId,
+    organizationId: orgId,
     adviceSaveList: list,
   }).then((res) => {
     if (res.code === 200) {
@@ -1064,6 +1066,7 @@ function handleSave() {
     }
   }).catch((error) => {
     console.error('签发失败:', error);
+    console.warn('签发操作失败（可能无权限或后端异常）:', error?.response?.data?.msg || error?.message);
     proxy.$modal.msgError(error?.response?.data?.msg || error?.message || '签发失败，请重试');
   });
 }

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

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

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

@@ -380,7 +380,7 @@ const form = ref({
   prescriptionList: prescriptionList.value,
 });
 const adviceQueryParams = ref({
-  adviceType: '',
+  adviceType: 1,
   categoryCode: '', // 初始为空，等待加载配置后动态设置
   searchKey: '',
 });
@@ -533,7 +533,6 @@ const statusOption = [
 let loadingInstance = undefined;
 onMounted(() => {
   document.addEventListener('keydown', escKeyListener);
-  getList();
 });
 
 onBeforeUnmount(() => {
@@ -574,6 +573,7 @@ function handleTotalAmount() {
     }
   }, new Decimal(0));
 }
+getList();
 function getList() {
   getDiagnosisDefinitionList(queryParams.value).then((res) => {
     // prescriptionList.value = res.data.records;
@@ -585,11 +585,6 @@ function refresh() {
 }
 // 获取列表信息
 function getListInfo(addNewRow) {
-  // 守护：未选择患者时不发起 API 请求，避免页面加载时循环报错
-  if (!patientInfo.value || !patientInfo.value.encounterId) {
-    console.warn('⚠️ getListInfo 跳过：未选择患者');
-    return;
-  }
   loadingInstance = ElLoading.service({ fullscreen: true });
   setTimeout(() => {
     loadingInstance.close();
@@ -691,7 +686,7 @@ function loadConfiguredCategories() {
         nextTick(() => {
           // 创建新对象触发响应式更新
           adviceQueryParams.value = {
-            adviceType: '',
+            adviceType: 1,
             categoryCode: defaultCategoryCode,
             searchKey: '',
           };
@@ -715,17 +710,9 @@ function loadConfiguredCategories() {
 // 数据过滤
 const filterPrescriptionList = computed(() => {
   const pList = prescriptionList.value.filter((item) => {
-    // 修复 Bug #488：orderClassCode 可能是复合值 '1-2'，需提取 adviceType 部分进行比较
-    let matchAdviceType = true;
-    if (orderClassCode.value) {
-      const filterAdviceType = String(orderClassCode.value).includes('-')
-        ? parseInt(String(orderClassCode.value).split('-')[0])
-        : orderClassCode.value;
-      matchAdviceType = filterAdviceType == item.adviceType;
-    }
     return (
       (!therapyEnum.value || therapyEnum.value == item.therapyEnum) &&
-      matchAdviceType &&
+      (!orderClassCode.value || orderClassCode.value == item.adviceType) &&
       (!orderStatus.value || (orderStatus.value == item.statusEnum && item.requestId))
     );
   });
@@ -753,28 +740,12 @@ function getRowDisabled(row) {
 /**
  * 将行的 adviceType + categoryCode 映射为 el-select 的选中值
  * 药品子分类使用复合值如 '1-2'（adviceType-categoryCode），诊疗/手术/全部使用原始值
- * 修复 Bug #488：当行的 adviceType 在当前配置中找不到匹配选项时，返回最接近的可用值，避免回显为纯数字
  */
 function getRowSelectValue(row) {
   if (row.adviceType == 1 && row.categoryCode) {
-    const compositeValue = '1-' + row.categoryCode;
-    // 检查复合值是否在选项列表中
-    if (adviceTypeList.value.some(item => item.value === compositeValue)) {
-      return compositeValue;
-    }
-    // 配置的 categoryCode 已变更，回退到第一个药品选项
-    const firstPharmacy = adviceTypeList.value.find(item => String(item.value).startsWith('1-'));
-    if (firstPharmacy) {
-      return firstPharmacy.value;
-    }
-    return row.adviceType;
+    return '1-' + row.categoryCode;
   }
-  // 诊疗/手术等非药品类型，检查其值是否在选项列表中
-  if (adviceTypeList.value.some(item => item.value === row.adviceType)) {
-    return row.adviceType;
-  }
-  // 不在选项中的值（如已废弃的 adviceType），返回 undefined 让 el-select 显示为空
-  return undefined;
+  return row.adviceType;
 }
 
 // 新增医嘱
@@ -831,8 +802,8 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
-  // 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
-  if (row.statusEnum == 1) {
+  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
+  if (row.statusEnum == 1 && !row.requestId) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
     row.isEdit = true;
@@ -910,9 +881,9 @@ function handleFocus(row, index) {
   // 用 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);
-  // 修复Bug #486：当行没有显式选择医嘱类型时（row.adviceType为undefined），
-  // 不传categoryCode，让搜索在全药库中进行；只有行已选择类型时才用对应categoryCode过滤
-  const categoryCode = row.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : '';
+  // 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(() => {
@@ -949,12 +920,9 @@ function handleChange(value) {
       // 用 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);
-      // 修复Bug #486：当行没有显式选择医嘱类型时（row?.adviceType为undefined），
-      // 不传categoryCode，让搜索在全药库中进行；只有行已选择类型时才用对应categoryCode过滤
-      const categoryCode = row?.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : '';
-      // 修复Bug #453：当adviceType为空字符串或NaN时，不传具体类型，让refresh函数根据searchKey决定搜索范围
-      const effectiveAdviceType = (adviceType && !isNaN(Number(adviceType))) ? adviceType : '';
-      tableRef.refresh(effectiveAdviceType, categoryCode, value);
+      // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+      const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
+      tableRef.refresh(adviceType, categoryCode, value);
     }
   }
 }
@@ -1213,27 +1181,19 @@ function handleSave() {
     });
     // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
     loading.value = true;
-    let list = [];
-    try {
-      list = saveList.map((item) => {
-        const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
-        return {
-          ...parsedContent,
-          adviceType: item.adviceType,
-          requestId: item.requestId,
-          dbOpType: '1',
-          groupId: item.groupId,
-          uniqueKey: undefined,
-          // 确保 therapyEnum 被正确传递
-          therapyEnum: parsedContent?.therapyEnum || item.therapyEnum || '1',
-        };
-      });
-    } catch (error) {
-      loading.value = false;
-      isSaving.value = false;
-      proxy.$modal.msgError('医嘱内容解析失败，请检查待签发医嘱');
-      return;
-    }
+    let list = saveList.map((item) => {
+      const parsedContent = JSON.parse(item.contentJson);
+      return {
+        ...parsedContent,
+        adviceType: item.adviceType,
+        requestId: item.requestId,
+        dbOpType: '1',
+        groupId: item.groupId,
+        uniqueKey: undefined,
+        // 确保 therapyEnum 被正确传递
+        therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
+      };
+    });
     // 保存签发按钮
     isSaving.value = true;
     console.log('签发处方参数：', {
@@ -1248,16 +1208,9 @@ function handleSave() {
         if (res.code === 200) {
           proxy.$modal.msgSuccess('签发成功');
           isSaving.value = false;
-          // 乐观更新：立即将已签发医嘱的状态设为"已签发"，确保列表实时刷新
-          saveList.forEach((item) => {
-            const row = prescriptionList.value.find((r) => r.requestId && r.requestId === item.requestId);
-            if (row) {
-              row.statusEnum = 2;
-            }
-          });
           getListInfo(false);
           bindMethod.value = {};
-          nextId.value = 1;
+          nextId.value == 1;
         } else {
           proxy.$modal.msgError(res.message);
           isSaving.value = false;
@@ -1358,12 +1311,11 @@ function handleCancelEdit(row, index) {
 
 function handleSaveSign(row, index) {
   if (row.adviceType != 2) {
-    // 修复 Bug #488：严格校验 itemNo，确保非空且为有效字符串才发起请求
     let itemNo = row.adviceType == 1 ? row.methodCode : row.adviceDefinitionId;
-    if (!itemNo || String(itemNo).trim() === '') {
+    if (!itemNo) {
       console.warn('绑定设备检查跳过：itemNo为空（adviceType=' + row.adviceType + ', adviceName=' + row.adviceName + '）');
     } else {
-      getBindDevice({ typeCode: row.adviceType, itemNo: String(itemNo) }).then((res) => {
+      getBindDevice({ typeCode: row.adviceType, itemNo: itemNo }).then((res) => {
         if (res.data.length == 0) {
           return;
         }
@@ -1424,21 +1376,13 @@ function handleSaveSign(row, index) {
     savePrescription({ regAdviceSaveList: [row] }).then((res) => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('保存成功');
-        nextId.value = 1;
+        nextId.value == 1;
       }
     });
   } else {
-    // 新增行：调用保存接口将数据持久化到后端
-    row.dbOpType = '1';
-    savePrescription({ regAdviceSaveList: [row] }).then((res) => {
-      if (res.code === 200) {
-        proxy.$modal.msgSuccess('保存成功');
-        nextId.value = 1;
-        // 保存成功后刷新列表，确保后端返回的数据带 requestId
-        getListInfo(false);
-      }
-    });
-    // 不需要再添加空行，保存成功后由 getListInfo 处理
+    if (prescriptionList.value[0].adviceName) {
+      handleAddPrescription();
+    }
   }
   adviceQueryParams.value.adviceType = undefined;
 }
@@ -1479,40 +1423,32 @@ function handleSaveBatch() {
     .then((res) => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('保存成功');
-        // 修复 Bug #405：保存成功后锁定所有待保存行，避免医嘱条目仍处于可编辑状态
-        // saveList 中的 item 与 prescriptionList 是同一对象引用，直接修改即可
+        // 修复【#405】：保存成功后重置所有待保存行的 isEdit 为 false，锁定医嘱不再编辑
         saveList.forEach(item => {
-          item.isEdit = false;
+          const row = prescriptionList.value.find(r => r.uniqueKey === item.uniqueKey);
+          if (row) row.isEdit = false;
         });
-        // 兜底：锁定所有 statusEnum == 1 的行，确保没有遗漏
-        prescriptionList.value.forEach(row => {
-          if (row.statusEnum == 1) {
-            row.isEdit = false;
-          }
-        });
-        expandOrder.value = [];
         getListInfo(false);
-        nextId.value = 1;
+        nextId.value == 1;
         isSaving.value = false;
       }
     })
     .catch((error) => {
       isSaving.value = false;
-      proxy.$modal.msgError(error?.msg || '保存失败，请重试');
     });
 }
 
 function setValue(row) {
-  // 构造单位列表，确保 value 始终为 String 类型，避免 el-select 值类型不匹配
+  // 构造单位列表
   unitCodeList.value = [
-    { value: String(row.unitCode ?? ''), label: row.unitCode_dictText, type: 'unit' },
+    { value: row.unitCode, label: row.unitCode_dictText, type: 'unit' },
     {
-      value: String(row.doseUnitCode ?? ''),
+      value: row.doseUnitCode,
       label: row.doseUnitCode_dictText,
       type: 'dose',
     },
     {
-      value: String(row.minUnitCode ?? ''),
+      value: row.minUnitCode,
       label: row.minUnitCode_dictText,
       type: 'minUnit',
     },
@@ -1577,9 +1513,9 @@ function setValue(row) {
     orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
     // dose: undefined, Removed to preserve dose value from group package
     unitCodeList: unitCodeList.value,
-    doseUnitCode: String(row.doseUnitCode ?? ''),
-    minUnitCode: String(row.minUnitCode ?? ''),
-    unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode ?? '') : String(row.unitCode ?? ''),
+    doseUnitCode: row.doseUnitCode,
+    minUnitCode: row.minUnitCode,
+    unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode,
     categoryEnum: row.categoryCode,
     definitionId: row.chargeItemDefinitionId,
     executeNum: 1,
@@ -1595,10 +1531,6 @@ function setValue(row) {
             ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
             : prevRow.minUnitPrice,
           positionName: selectedStock?.locationName,
-          // 🔧 Bug #523 修复：初始化 totalPrice 为 0，避免总金额列显示为横杠
-          totalPrice: row.quantity
-            ? new Decimal(row.quantity).mul(selectedStock?.price ?? 0).toFixed(6)
-            : '0',
         }
       : {
           quantity: 1,
@@ -1630,21 +1562,17 @@ function handleSaveGroup(orderGroupList) {
     // 🔥 新版组件已经预处理了数据，优先使用 mergedDetail
     const mergedDetail = item.mergedDetail || {
       ...(item.orderDetailInfos || {}),
-      adviceName: item.orderDefinitionName || item.orderDetailInfos?.adviceName || '未知项目',
+      adviceName: item.orderDetailInfos?.adviceName || item.orderDefinitionName || '未知项目',
       adviceType: item.orderDetailInfos?.adviceType,
       adviceDefinitionId: item.orderDefinitionId || item.orderDetailInfos?.adviceDefinitionId,
       quantity: item.quantity,
       unitCode: item.unitCode || item.orderDetailInfos?.unitCode,
       unitCodeName: item.unitCodeName,
-      // 🔧 Bug #403 修复：dose/doseQuantity/dispensePerDuration 需用 null 检查，
-      // 避免组套中值为 null 时回退到医嘱库的 orderDetailInfos
-      dose: item.dose !== undefined && item.dose !== null ? item.dose : item.orderDetailInfos?.dose,
+      dose: item.dose || item.orderDetailInfos?.dose,
       rateCode: item.rateCode || item.orderDetailInfos?.rateCode,
       methodCode: item.methodCode || item.orderDetailInfos?.methodCode,
-      dispensePerDuration: item.dispensePerDuration !== undefined && item.dispensePerDuration !== null
-        ? item.dispensePerDuration : item.orderDetailInfos?.dispensePerDuration,
-      doseQuantity: item.doseQuantity !== undefined && item.doseQuantity !== null
-        ? item.doseQuantity : item.orderDetailInfos?.doseQuantity,
+      dispensePerDuration: item.dispensePerDuration || item.orderDetailInfos?.dispensePerDuration,
+      doseQuantity: item.doseQuantity,
       inventoryList: item.orderDetailInfos?.inventoryList || [],
       priceList: item.orderDetailInfos?.priceList || [],
       partPercent: item.orderDetailInfos?.partPercent || 1,
@@ -1663,69 +1591,41 @@ function handleSaveGroup(orderGroupList) {
     setValue(mergedDetail);
 
     // 创建新的处方项目
-    // 🔧 Bug #403 修复：关键字段使用 null-safe 回退到 mergedDetail（已由 setValue 填充完整数据）
-    // 先取 setValue 填充的行数据作为基础
-    const baseRow = prescriptionList.value[rowIndex.value];
     const newRow = {
-      ...baseRow,
-      isEdit: false,
+      ...prescriptionList.value[rowIndex.value],
       patientId: patientInfo.value.patientId,
       encounterId: patientInfo.value.encounterId,
       accountId: accountId.value,
+      quantity: item.quantity,
+      methodCode: item.methodCode,
+      rateCode: item.rateCode,
+      dispensePerDuration: item.dispensePerDuration,
+      dose: item.dose,
+      doseQuantity: item.doseQuantity,
       executeNum: 1,
+      unitCode: item.unitCode,
+      unitCode_dictText: item.unitCodeName || '',
       statusEnum: 1,
-      orgId: resolveOrgId(
-        (item.orderDetailInfos?.orgId || mergedDetail.orgId)
-          ? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
-          : patientInfo.value?.inHospitalOrgId
-      ) || '',
-      orgName: findOrgName(
-        (item.orderDetailInfos?.orgId || mergedDetail.orgId)
-          ? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
-          : patientInfo.value?.inHospitalOrgId
-      ) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
+      orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
+      // 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示
+      orgName: findOrgName(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
       dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
       conditionId: conditionId.value,
       conditionDefinitionId: conditionDefinitionId.value,
       encounterDiagnosisId: encounterDiagnosisId.value,
-      diagnosisName: diagnosisName.value,
-      therapyEnum: baseRow?.therapyEnum || '1',
+      therapyEnum: prescriptionList.value[rowIndex.value]?.therapyEnum || '1',
     };
-    // 覆盖关键字段：优先使用 item 的值，其次 mergedDetail（已由 setValue 填充），最后 baseRow
-    newRow.quantity = item.quantity ?? mergedDetail.quantity ?? baseRow.quantity;
-    newRow.methodCode = item.methodCode ?? mergedDetail.methodCode ?? baseRow.methodCode;
-    newRow.rateCode = item.rateCode ?? mergedDetail.rateCode ?? baseRow.rateCode;
-    newRow.dispensePerDuration = item.dispensePerDuration ?? mergedDetail.dispensePerDuration ?? baseRow.dispensePerDuration;
-    newRow.dose = item.dose ?? mergedDetail.dose ?? baseRow.dose;
-    newRow.doseQuantity = item.doseQuantity ?? mergedDetail.doseQuantity ?? baseRow.doseQuantity;
-    newRow.unitCode = item.unitCode ?? mergedDetail.unitCode ?? baseRow.unitCode;
-    newRow.unitCode_dictText = item.unitCodeName || mergedDetail.unitCodeName || baseRow.unitCode_dictText || '';
-    // 确保价格字段有兜底值（setValue 可能因库存不足提前 return 导致未设置）
-    newRow.unitPrice = baseRow.unitPrice ?? mergedDetail.unitPrice ?? 0;
-    newRow.minUnitPrice = baseRow.minUnitPrice ?? mergedDetail.minUnitPrice ?? 0;
-    newRow.unitTempPrice = newRow.unitPrice;
-    newRow.methodCode_dictText = mergedDetail.methodCode_dictText || item.methodCode_dictText || '';
-    newRow.rateCode_dictText = mergedDetail.rateCode_dictText || item.rateCode_dictText || '';
-    newRow.doseUnitCode = mergedDetail.doseUnitCode || item.doseUnitCode || baseRow.doseUnitCode;
-    newRow.doseUnitCode_dictText = mergedDetail.doseUnitCode_dictText || item.doseUnitCode_dictText || '';
-    newRow.orgId = mergedDetail.orgId || mergedDetail.positionId || baseRow.orgId || '';
-    newRow.positionName = mergedDetail.orgName || mergedDetail.positionName || baseRow.positionName || '';
 
     // 计算价格和总量
-    // 🔧 Bug #403 修复：使用 newRow.unitCode（已由 setValue 填充）而非 item.unitCode
-    // 使用 ?? 替代 || 计算 partPercent，确保值为 0 时不会被错误替换
-    const finalUnitCode = newRow.unitCode;
-    const unitInfo = unitCodeList.value.find((k) => k.value == finalUnitCode);
-    const finalQuantity = newRow.quantity;
-    const partPercent = item.orderDetailInfos?.partPercent ?? mergedDetail.partPercent ?? baseRow.partPercent ?? 1;
+    const unitInfo = unitCodeList.value.find((k) => k.value == item.unitCode);
     if (unitInfo && unitInfo.type == 'minUnit') {
       newRow.price = newRow.minUnitPrice;
-      newRow.totalPrice = ((finalQuantity || 0) * newRow.minUnitPrice).toFixed(6);
-      newRow.minUnitQuantity = finalQuantity || 0;
+      newRow.totalPrice = (item.quantity * newRow.minUnitPrice).toFixed(6);
+      newRow.minUnitQuantity = item.quantity;
     } else {
       newRow.price = newRow.unitPrice;
-      newRow.totalPrice = ((finalQuantity || 0) * newRow.unitPrice).toFixed(6);
-      newRow.minUnitQuantity = (finalQuantity || 0) * partPercent;
+      newRow.totalPrice = (item.quantity * newRow.unitPrice).toFixed(6);
+      newRow.minUnitQuantity = item.quantity * (item.orderDetailInfos?.partPercent || mergedDetail.partPercent || 1);
     }
 
     newRow.contentJson = JSON.stringify(newRow);

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" @click="handleCancel"> 退回 </el-button>
+        <el-button class="ml20 mr20" type="danger" :disabled="hasDispensedSelected" @click="handleCancel"> 退回 </el-button>
       </div>
     </div>
     <div
@@ -152,6 +152,7 @@
   </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';
@@ -163,6 +164,11 @@ 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,
@@ -262,7 +268,9 @@ function getGroupMarkers() {
 }
 
 // 选择框改变时的处理
-function handleSelectionChange(selection, row) {}
+function handleSelectionChange(selection, row) {
+  selectionTrigger.value++;
+}
 
 /**
  * 核对通过
@@ -291,7 +299,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) => {
@@ -310,12 +318,16 @@ function getSelectRows() {
   // 获取选中的医嘱信息
   let list = [];
   prescriptionList.value.forEach((item, index) => {
-    list = [...list, ...proxy.$refs['tableRef' + index][0].getSelectionRows()];
+    const ref = proxy.$refs['tableRef' + index];
+    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-DDTHH:mm:ss"
+                value-format="YYYY-MM-DD HH: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-DDTHH:mm:ss"
+                value-format="YYYY-MM-DD HH: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-DDTHH:mm:ss"
+                value-format="YYYY-MM-DD HH: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-DDTHH:mm:ss"
+                value-format="YYYY-MM-DD HH: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-DDTHH:mm:ss"
+                value-format="YYYY-MM-DD HH: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-DDTHH:mm:ss"
+                value-format="YYYY-MM-DD HH: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">
+    <el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog" class="surgery-apply-dialog">
       <!-- 查询条件区 -->
       <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="400"
-        :scroll="{ y: 400 }"
+        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>
@@ -781,7 +781,7 @@
       </el-table>
 
       <!-- 底部分页区 -->
-      <div class="pagination-container" style="margin-top: 10px; padding-bottom: 10px">
+      <div class="pagination-container apply-pagination" style="margin-top: 10px; padding-bottom: 20px">
         <pagination
           v-show="applyTotal > 0"
           :total="applyTotal"
@@ -792,10 +792,12 @@
           @pagination="getSurgicalScheduleList"
         />
       </div>
+      <!-- 分页与底部操作区之间的间隔 -->
+      <div style="height: 48px"></div>
 
       <!-- 底部操作区 -->
       <template #footer>
-        <div class="dialog-footer">
+        <div class="dialog-footer" style="margin-top: 24px; padding-top: 12px; border-top: 1px solid #ebeef5">
           <el-button @click="cancelApplyDialog">取消</el-button>
           <el-button type="primary" @click="confirmApply">确认</el-button>
         </div>
@@ -2350,6 +2352,22 @@ 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;
@@ -2360,3 +2378,21 @@ 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>