From f00383034d50a49e9128b20d15627da8893423bb Mon Sep 17 00:00:00 2001
From: Jafeng <2998840497@qq.com>
Date: Mon, 9 Feb 2026 14:20:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=82=A3=E8=80=85?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=92=8C=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/case/archive-detail.vue |  2 ++
 pages/case/group-manage.vue   | 19 +++++++++---
 pages/home/case-home.vue      | 56 +++++++++++++++++++++++++++++++----
 3 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/pages/case/archive-detail.vue b/pages/case/archive-detail.vue
index 4be1445..e8a8a0f 100644
--- a/pages/case/archive-detail.vue
+++ b/pages/case/archive-detail.vue
@@ -592,7 +592,9 @@ const createText = computed(() => {
   const creatorId = ['-', '—', '--'].includes(rawCreator.trim()) ? '' : rawCreator.trim();
   const creatorName = creatorId ? resolveUserName(creatorId) : '';
   if (time && creatorName) return `${time}  ${creatorName}创建`;
+  if (time && !rawCreator.trim()) return `${time}  患者创建`;
   if (time) return `${time} 创建`;
+  if (!rawCreator.trim()) return '患者创建';
   return '';
 });
 
diff --git a/pages/case/group-manage.vue b/pages/case/group-manage.vue
index 5af53c5..1fefe3d 100644
--- a/pages/case/group-manage.vue
+++ b/pages/case/group-manage.vue
@@ -2,7 +2,7 @@
   <view class="manage-container">
     <view class="group-list">
       <scroll-view scroll-y class="sort-scroll">
-        <movable-area class="drag-area" :style="{ height: dragAreaHeight + 'px' }">
+        <movable-area :key="areaKey" class="drag-area" :style="{ height: dragAreaHeight + 'px' }">
           <movable-view
             v-for="(item, index) in groups"
             :key="item._id"
@@ -81,7 +81,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, nextTick } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import { storeToRefs } from 'pinia';
 import api from '@/utils/api';
@@ -91,6 +91,8 @@ import { hideLoading, loading, toast } from '@/utils/widget';
 // State
 const groups = ref([]);
 const originalGroups = ref([]);
+const areaKey = ref(0);
+const loadSeq = ref(0);
 
 const ITEM_HEIGHT = 74; // px，需与样式保持一致
 const draggingId = ref('');
