ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-diagnosis-20250505'

Browse Source
This commit is contained in:
long
2026-05-05 18:07:04 +08:00
parent cd51f55701 30b5a13f3a
commit 671c7f16bd
35 changed files with 3612 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/logic/doctor/AppointmentLogic.php
+14 -10
View File
@@ -13,6 +13,7 @@ use app\api\logic\ChatNotifyLogic;
use app\adminapi\logic\tcm\PrescriptionLogic;
use app\adminapi\logic\tcm\DiagnosisLogic;
use app\adminapi\logic\tcm\BloodRecordLogic;
use app\adminapi\logic\tcm\TrackingNoteLogic;
use app\adminapi\logic\doctor\DoctorNoteLogic;
use app\common\model\tcm\Prescription;
use app\common\service\wechat\WechatWorkAppMessageService;
@@ -516,10 +517,8 @@ class AppointmentLogic extends BaseLogic
? DiagnosisLogic::detail(['id' => $diagnosisId])
: [];
// 3) 血糖血压记录
$bloodRecords = $diagnosisId > 0
? BloodRecordLogic::getRecordsByPatient(['diagnosis_id' => $diagnosisId])
: [];
// 3) 跟踪信息（血糖血压 / 饮食 / 运动）改为前端按窗口 lazy load，
// 详见 DiagnosisController::trackingWindow。此处不再一次性返回。
// 4) 补全医助姓名（detail() 未关联 admin 助理表）
$assistantName = '';
@@ -551,23 +550,28 @@ class AppointmentLogic extends BaseLogic
? DoctorNoteLogic::getByDiagnosis($diagnosisId)
: [];
// 7.1) 跟踪备注
$trackingNotes = $diagnosisId > 0
? TrackingNoteLogic::getByDiagnosis($diagnosisId)
: [];
return [
'appointment' => $appointment,
'diagnosis' => $diagnosis,
'blood_records' => $bloodRecords,
'doctor_notes' => $doctorNotes,
'appointment' => $appointment,
'diagnosis' => $diagnosis,
'doctor_notes' => $doctorNotes,
'tracking_notes' => $trackingNotes,
];
}
/**
* 字典翻译：把诊单中以 code 存储的字段（字典/枚举）补一份中文 label 字段，
* 便于前端（接诊台等只读场景）直接渲染，无需加载字典。
* 便于前端（接诊台 / 只读病例页等只读场景）直接渲染，无需加载字典。
* 原始 code 字段保留不动，edit 场景仍可使用。
*
* @param array $diagnosis
* @return array
*/
private static function enrichDiagnosisLabels(array $diagnosis): array
public static function enrichDiagnosisLabels(array $diagnosis): array
{
if (empty($diagnosis)) {
return $diagnosis;
server/app/adminapi/logic/tcm/DiagnosisLogic.php
+275
View File
@@ -19,9 +19,18 @@ use app\common\model\tcm\Diagnosis;
use app\common\model\tcm\DiagnosisGuahaoLog;
use app\common\model\tcm\DiagnosisAssignLog;
use app\common\model\tcm\ImChatMessage;
use app\common\model\tcm\BloodRecord;
use app\common\model\tcm\DietRecord;
use app\common\model\tcm\ExerciseRecord;
use app\common\model\DiagnosisViewRecord;
use app\common\model\doctor\Appointment;
use app\common\model\auth\Admin;
use app\common\model\auth\AdminRole;
use app\adminapi\logic\doctor\DoctorNoteLogic;
use app\adminapi\logic\doctor\AppointmentLogic;
use app\adminapi\logic\tcm\TrackingNoteLogic;
use app\common\service\FileService;
use app\common\service\DataScope\DataScopeService;
use think\facade\Db;
/**
* 中医辨房病因诊单逻辑
@@ -3324,4 +3333,270 @@ class DiagnosisLogic extends BaseLogic
return $logs;
}
/**
* @notes 二诊只读病例详情
*
* 用途：医助从诊单列表「查看 / 双击」进入只读页（T1+T2），返回与接诊台同结构的
* 三块内容（appointment + diagnosis + 跟踪记录）。
*
* 数据权限（与列表 lists 接口一致）：
* - 医助 (role_id=2)：仅能访问 assistant_id == self 的诊单
* - DataScope 启用：assistant_id 须落在 visibleAdminIds
* - 越权 → setError + 返回 []
*
* @param array $params 至少含 id
* @param int $adminId
* @param array<string,mixed> $adminInfo request->adminInfo
* @return array
*/
public static function readonlyDetail(array $params, int $adminId, array $adminInfo): array
{
$diagnosisId = (int) ($params['id'] ?? 0);
if ($diagnosisId <= 0) {
self::setError('诊单 id 不能为空');
return [];
}
// 1) 数据权限闸 — 不通过则返回「不存在或无权访问」
$accessQuery = Diagnosis::where('id', $diagnosisId)->whereNull('delete_time');
$roleIds = array_map('intval', AdminRole::where('admin_id', $adminId)->column('role_id'));
if (in_array(2, $roleIds, true)) {
// 医助仅看自己被指派的
$accessQuery->where('assistant_id', $adminId);
}
if (DataScopeService::isEnabled()) {
$visibleIds = DataScopeService::getVisibleAdminIds($adminId, $adminInfo);
if ($visibleIds === []) {
self::setError('诊单不存在或无权访问');
return [];
}
if (is_array($visibleIds)) {
$accessQuery->whereIn('assistant_id', $visibleIds);
}
}
if (!$accessQuery->find()) {
self::setError('诊单不存在或无权访问');
return [];
}
// 2) 诊单详情（含图片聚合等）+ 字典翻译
$diagnosis = self::detail(['id' => $diagnosisId]);
if (empty($diagnosis)) {
self::setError('诊单数据为空');
return [];
}
$diagnosis = AppointmentLogic::enrichDiagnosisLabels($diagnosis);
// 3) 最近一条挂号（PatientInfoCard 显示用，无挂号则给默认空对象）
$appointment = self::buildLatestAppointmentForReadonly((int) ($diagnosis['id'] ?? $diagnosisId), $diagnosis);
// 4) 跟踪信息（血糖血压 / 饮食 / 运动）改为前端按窗口 lazy load，
// 详见 DiagnosisController::trackingWindow。此处不再一次性返回。
// 5) 医生备注
$doctorNotes = DoctorNoteLogic::getByDiagnosis($diagnosisId);
// 5.1) 跟踪备注（只读展示，按 note_date DESC）
$trackingNotes = TrackingNoteLogic::getByDiagnosis($diagnosisId);
// 6) 未服务天数（与 T3 列同口径）
$maxBloodTs = BloodRecord::where('diagnosis_id', $diagnosisId)
->max('record_date');
$maxBloodTs = (int) $maxBloodTs;
$unservedDays = $maxBloodTs > 0 ? max(0, (int) floor((time() - $maxBloodTs) / 86400)) : null;
$lastBloodRecordAt = $maxBloodTs > 0 ? date('Y-m-d', $maxBloodTs) : null;
return [
'appointment' => $appointment,
'diagnosis' => $diagnosis,
'doctor_notes' => $doctorNotes,
'tracking_notes' => $trackingNotes,
'unserved_days' => $unservedDays,
'last_blood_record_at' => $lastBloodRecordAt,
];
}
/**
* 取指定日期区间内的三类跟踪记录（血糖血压 / 饮食 / 运动），供 readonlyDetail 与
* 医生接诊台 reception 通过独立接口 lazy load。
*
* 区间语义：闭区间 [startDate, endDate]（Y-m-d），均不传则不限。
*
* @return array{
* blood_records: array<int,array<string,mixed>>,
* diet_records: array<int,array<string,mixed>>,
* exercise_records: array<int,array<string,mixed>>,
* start_date: string,
* end_date: string,
* }
*/
public static function fetchTrackingWindow(int $diagnosisId, string $startDate = '', string $endDate = ''): array
{
$sinceTs = $startDate !== '' ? (int) strtotime($startDate . ' 00:00:00') : 0;
$untilTs = $endDate !== '' ? (int) strtotime($endDate . ' 23:59:59') : 0;
$sinceTs = $sinceTs > 0 ? $sinceTs : 0;
$untilTs = $untilTs > 0 ? $untilTs : 0;
return [
'blood_records' => self::fetchBloodRecordsForReadonly($diagnosisId, $sinceTs, $untilTs),
'diet_records' => self::fetchDietRecordsForReadonly($diagnosisId, $sinceTs, $untilTs),
'exercise_records' => self::fetchExerciseRecordsForReadonly($diagnosisId, $sinceTs, $untilTs),
'start_date' => $startDate,
'end_date' => $endDate,
];
}
/**
* 拼一份「最近一条挂号」给只读页 PatientInfoCard 用；没有挂号则给默认空骨架。
*
* @param int $diagnosisId
* @param array<string,mixed> $diagnosis 已字典翻译过的诊单数据
* @return array<string,mixed>
*/
private static function buildLatestAppointmentForReadonly(int $diagnosisId, array $diagnosis): array
{
$apt = Appointment::where('patient_id', $diagnosisId)
->order('id', 'desc')
->find();
$patientName = (string) ($diagnosis['patient_name'] ?? '');
$patientPhone = (string) ($diagnosis['phone'] ?? '');
if (!$apt) {
return [
'id' => 0,
'patient_id' => $diagnosisId,
'patient_name' => $patientName,
'patient_phone' => $patientPhone,
'doctor_id' => 0,
'doctor_name' => '',
'assistant_id' => (int) ($diagnosis['assistant_id'] ?? 0),
'assistant_name' => self::resolveAssistantName((int) ($diagnosis['assistant_id'] ?? 0)),
'appointment_date' => '',
'appointment_time' => '',
'period' => '',
'status' => 0,
'status_desc' => '无挂号',
'has_prescription' => 0,
'remark' => '',
];
}
$aptArr = $apt->toArray();
$aptArr['patient_name'] = $patientName;
$aptArr['patient_phone'] = $patientPhone;
// 医生姓名
$aptArr['doctor_name'] = '';
$docId = (int) ($aptArr['doctor_id'] ?? 0);
if ($docId > 0) {
$aptArr['doctor_name'] = (string) Admin::where('id', $docId)->value('name');
}
$aptArr['assistant_id'] = (int) ($diagnosis['assistant_id'] ?? 0);
$aptArr['assistant_name'] = self::resolveAssistantName((int) ($diagnosis['assistant_id'] ?? 0));
// status_desc 与现有列表口径保持简单映射
$statusMap = [
0 => '未挂号',
1 => '已预约',
2 => '已取消',
3 => '已完成',
4 => '已过号',
];
$aptArr['status_desc'] = $statusMap[(int) ($aptArr['status'] ?? 0)] ?? '';
$aptArr['has_prescription'] = (int) ($diagnosis['has_prescription'] ?? 0);
return $aptArr;
}
private static function resolveAssistantName(int $assistantId): string
{
if ($assistantId <= 0) {
return '';
}
return (string) Admin::where('id', $assistantId)->value('name');
}
/**
* @return array<int,array<string,mixed>>
*/
private static function fetchBloodRecordsForReadonly(int $diagnosisId, int $sinceTs, int $untilTs = 0): array
{
$query = BloodRecord::where('diagnosis_id', $diagnosisId);
if ($sinceTs > 0) {
$query->where('record_date', '>=', $sinceTs);
}
if ($untilTs > 0) {
$query->where('record_date', '<=', $untilTs);
}
$rows = $query->order('record_date', 'desc')
->order('record_time', 'desc')
->select()
->toArray();
// 给前端一个 Y-m-d 字符串方便按日期透视；保留原 record_date 整数戳作日期窗口比较
foreach ($rows as &$row) {
$ts = (int) ($row['record_date'] ?? 0);
$row['record_date_ts'] = $ts;
$row['record_date'] = $ts > 0 ? date('Y-m-d', $ts) : '';
}
return $rows;
}
/**
* @return array<int,array<string,mixed>>
*/
private static function fetchDietRecordsForReadonly(int $diagnosisId, int $sinceTs, int $untilTs = 0): array
{
$query = DietRecord::where('diagnosis_id', $diagnosisId);
if ($sinceTs > 0) {
$query->where('record_date', '>=', $sinceTs);
}
if ($untilTs > 0) {
$query->where('record_date', '<=', $untilTs);
}
$rows = $query->order('record_date', 'desc')->select()->toArray();
foreach ($rows as &$row) {
$ts = (int) ($row['record_date'] ?? 0);
$row['record_date_ts'] = $ts;
$row['record_date'] = $ts > 0 ? date('Y-m-d', $ts) : '';
}
return $rows;
}
/**
* @return array<int,array<string,mixed>>
*/
private static function fetchExerciseRecordsForReadonly(int $diagnosisId, int $sinceTs, int $untilTs = 0): array
{
$query = ExerciseRecord::where('diagnosis_id', $diagnosisId);
if ($sinceTs > 0) {
$query->where('record_date', '>=', $sinceTs);
}
if ($untilTs > 0) {
$query->where('record_date', '<=', $untilTs);
}
$rows = $query->order('record_date', 'desc')
->append(['intensity_text'])
->select()
->toArray();
foreach ($rows as &$row) {
$ts = (int) ($row['record_date'] ?? 0);
$row['record_date_ts'] = $ts;
$row['record_date'] = $ts > 0 ? date('Y-m-d', $ts) : '';
}
return $rows;
}
}
server/app/adminapi/logic/tcm/DiagnosisTodoLogic.php
+187
View File
@@ -0,0 +1,187 @@
<?php
// +----------------------------------------------------------------------
// | likeadmin快速开发前后端分离管理后台（PHP版）
// +----------------------------------------------------------------------
// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
// | 开源版本可自由商用，可去除界面版权logo
// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
// | github下载：https://github.com/likeshop-github/likeadmin
// | 访问官网：https://www.likeadmin.cn
// | likeadmin团队 版权所有 拥有最终解释权
// +----------------------------------------------------------------------
// | author: likeadminTeam
// +----------------------------------------------------------------------
declare(strict_types=1);
namespace app\adminapi\logic\tcm;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin;
use app\common\model\auth\AdminRole;
use app\common\model\tcm\Diagnosis;
use app\common\model\tcm\DiagnosisTodo;
/**
* 诊单待办事项逻辑
*
* 状态机：
* add() → status=0 (待执行)
* cron → status=1 (已发送) / status=3 (失败)
* cancel() → status=2 (已取消，仅 status=0 可取消)
*
* 鉴权：
* add：诊单需存在；数据权限交由路由层「tcm.diagnosisTodo/add」节点 + 前端 tab disabled 控制。
* cancel：仅创建人本人或超级管理员 (role_id=1) 可取消，且仅 status=0 时。
*
* @package app\adminapi\logic\tcm
*/
class DiagnosisTodoLogic extends BaseLogic
{
/**
* @notes 新增待办
*
* @param array<string,mixed> $params 已通过 sceneAdd 验证
* @param int $adminId 当前 admin id
* @param array<string,mixed> $adminInfo request->adminInfo
*/
public static function add(array $params, int $adminId, array $adminInfo): bool
{
try {
$diagnosisId = (int) ($params['diagnosis_id'] ?? 0);
$diagnosis = Diagnosis::findOrEmpty($diagnosisId);
if ($diagnosis->isEmpty()) {
self::setError('诊单不存在');
return false;
}
$remindTime = (int) ($params['remind_time'] ?? 0);
if ($remindTime <= time()) {
self::setError('提醒时间必须晚于当前时间');
return false;
}
$creatorName = trim((string) ($adminInfo['name'] ?? ''));
if ($creatorName === '' && $adminId > 0) {
$creatorName = (string) Admin::where('id', $adminId)->value('name');
}
DiagnosisTodo::create([
'diagnosis_id' => $diagnosisId,
'patient_id' => (int) ($diagnosis->getAttr('patient_id') ?? 0),
'content' => trim((string) ($params['content'] ?? '')),
'remind_time' => $remindTime,
'status' => DiagnosisTodo::STATUS_PENDING,
'creator_id' => $adminId,
'creator_name' => $creatorName,
]);
return true;
} catch (\Throwable $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 取消待办（人工）
*/
public static function cancel(int $id, int $adminId): bool
{
try {
$todo = DiagnosisTodo::findOrEmpty($id);
if ($todo->isEmpty()) {
self::setError('待办不存在');
return false;
}
$status = (int) $todo->getAttr('status');
if ($status !== DiagnosisTodo::STATUS_PENDING) {
self::setError('该待办已不是「待执行」状态，无法取消');
return false;
}
$creatorId = (int) $todo->getAttr('creator_id');
$isSuper = self::isSuperAdmin($adminId);
if ($creatorId !== $adminId && !$isSuper) {
self::setError('仅创建人或超级管理员可取消');
return false;
}
$todo->save([
'status' => DiagnosisTodo::STATUS_CANCELLED,
'cancelled_at' => time(),
'cancelled_by' => $adminId,
]);
return true;
} catch (\Throwable $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* @notes 详情
*
* @return array<string,mixed>
*/
public static function detail(int $id, int $adminId = 0): array
{
$todo = DiagnosisTodo::findOrEmpty($id);
if ($todo->isEmpty()) {
return [];
}
$arr = $todo->append([
'status_text',
'remind_time_text',
'notified_at_text',
'cancelled_at_text',
])->toArray();
// 业务态：是否能被「我」取消（前端按钮显隐用）
$arr['can_cancel'] = self::canCancel($todo->toArray(), $adminId);
return $arr;
}
/**
* 是否超管：role_id=1
*/
public static function isSuperAdmin(int $adminId): bool
{
if ($adminId <= 0) {
return false;
}
$roleIds = AdminRole::where('admin_id', $adminId)->column('role_id');
return in_array(1, array_map('intval', $roleIds), true);
}
/**
* 业务判定：当前 admin 能否取消该待办
*
* @param array<string,mixed> $todoRow
*/
public static function canCancel(array $todoRow, int $adminId): bool
{
if ((int) ($todoRow['status'] ?? -1) !== DiagnosisTodo::STATUS_PENDING) {
return false;
}
if ($adminId <= 0) {
return false;
}
if ((int) ($todoRow['creator_id'] ?? 0) === $adminId) {
return true;
}
return self::isSuperAdmin($adminId);
}
}
server/app/adminapi/logic/tcm/TrackingNoteLogic.php
+95
View File
@@ -0,0 +1,95 @@
<?php
namespace app\adminapi\logic\tcm;
use app\common\logic\BaseLogic;
use app\common\model\tcm\TrackingNote;
/**
* 诊单跟踪备注 Logic
*
* - 按 diagnosis_id + 当天 find-or-create
* - 多次追加 content（换行分隔，带 [HH:MM] 前缀）
* - 不涉及附件（与医生备注 DoctorNoteLogic 不同）
*/
class TrackingNoteLogic extends BaseLogic
{
/**
* 追加跟踪备注（按天合并）
*
* @param array $params diagnosis_id (int)、admin_id (int)、content (string)
* @return bool
*/
public static function addOrAppend(array $params): bool
{
try {
$diagnosisId = (int) ($params['diagnosis_id'] ?? 0);
$adminId = (int) ($params['admin_id'] ?? 0);
$newContent = trim((string) ($params['content'] ?? ''));
if ($diagnosisId <= 0) {
self::setError('诊单ID缺失');
return false;
}
if ($newContent === '') {
self::setError('备注内容不能为空');
return false;
}
$today = date('Y-m-d');
$time = date('H:i');
$line = "[{$time}] {$newContent}";
$existing = TrackingNote::where('diagnosis_id', $diagnosisId)
->where('note_date', $today)
->whereNull('delete_time')
->find();
if ($existing) {
$prev = trim((string) ($existing->content ?? ''));
$existing->content = $prev !== '' ? ($prev . "\n" . $line) : $line;
$existing->save();
} else {
TrackingNote::create([
'diagnosis_id' => $diagnosisId,
'admin_id' => $adminId,
'note_date' => $today,
'content' => $line,
]);
}
return true;
} catch (\Exception $e) {
self::setError($e->getMessage());
return false;
}
}
/**
* 按 diagnosis_id 获取跟踪备注列表（note_date DESC）
*
* @param int $diagnosisId
* @param int $limit 最近 N 天
* @return array
*/
public static function getByDiagnosis(int $diagnosisId, int $limit = 60): array
{
try {
if ($diagnosisId <= 0) {
return [];
}
$records = TrackingNote::where('diagnosis_id', $diagnosisId)
->whereNull('delete_time')
->order('note_date', 'desc')
->limit($limit)
->select()
->toArray();
return $records;
} catch (\Exception $e) {
self::setError($e->getMessage());
return [];
}
}
}