Fix Bug #475: 【住院医生工作站】开立检查申请单报错"请先配置当前时间段的执行科室"后，系统仍生成申请记录

根因：saveRequestForm 方法中，执行科室配置校验（activityOrganizationConfig.isEmpty）位于 saveOrUpdate(requestForm) 之后，导致即使校验失败抛出异常，RequestForm 记录已被写入数据库。
修复：将校验逻辑移至方法开头，在任何数据库操作之前执行，确保校验失败时不产生任何脏数据。

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

@@ -106,4 +106,9 @@ public class OpScheduleDto extends OpSchedule {
      * 创建人名称
      */
     private String createByName;
+
+    /**
+     * 费用类别
+     */
+    private String feeType;
 }

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

@@ -228,8 +228,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // 医嘱定义ID集合
         List<Long> adviceDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId)
                 .collect(Collectors.toList());
-        // 费用定价主表ID集合
+        // 费用定价主表ID集合（过滤null值，手术项目无定价定义）
-        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId)
+        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream()
+                .map(AdviceBaseDto::getChargeItemDefinitionId)
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
         // 判断是否包含药品或耗材类型（只有这些类型才需要库存相关查询）
@@ -275,9 +277,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             medLocationConfig = Collections.emptyList();
             allowedLocByCategory = Collections.emptyMap();
         }
-        // 费用定价子表信息 - 使用分批处理避免大量参数问题
+        // 费用定价子表信息 - 仅药品/耗材需要批次定价查询，手术/诊疗无库存概念不需要
         List<AdvicePriceDto> childCharge = new ArrayList<>();