@@ -151,6 +153,7 @@ async function ensureDoctor() {
 }
 
 async function loadGroups() {
+  const seq = (loadSeq.value += 1);
   await ensureDoctor();
   const corpId = getCorpId();
   const teamId = getTeamId();
@@ -166,9 +169,17 @@ async function loadGroups() {
     }
     const list = Array.isArray(res.data) ? res.data : Array.isArray(res.data?.data) ? res.data.data : [];
     const sorted = sortGroupList(list);
-    groups.value = sorted.map((i, idx) => ({ ...i, _y: idx * ITEM_HEIGHT }));
-    originalGroups.value = sorted.map((i, idx) => ({ ...i, _y: idx * ITEM_HEIGHT }));
+    if (seq !== loadSeq.value) return;
+    const next = sorted.map((i, idx) => ({ ...i, _y: idx * ITEM_HEIGHT }));
+
+    // movable-view 在频繁新增后偶发错位：清空再赋值，并通过 key 强制重建 movable-area
+    groups.value = [];
+    await nextTick();
+    if (seq !== loadSeq.value) return;
+    groups.value = next;
+    originalGroups.value = next.map((i) => ({ ...i }));
     lastSavedOrderKey.value = getOrderKey(groups.value);
+    areaKey.value += 1;
   } catch (e) {
     toast('获取分组失败');
   } finally {
diff --git a/pages/home/case-home.vue b/pages/home/case-home.vue
index 365f90d..c788308 100644
--- a/pages/home/case-home.vue
+++ b/pages/home/case-home.vue
@@ -80,8 +80,7 @@
               <view class="card-row-bottom">
                 <template v-if="currentTabKey === 'new'"> <!-- New Patient Tab -->
                   <text class="record-text">
-                    {{ patient.createTime || '-' }} {{ resolveCreatorName(patient) ? resolveCreatorName(patient) +
-                      '创建' : '-' }}
+                    {{ resolveRecentAddTime(patient) }} {{ resolveRecentAddMeta(patient) }}
                   </text>
                 </template>
                 <template v-else>
@@ -264,6 +263,32 @@ function resolveCreatorName(patient) {
   return userNameMap.value[val] || val;
 }
 
+function resolveRecentAddTime(patient) {
+  return patient?.recentAddTime || patient?.createTime || '-';
+}
+
+function resolveRecentAddOperatorName(patient) {
+  const uid = patient?.recentAddOperatorUserId || patient?.creator || '';
+  if (!uid) return '';
+  return userNameMap.value[uid] || uid;
+}
+
+function resolveRecentAddAction(patient) {
+  const t = String(patient?.recentAddType || '').trim();
+  if (!t || t === 'create') return '创建';
+  if (t === 'share') return '共享';
+  if (t.startsWith('transfer')) return '转移';
+  return '创建';
+}
+
+function resolveRecentAddMeta(patient) {
+  const name = resolveRecentAddOperatorName(patient);
+  const action = resolveRecentAddAction(patient);
+  if (name) return `${name}${action}`;
+  if (action === '创建') return '患者创建';
+  return '-';
+}
+
 
 function applyVerifyStatus(status, reason) {
   verifyStatus.value = status || '';
@@ -382,6 +407,14 @@ function formatPatient(raw) {
   const createTimeStr = createTime ? createTime.format('YYYY-MM-DD HH:mm') : '';
   const createTimeTs = createTime ? createTime.valueOf() : 0;
 
+  // 最近一次“新增到当前团队”的时间（后端计算：创建/转移/共享），没有则退化为 createTime
+  const recentAddTimeRaw = raw?.recentAddTime ?? raw?.recentAddAt ?? raw?.recentTime;
+  const recentAddTime = parseCreateTime(recentAddTimeRaw) || createTime;
+  const recentAddTimeStr = recentAddTime ? recentAddTime.format('YYYY-MM-DD HH:mm') : '';
+  const recentAddTimeTs = recentAddTime ? recentAddTime.valueOf() : 0;
+  const recentAddType = String(raw?.recentAddType || (recentAddTimeRaw ? '' : 'create') || '');
+  const recentAddOperatorUserId = String(raw?.recentAddOperatorUserId || raw?.recentAddOperator || raw?.creator || '');
+
   // 优先使用后端返回的 tagNames（标签名称数组）
   const rawTagNames = asArray(raw?.tagNames).filter((i) => typeof i === 'string' && i.trim());
   // 其次使用 tags（如果是字符串数组）
@@ -420,6 +453,10 @@ function formatPatient(raw) {
     mobile,
     createTime: createTimeStr,
     createTimeTs,
+    recentAddTime: recentAddTimeStr,
+    recentAddTimeTs,
+    recentAddType,
+    recentAddOperatorUserId,
     creator: raw?.creatorName || raw?.creator || '',
     hospitalId: raw?.customerNumber || raw?.hospitalId || '',
     record,
@@ -510,8 +547,10 @@ async function reload(reset = true) {
   } else if (currentTab.value.kind === 'new') {
     const start = dayjs().subtract(7, 'day').startOf('day').valueOf();
     const end = dayjs().endOf('day').valueOf();
-    query.startCreateTime = start;
-    query.endCreateTime = end;
+    // “新患者”= 最近7天新增到当前团队：创建 + 转移/共享（时间来自服务记录）
+    query.startRecentTime = start;
+    query.endRecentTime = end;
+    query.includeRecentAddTime = true;
   }
 
   loading.value = true;
@@ -578,9 +617,13 @@ const patientList = computed(() => {
   if (currentTab.value.kind === 'new') {
     const sevenDaysAgo = dayjs().subtract(7, 'day').startOf('day').valueOf();
     const flatList = all
-      .filter((p) => Number(p?.createTimeTs || 0) >= sevenDaysAgo)
+      .filter((p) => Number(p?.recentAddTimeTs || p?.createTimeTs || 0) >= sevenDaysAgo)
       .slice()
-      .sort((a, b) => Number(b?.createTimeTs || 0) - Number(a?.createTimeTs || 0));
+      .sort(
+        (a, b) =>
+          Number(b?.recentAddTimeTs || b?.createTimeTs || 0) -
+          Number(a?.recentAddTimeTs || a?.createTimeTs || 0)
+      );
     return [{ letter: '最近7天新增', data: flatList }];
   }
 
@@ -596,6 +639,7 @@ const indexList = computed(() => {
 const totalPatients = computed(() => {
   let count = 0;
   patientList.value.forEach(g => count += g.data.length);
+  if (currentTab.value.kind === 'new') return count;
   return totalFromApi.value || count;
 });