更新

server/app/adminapi/logic/tcm/DiagnosisLogic.php

@@ -748,6 +748,46 @@ class DiagnosisLogic extends BaseLogic
         }
     }
 
+    /**
+     * @notes 诊单指派医助操作记录列表
+     */
+    public static function setRevisitSlotStartOffset(int $diagnosisId, int $offset, array $adminInfo): bool
+    {
+        self::$error = '';
+        if ($diagnosisId <= 0) {
+            self::setError('诊单不存在');
+
+            return false;
+        }
+        if ($offset < 1 || $offset > 20) {
+            self::setError('起始偏移须在 1～20 之间');
+
+            return false;
+        }
+        $diagnosis = Diagnosis::where('id', $diagnosisId)->whereNull('delete_time')->find();
+        if (!$diagnosis) {
+            self::setError('诊单不存在');
+
+            return false;
+        }
+        $old = (int) ($diagnosis->revisit_slot_start_offset ?? 1);
+        if ($old < 1) {
+            $old = 1;
+        }
+        if ($old === $offset) {
+            return true;
+        }
+        try {
+            $diagnosis->save(['revisit_slot_start_offset' => $offset]);
+
+            return true;
+        } catch (\Exception $e) {
+            self::setError($e->getMessage());
+
+            return false;
+        }
+    }
+
     /**
      * @notes 诊单指派医助操作记录列表
      */

server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php

@@ -3407,17 +3407,14 @@ class PrescriptionOrderLogic
     }
 
     /**
-     * 导出用：主方/辅方服用天数（优先业务订单 medication_days，缺省回退处方 usage_days / 辅方 aux_usage）
+     * 导出用：主方/辅方开立天数（与详情侧栏「处方开立」同口径：主方取处方 usage_days，辅方取 aux_usage.usage_days）
+     * 订单服用天数单独导出在 export_medication_days 列，不在此混用。
      *
      * @param array<string, mixed> $rx
      * @param array<string, mixed>|null $auxUsage
      */
-    private static function resolveExportUsageDays(array $rx, ?array $auxUsage, $orderMedicationDays, bool $isAux): string
+    private static function resolveExportUsageDays(array $rx, ?array $auxUsage, bool $isAux): string
     {
-        $medDays = $orderMedicationDays;
-        if ($medDays !== null && $medDays !== '' && (int) $medDays > 0) {
-            return (string) (int) $medDays;
-        }
         if ($isAux) {
             $days = (int) ($auxUsage['usage_days'] ?? 0);
 
@@ -3990,10 +3987,9 @@ class PrescriptionOrderLogic
             } else {
                 $item['export_aux_usage'] = '';
             }
-            $orderMedDays = $item['medication_days'] ?? null;
-            $item['export_main_usage_days'] = self::resolveExportUsageDays($rxArr, $auxUsageNorm, $orderMedDays, false);
+            $item['export_main_usage_days'] = self::resolveExportUsageDays($rxArr, $auxUsageNorm, false);
             $item['export_aux_usage_days'] = $auxHerbs !== []
-                ? self::resolveExportUsageDays($rxArr, $auxUsageNorm, $orderMedDays, true)
+                ? self::resolveExportUsageDays($rxArr, $auxUsageNorm, true)
                 : '';
 
             $item['export_service_package'] = self::formatServicePackageForExport(
@@ -4906,8 +4902,8 @@ class PrescriptionOrderLogic
 
             return false;
         }
-        if (in_array((int) $order->fulfillment_status, [3, 4], true)) {
-            self::setError('已完成或已取消的订单不可修改');
+        if ((int) $order->fulfillment_status === 4) {
+            self::setError('已取消的订单不可修改');
 
             return false;
         }