diff --git a/admin/src/views/tcm/diagnosis/index.vue b/admin/src/views/tcm/diagnosis/index.vue index 49404e06..a95d3b36 100644 --- a/admin/src/views/tcm/diagnosis/index.vue +++ b/admin/src/views/tcm/diagnosis/index.vue @@ -151,12 +151,14 @@ stripe > - + @@ -1352,7 +1354,7 @@ const handleSingleAssign = (row: any) => { currentRow.value = row batchAssignIds.value = [] // 确保类型一致，转换为数字 - assignForm.value.assistant_id = row.assistant_id ? Number(row.assistant_id) : null + assignForm.value.assistant_id = Number(row.assistant_id) > 0 ? Number(row.assistant_id) : null assignDialogVisible.value = true } diff --git a/admin/src/views/tcm/diagnosis/index_h5.vue b/admin/src/views/tcm/diagnosis/index_h5.vue index bdd74536..0324f428 100644 --- a/admin/src/views/tcm/diagnosis/index_h5.vue +++ b/admin/src/views/tcm/diagnosis/index_h5.vue @@ -130,6 +130,7 @@
#{{ row.id }} · {{ row.diagnosis_date_text || formatDateTime(row.create_time) }} + NEW
@@ -1672,6 +1673,18 @@ $dh5-card-bg: #ffffff; flex-wrap: wrap; } +.dh5-tag-new { + display: inline-block; + background: #ef4444; + color: #fff; + font-size: 10px; + font-weight: 700; + padding: 1px 4px; + border-radius: 3px; + margin-left: 4px; + vertical-align: middle; +} + .dh5-meta-gender, .dh5-meta-age { font-size: 12px; diff --git a/admin/src/views/tcm/follow/index.vue b/admin/src/views/tcm/follow/index.vue index 6cc84658..9a9ae541 100644 --- a/admin/src/views/tcm/follow/index.vue +++ b/admin/src/views/tcm/follow/index.vue @@ -97,12 +97,14 @@ stripe > - + @@ -1088,7 +1090,7 @@ const handleSingleAssign = (row: any) => { assignMode.value = 'single' currentRow.value = row // 确保类型一致，转换为数字 - assignForm.value.assistant_id = row.assistant_id ? Number(row.assistant_id) : null + assignForm.value.assistant_id = Number(row.assistant_id) > 0 ? Number(row.assistant_id) : null assignDialogVisible.value = true } diff --git a/server/app/adminapi/controller/tcm/DiagnosisController.php b/server/app/adminapi/controller/tcm/DiagnosisController.php index 8ef71593..d1eb592f 100644 --- a/server/app/adminapi/controller/tcm/DiagnosisController.php +++ b/server/app/adminapi/controller/tcm/DiagnosisController.php @@ -117,6 +117,7 @@ class DiagnosisController extends BaseAdminController $params = (new DiagnosisValidate())->goCheck('id'); $result = DiagnosisLogic::detail($params); + DiagnosisLogic::markAssignRead((int) ($params['id'] ?? 0), $this->adminId); return $this->data($result); } @@ -135,7 +136,7 @@ class DiagnosisController extends BaseAdminController if (empty($result)) { return $this->fail(DiagnosisLogic::getError() ?: '诊单不存在或无权访问'); } - + DiagnosisLogic::markAssignRead((int) ($params['id'] ?? 0), $this->adminId); return $this->data($result); } diff --git a/server/app/adminapi/lists/tcm/DiagnosisLists.php b/server/app/adminapi/lists/tcm/DiagnosisLists.php index f067c4e5..79c8a78a 100644 --- a/server/app/adminapi/lists/tcm/DiagnosisLists.php +++ b/server/app/adminapi/lists/tcm/DiagnosisLists.php @@ -177,14 +177,14 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface $isCompletedTab = !$pendingWideSearch && isset($this->params['completed_appointment']) && (string) $this->params['completed_appointment'] === '1'; if ($isCompletedTab) { $maxCompletedAptExpr = '(SELECT MAX(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status = 3' . $minAptDateCond . ')'; - $orderRaw = 'IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC"; + $orderRaw = $diagTbl . '.assign_read_at IS NULL DESC, IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC"; } else { - $orderRaw = 'CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC"; + $orderRaw = $diagTbl . '.assign_read_at IS NULL DESC, CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC"; } $lists = $query ->with(['DiagnosisViewRecord']) - ->field(['id', 'patient_id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'assistant_id', 'status', 'create_time', 'update_time']) + ->field(['id', 'patient_id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'assistant_id', 'assign_read_at', 'status', 'create_time', 'update_time']) ->append(['gender_desc', 'status_desc', 'diagnosis_date_text']) ->orderRaw($orderRaw) ->limit($this->limitOffset, $this->limitLength) diff --git a/server/app/adminapi/logic/tcm/DiagnosisLogic.php b/server/app/adminapi/logic/tcm/DiagnosisLogic.php index fccdd594..5ddc0591 100644 --- a/server/app/adminapi/logic/tcm/DiagnosisLogic.php +++ b/server/app/adminapi/logic/tcm/DiagnosisLogic.php @@ -535,6 +535,19 @@ class DiagnosisLogic extends BaseLogic return 0; } + public static function markAssignRead(int $diagnosisId, int $adminId): void + { + if ($diagnosisId <= 0 || $adminId <= 0) { + return; + } + Db::name('tcm_diagnosis') + ->where('id', $diagnosisId) + ->where('assistant_id', $adminId) + ->whereNull('assign_read_at') + ->whereNull('delete_time') + ->update(['assign_read_at' => time()]); + } + /** * @notes 指派医助（每次成功更新写入一条操作记录，批量指派为多次接口调用各记一条）。 * **原医助**：优先诊单 `assistant_id`；若为 0 且本次为指派到某人，则从**最近一条**指派日志推断（覆盖发货释放后库为 0、业务上仍有「前任」医助的情况）。 @@ -588,7 +601,10 @@ class DiagnosisLogic extends BaseLogic Db::name('tcm_diagnosis') ->where('id', $id) ->whereNull('delete_time') - ->update(['assistant_id' => $toAssistantId]); + ->update([ + 'assistant_id' => $toAssistantId, + 'assign_read_at' => $toAssistantId > 0 ? null : 0, + ]); $req = request(); $admin = $req->adminInfo ?? []; diff --git a/server/database/migrations/2026_05_11_diagnosis_assign_read.sql b/server/database/migrations/2026_05_11_diagnosis_assign_read.sql new file mode 100644 index 00000000..8865ad21 --- /dev/null +++ b/server/database/migrations/2026_05_11_diagnosis_assign_read.sql @@ -0,0 +1,7 @@ +-- 二诊医助：新指派患者已读标记 +ALTER TABLE `zyt_tcm_diagnosis` + ADD COLUMN `assign_read_at` int(10) unsigned DEFAULT NULL + COMMENT '医助查看指派时间戳，NULL=未读（新指派红旗）' AFTER `assistant_id`; + +-- 已有数据标记为已读，避免全部显示红旗 +UPDATE `zyt_tcm_diagnosis` SET `assign_read_at` = UNIX_TIMESTAMP() WHERE `assistant_id` > 0;