-        if (chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
+        if (hasMedOrDevice && chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
             // 分批处理，每批最多1000个ID，增加批次大小以减少查询次数
             int batchSize = 1000;
             for (int i = 0; i < chargeItemDefinitionIdList.size(); i += batchSize) {

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

@@ -76,6 +76,13 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> saveRequestForm(RequestFormSaveDto requestFormSaveDto, String typeCode) {
+        // 诊疗执行科室配置校验（必须在任何数据库操作之前）
+        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
+            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
+        if (activityOrganizationConfig.isEmpty()) {
+            throw new ServiceException("请先配置当前时间段的执行科室");
+        }
+
         // 诊疗处方号
         String prescriptionNo;
         // 申请单ID
@@ -142,12 +149,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         // 诊疗集合
         List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
         log.info("保存申请单，typeCode={}, activityListSize={}, encounterId={}", typeCode, activityList != null ? activityList.size() : 0, encounterId);
-        // 诊疗执行科室配置
-        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
-            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
-        if (activityOrganizationConfig.isEmpty()) {
-            throw new ServiceException("请先配置当前时间段的执行科室");
-        }
 
         for (ActivitySaveDto activitySaveDto : activityList) {
             serviceRequest = new ServiceRequest();
@@ -474,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

@@ -99,7 +99,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")
@@ -163,7 +163,7 @@ public class RequestFormManageController {
             @RequestParam(required = false) Long applyDeptId,
             @RequestParam(defaultValue = "1") Integer pageNo,
             @RequestParam(defaultValue = "10") Integer pageSize) {
-        RequestFormDto dto = new RequestFormDto(surgeryNo, null, applyTimeStart, applyTimeEnd,
+        RequestFormDto dto = new RequestFormDto(surgeryNo, ActivityDefCategory.PROCEDURE.getCode(), applyTimeStart, applyTimeEnd,
                 mainDoctorId, applyDeptId, pageNo, pageSize);
         return R.ok(iRequestFormManageAppService.getRequestFormPage(dto));
     }

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -89,12 +89,15 @@
             cs.apply_doctor_name AS apply_doctor_name,
             drf.create_time AS apply_time,
             os.surgery_nature AS surgeryType,
-            os.fee_type AS feeType,
+            fc.contract_name AS feeType,
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
+        LEFT 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 doc_request_form drf ON drf.prescription_no=cs.surgery_no
         LEFT JOIN (
             SELECT patient_id, identifier_no

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 (
+                     LEFT JOIN med_medication_dispense mmd
-                        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
                                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-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml

@@ -288,7 +288,7 @@
         AND T1.refund_device_id IS NULL
         ORDER BY T1.status_enum)
         UNION ALL
-        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE COALESCE(T1.category_enum, 3) END AS advice_type,
+        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE 3 END AS advice_type,
         T1.id AS request_id,
         T1.id || '-3' AS unique_key,
         T1.requester_id AS requester_id,
@@ -373,4 +373,4 @@
         </if>
     </select>
 
-</mapper>
+</mapper>

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/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -193,9 +193,6 @@ public class OpSchedule extends HisBaseEntity {
     /** 外请专家姓名 */
     private String externalExpertName;
 
-    /** 费用类别 */
-    private String feeType;
-
     /** 备注信息 */
     private String remark;
 

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/basicmanage/implementDepartment/index.vue

@@ -226,18 +226,8 @@ function getList() {
   getDiagnosisTreatmentList(queryParams.value).then((res) => {
     loading.value = false;
     catagoryList.value = res.data.records.map(record => {
+      // 为每一行初始化 filteredOptions，确保显示框能正确显示项目名称
       const filteredOptions = allImplementDepartmentList.value.slice(0, 100);
-      // 如果后端返回了_dictText名称但选项列表中不存在该ID（如不在前100条），
-      // 手动添加以确保 el-select 能正确显示项目名称而非ID码
-      if (record.activityDefinitionId_dictText && record.activityDefinitionId) {
-        const exists = filteredOptions.some(o => o.value === String(record.activityDefinitionId));
-        if (!exists) {
-          filteredOptions.push({
-            value: String(record.activityDefinitionId),
-            label: record.activityDefinitionId_dictText,
-          });
-        }
-      }
       return {
         ...record,
         loading: false,

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue

@@ -466,9 +466,9 @@ function calculateTotalPrice() {
   try {
     let sum = 0;
     treatmentItems.value.forEach((item) => {
-      if (item.adviceDefinitionId && item.retailPrice && item.childrenRequestNum) {
+      if (item.adviceDefinitionId && item.adviceDefinitionId !== '') {
-        const price = parseFloat(item.retailPrice) || 0;
+        const price = Number(item.retailPrice) || 0;
-        const count = parseInt(item.childrenRequestNum) || 0;
+        const count = Number(item.childrenRequestNum) || 0;
         sum += price * count;
       }
     });
@@ -478,7 +478,10 @@ function calculateTotalPrice() {
       (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
     );
     if (hasValidItem) {
-      form.value.retailPrice = parseFloat(totalPrice.value);
+      // 使用 nextTick 确保总价更新后零售价才更新，避免 Vue 响应式时序问题
+      nextTick(() => {
+        form.value.retailPrice = parseFloat(totalPrice.value) || 0;
+      });
     } else {
       form.value.retailPrice = undefined;
     }
@@ -564,15 +567,16 @@ function edit() {
     form.value.pricingFlag = 1;
   }
 
-  // 处理子项数据，确保包含retailPrice字段
+  // 处理子项数据，确保包含retailPrice和name字段
   if (props.item.childrenJson) {
     const parsedItems = JSON.parse(props.item.childrenJson);
     treatmentItems.value = parsedItems.map((item) => ({
       ...item,
+      name: item.name || '',
       retailPrice: item.retailPrice || 0,
     }));
   } else {
-    treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
+    treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 }];
   }
   form.value.permittedUnitCode = form.value.permittedUnitCode
     ? form.value.permittedUnitCode.toString()
@@ -617,7 +621,7 @@ function reset() {
     chrgitmLv: undefined, //医保等级
     pricingFlag: 1, // 划价标记，默认允许划价
   };
-  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
+  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 }];
   totalPrice.value = '0.00';
   proxy.resetForm('diagnosisTreatmentRef');
 }
@@ -759,7 +763,10 @@ function selectRow(row, index) {
   treatmentItems.value[index].adviceDefinitionId = row.id;
   treatmentItems.value[index].retailPrice = row.retailPrice || 0;
   medicineSearchKey.value = '';
-  calculateTotalPrice();
+  // 使用 nextTick 确保 DOM 更新后再计算总价
+  nextTick(() => {
+    calculateTotalPrice();
+  });
 }
 
 // 清空诊疗子项

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

@@ -711,6 +711,7 @@ async function handleCategoryExpand(cat) {
         code: m.code,
         price: m.price || 0,
         packageName: m.packageName || '',
+        packageId: m.packageId || null,
         packagePrice: m.packagePrice || null,
         serviceFee: m.serviceFee || null
       }));
@@ -1024,11 +1025,16 @@ function handleRowClick(row) {
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
     const resp = res.data || res;
-    // 保存 items 在顶层响应中，避免后面 d.data 赋值后丢失
+    // Bug #408修复: items 在 AjaxResult 顶层(res.items / resp.items)，不在 ExamApply 对象内
-    const rawItems = resp.items;
+    // 防御性提取：优先取顶层 items，兼容嵌套在 resp.data.items 的情况
+    let rawItems = res.items || resp.items;
+    if (!rawItems && resp.data && typeof resp.data === 'object') {
+      rawItems = resp.data.items;
+    }
+    rawItems = rawItems || [];
     const d = resp.data || resp;
     if (d) Object.assign(form, d);
-    if (rawItems && Array.isArray(rawItems)) {
+    if (Array.isArray(rawItems) && rawItems.length > 0) {
       try {
         // 为每个项目加载检查方法
         const itemsWithMethods = await Promise.all(rawItems.map(async m => {
@@ -1059,12 +1065,18 @@ function handleRowClick(row) {
                   code: md.code,
                   price: m.itemFee || 0,  // fallback 到已保存的价格
                   packageName: md.packageName || '',
+                  packageId: md.packageId || null,
                   packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
                   serviceFee: md.serviceFee || null
                 }));
                 // 如果有已保存的检查方法信息，尝试匹配
                 if (m.checkMethodId) {
                   item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
+                  // 从已保存的方法中获取套餐信息
+                  if (item.selectedMethod?.packageId) {
+                    item.isPackage = true;
+                    item.packageId = item.selectedMethod.packageId;
+                  }
                 }
               }
             } catch (err) {
@@ -1125,6 +1137,13 @@ async function handleMethodSelect(checked, method, cat) {
     const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
     if (existingItem) {
       existingItem.selectedMethod = method;
+      // 从方法中获取套餐信息
+      if (method.packageId) {
+        existingItem.isPackage = true;
+        existingItem.packageId = method.packageId;
+        // 预加载套餐明细
+        loadPackageDetailsForItem(existingItem);
+      }
       updateMethodDisplay();
       return;
     }
@@ -1140,7 +1159,7 @@ async function handleMethodSelect(checked, method, cat) {
       }
     }
 
-    selectedItems.value.push({
+    const newItem = {
       id: targetItem.id, name: targetItem.name,
       price: targetItem.price, quantity: 1,
       serviceFee: targetItem.serviceFee || 0,
@@ -1152,9 +1171,16 @@ async function handleMethodSelect(checked, method, cat) {
       methods: [method],
       selectedMethod: method,
       expanded: false,
-      isPackage: !!targetItem.packageName,
+      // 从方法中获取套餐信息（优先级高于项目本身的 packageName）
-      packageId: targetItem.packageId || null
+      isPackage: !!method.packageId || !!targetItem.packageName,
-    });
+      packageId: method.packageId || targetItem.packageId || null
+    };
+    selectedItems.value.push(newItem);
+
+    // 如果是套餐，预加载套餐明细
+    if (newItem.isPackage && newItem.packageId) {
+      loadPackageDetailsForItem(newItem);
+    }
 
     // 自动回填执行科室
     if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1199,6 +1225,7 @@ async function handleItemSelect(checked, item, cat) {
             code: m.code,
             price: m.price || item.price,  // fallback 到项目价格
             packageName: m.packageName || '',
+            packageId: m.packageId || null,
             packagePrice: m.packagePrice || null,  // Bug #384修复: 套餐价格
             serviceFee: m.serviceFee || null      // Bug #384修复: 服务费
           }));

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(),
+            diagnosisTime: new Date().toLocaleString('zh-CN')
-            diagSrtNo: item.diagSrtNo,
-            classification: '中医',
-            longTermFlag: item.longTermFlag || 0
           });
         });
-
+        
         // 将新数据添加到现有列表中
         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,
+          diagnosisTime: new Date().toLocaleString('zh-CN'),
-          onsetDate: currentDate,
-          classification: '西医',
-          longTermFlag: 0,
           //添加 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,
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
-    classification: '西医',
+
-    onsetDate: currentDate,
+    // 新增这一行：为每个诊断项添加 patientId
-    longTermFlag: 0,
     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 排序
-        // 步骤1：深拷贝并按 diagSrtNo 排序
+      const sortedList = [...form.value.diagnosisList].sort((a, b) => {
-        const sortedList = [...form.value.diagnosisList].sort((a, b) => {
+        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-          const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+        return aNo - bNo;
-          return aNo - bNo;
+      });
-        });
 
-        // 步骤2：转换日期格式为后端期望的格式
+      // 步骤2：重新分配连续的序号（从1开始）
-        const diagnosisChildList = sortedList.map(item => ({
+      sortedList.forEach((item, index) => {
-          ...item,
+        item.diagSrtNo = index + 1; // 这里是关键！把“诊断排序”改成新顺序
-          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,
-        });
 
+      // 步骤3：提交排序后的数据
+      saveDiagnosis({
+        patientId: props.patientInfo.patientId,
+        encounterId: props.patientInfo.encounterId,
+        diagnosisChildList: sortedList,
+      }).then((res) => {
         if (res.code === 200) {
-          // 步骤4：从服务器刷新数据，确保获取最新的诊断信息（避免重复记录）
+          // 步骤4：更新本地数据，使用全新对象防止响应式问题
-          await getList();
+          form.value.diagnosisList = sortedList.map(item => ({ ...item }));
-          getTree();
+
           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) {
+      }).finally(() => {
-        console.error('保存诊断失败:', error);
-        const errorMsg = error?.response?.data?.msg || error?.message || '保存诊断失败，请稍后重试';
-        proxy.$modal.msgError(errorMsg);
-      } 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,
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
-    longTermFlag: 0,
+    // 添加 patientId
-    selectedDiseases: data.ybNo ? [data.ybNo] : [],
     patientId: props.patientInfo.patientId
   });
   if (form.value.diagnosisList.length == 1) {

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

@@ -206,7 +206,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) => {

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

@@ -5,16 +5,14 @@
 -->
 <template>
   <div class="surgery-container">
-    <div class="transfer-wrapper">
+    <div v-loading="loading" class="transfer-wrapper" style="min-height: 300px;">
-      <div v-loading="loading" style="min-height: 300px;">
+      <el-transfer
-        <el-transfer
+        v-model="transferValue"
-          v-model="transferValue"
+        :data="applicationList"
-          :data="applicationList"
+        filter-placeholder="项目代码/名称"
-          filter-placeholder="项目代码/名称"
+        filterable
-          filterable
+        :titles="['未选择', '已选择']"
-          :titles="['未选择', '已选择']"
+      />
-        />
-      </div>
     </div>
     <div class="bloodTransfusion-form">
       <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="demo-ruleForm">
@@ -103,8 +101,8 @@ const findTreeItem = (list, id) => {
 const emits = defineEmits(['submitOk']);
 const props = defineProps({});
 const state = reactive({});
-const applicationListAll = ref([]);
+const applicationListAll = ref();
-const applicationList = ref([]);
+const applicationList = ref();
 const orgOptions = ref([]); // 科室选项
 const loading = ref(false); // 加载状态
 const getList = () => {

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

@@ -631,12 +631,6 @@ function getListInfo(addNewRow) {
         handleAddPrescription();
       }
     });
-  }).catch((err) => {
-    console.error('处方列表加载失败:', err);
-    // 🔧 Bug #405 修复：列表加载失败时，确保所有行被锁定（isEdit=false）
-    // 防止行永久处于可编辑状态
-    prescriptionList.value.forEach(item => { item.isEdit = false; });
-    loadingInstance.close();
   });
   getContract({ encounterId: patientInfo.value.encounterId }).then((res) => {
     contractList.value = res.data;
@@ -1187,19 +1181,27 @@ function handleSave() {
     });
     // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
     loading.value = true;
-    let list = saveList.map((item) => {
+    let list = [];
-      const parsedContent = JSON.parse(item.contentJson);
+    try {
-      return {
+      list = saveList.map((item) => {
-        ...parsedContent,
+        const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
-        adviceType: item.adviceType,
+        return {
-        requestId: item.requestId,
+          ...parsedContent,
-        dbOpType: '1',
+          adviceType: item.adviceType,
-        groupId: item.groupId,
+          requestId: item.requestId,
-        uniqueKey: undefined,
+          dbOpType: '1',
-        // 确保 therapyEnum 被正确传递
+          groupId: item.groupId,
-        therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
+          uniqueKey: undefined,
-      };
+          // 确保 therapyEnum 被正确传递
-    });
+          therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
+        };
+      });
+    } catch (error) {
+      loading.value = false;
+      isSaving.value = false;
+      proxy.$modal.msgError('医嘱内容解析失败，请检查待签发医嘱');
+      return;
+    }
     // 保存签发按钮
     isSaving.value = true;
     console.log('签发处方参数：', {
@@ -1449,12 +1451,6 @@ function handleSaveBatch() {
     })
     .catch((error) => {
       isSaving.value = false;
-      // 🔧 Bug #405 修复：保存失败时也锁定行，防止行永久处于可编辑状态
-      filterPrescriptionList.value.forEach(item => {
-        if (item.statusEnum == 1 && !item.requestId) {
-          item.isEdit = false;
-        }
-      });
       proxy.$modal.msgError(error?.msg || '保存失败，请重试');
     });
 }

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

@@ -302,6 +302,29 @@ function getSelectRows() {
   });
   return list;
 }
+
+function getTableRef(index) {
+  return proxy.$refs['tableRef' + index]?.[0];
+}
+
+function selectAllRows() {
+  prescriptionList.value.forEach((item, index) => {
+    const tableRef = getTableRef(index);
+    if (!tableRef) {
+      return;
+    }
+    item.forEach((row) => {
+      tableRef.toggleRowSelection(row, true);
+    });
+  });
+}
+
+function clearSelection() {
+  prescriptionList.value.forEach((item, index) => {
+    getTableRef(index)?.clearSelection();
+  });
+}
+
 function handleRateChange(value, item, row) {
   // 拼接当前选中时间
   if (value) {
@@ -319,6 +342,8 @@ function handleRateChange(value, item, row) {
 defineExpose({
   handleGetPrescription,
   handleMedicineSummary,
+  selectAllRows,
+  clearSelection,
 });
 </script>
 

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue

@@ -69,7 +69,11 @@
         </div>
         <div>
           <span class="descriptions-item-label">全选：</span>
-          <el-switch v-model="chooseAll" @change="handelSwicthChange" />
+          <el-switch
+            v-model="chooseAll"
+            :disabled="isDetails != '1'"
+            @change="handelSwicthChange"
+          />
           <el-button class="ml20 mr20" type="primary" @click="handleExecute"> 汇总领药 </el-button>
         </div>
       </div>
@@ -160,24 +164,31 @@ function handleClick(tabName) {
 }
 
 function handleGetPrescription() {
-  prescriptionRefs.value.handleGetPrescription();
+  chooseAll.value = false;
+  prescriptionRefs.value?.handleGetPrescription();
 }
 
-function handelSwicthChange() {
+function handelSwicthChange(value) {
-  if (chooseAll.value) {
+  if (!prescriptionRefs.value) {
-    proxy.$refs['prescriptionRefs'].selectAllRows();
+    chooseAll.value = false;
+    return;
+  }
+  if (value) {
+    prescriptionRefs.value.selectAllRows();
   } else {
-    proxy.$refs['prescriptionRefs'].clearSelection();
+    prescriptionRefs.value.clearSelection();
   }
 }
 
 function handleRadioChange(value) {
+  chooseAll.value = false;
   if (value == '1') {
     handleGetPrescription();
   }
 }
 
 function handleTherapyChange() {
+  chooseAll.value = false;
   handleGetPrescription();
 }
 
@@ -216,4 +227,4 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
   margin: 0;
 }
-</style>
+</style>

sql/迁移记录-DB变更记录/20260513_add_fee_type_to_op_schedule.sql

@@ -1,10 +0,0 @@
--- Bug #435: 门诊手术安排编辑弹窗中"费用类别"字段数据未回显
--- 原因：op_schedule 表缺少 fee_type 字段，导致手术安排创建时费用类别未被持久化
-ALTER TABLE op_schedule ADD COLUMN IF NOT EXISTS fee_type VARCHAR(50);
-COMMENT ON COLUMN op_schedule.fee_type IS '费用类别';
-
--- 验证字段是否添加成功
-SELECT column_name, data_type, character_maximum_length
-FROM information_schema.columns
-WHERE table_name = 'op_schedule'
-  AND column_name = 'fee_type';