Fix Bug #408: 门诊医生站：检查标签页：选中检查申请记录后，“检查明细”标签页显示“暂无数据”

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

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

@@ -36,9 +36,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.Date;
 import java.util.*;
 
@@ -601,25 +598,6 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         InfectiousDiseaseReport infectiousDiseaseReport = new InfectiousDiseaseReport();
         BeanUtils.copyProperties(infectiousDiseaseReportDto, infectiousDiseaseReport);
 
-        // BeanUtils.copyProperties 不支持 LocalDate/LocalDateTime 到 java.util.Date 的类型转换，需手动处理
-        if (infectiousDiseaseReportDto.getOnsetDate() != null) {
-            infectiousDiseaseReport.setOnsetDate(
-                Date.from(infectiousDiseaseReportDto.getOnsetDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
-        }
-        if (infectiousDiseaseReportDto.getDiagDate() != null) {
-            infectiousDiseaseReport.setDiagDate(
-                Date.from(infectiousDiseaseReportDto.getDiagDate().atZone(ZoneId.systemDefault()).toInstant()));
-        }
-        // deathDate / reportDate 同理
-        if (infectiousDiseaseReportDto.getDeathDate() != null) {
-            infectiousDiseaseReport.setDeathDate(
-                Date.from(infectiousDiseaseReportDto.getDeathDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
-        }
-        if (infectiousDiseaseReportDto.getReportDate() != null) {
-            infectiousDiseaseReport.setReportDate(
-                Date.from(infectiousDiseaseReportDto.getReportDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
-        }
-
         /**
          * 设置创建人、删除状态、租户ID
          */

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

@@ -91,15 +91,13 @@
             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
         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 doc_request_form drf ON drf.prescription_no=cs.surgery_no
-        LEFT JOIN adm_encounter ae ON ae.id = os.visit_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 (
             SELECT patient_id, identifier_no
             FROM (

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

@@ -1362,9 +1362,8 @@ async function handleMethodSelect(checked, method, cat) {
         existingItem.isPackage = true;
         existingItem.packageId = method.packageId;
         existingItem.packageName = method.packageName || existingItem.packageName;  // #428修复: 确保 packageName 同步
-        existingItem.expanded = true;  // #428修复: 有套餐时默认展开，展示套餐明细
         // 预加载套餐明细
-        await loadPackageDetailsForItem(existingItem);
+        loadPackageDetailsForItem(existingItem);
       }
       updateMethodDisplay();
       return;
@@ -1400,10 +1399,9 @@ async function handleMethodSelect(checked, method, cat) {
     };
     selectedItems.value.push(newItem);
 
-    // 如果是套餐，预加载套餐明细并默认展开
+    // 如果是套餐，预加载套餐明细
     if (newItem.isPackage && newItem.packageId) {
-      newItem.expanded = true;
+      loadPackageDetailsForItem(newItem);
-      await loadPackageDetailsForItem(newItem);
     }
 
     // 自动回填执行科室
@@ -1525,10 +1523,7 @@ async function handleItemSelect(checked, item, cat) {
 // Bug #384修复 + #426修复: 展开/收起项目卡片
 async function toggleItemExpand(item) {
   item.expanded = !item.expanded;
-  const carrier = getPackageCarrier(item);
+  if (item.expanded && (item.isPackage || item.packageName) && (!item.packageDetails || item.packageDetails.length === 0) && !item.packageDetailsLoading) {
-  const hasDetails = Array.isArray(item.packageDetailsDisplay) && item.packageDetailsDisplay.length > 0
-    || Array.isArray(carrier?.packageDetails) && carrier.packageDetails.length > 0;
-  if (item.expanded && (item.isPackage || item.packageName) && !hasDetails && !item.packageDetailsLoading) {
     await loadPackageDetailsForItem(item);
   }
   if (item.expanded && shouldShowPackageBody(item)) {