修复bug
This commit is contained in:
@@ -536,18 +536,22 @@ class DiagnosisLogic extends BaseLogic
|
||||
*/
|
||||
public static function assignLogList(int $diagnosisId): array
|
||||
{
|
||||
$rows = DiagnosisAssignLog::where('diagnosis_id', $diagnosisId)
|
||||
// Db 直查:避免 AssignLog 模型未维护 schema / fields_strict 时 toArray 丢列,导致前后端「医助」为空
|
||||
$rows = Db::name('tcm_diagnosis_assign_log')
|
||||
->where('diagnosis_id', $diagnosisId)
|
||||
->order('id', 'desc')
|
||||
->select()
|
||||
->toArray();
|
||||
|
||||
$adminIds = [];
|
||||
foreach ($rows as $r) {
|
||||
if (!empty($r['from_assistant_id'])) {
|
||||
$adminIds[] = (int) $r['from_assistant_id'];
|
||||
$fid = (int) ($r['from_assistant_id'] ?? 0);
|
||||
$tid = (int) ($r['to_assistant_id'] ?? 0);
|
||||
if ($fid > 0) {
|
||||
$adminIds[] = $fid;
|
||||
}
|
||||
if (!empty($r['to_assistant_id'])) {
|
||||
$adminIds[] = (int) $r['to_assistant_id'];
|
||||
if ($tid > 0) {
|
||||
$adminIds[] = $tid;
|
||||
}
|
||||
$rcp = (int) ($r['related_po_creator_id'] ?? 0);
|
||||
if ($rcp > 0) {
|
||||
@@ -557,7 +561,7 @@ class DiagnosisLogic extends BaseLogic
|
||||
$adminIds = array_values(array_unique(array_filter($adminIds)));
|
||||
$nameMap = [];
|
||||
if ($adminIds !== []) {
|
||||
$nameMap = \app\common\model\auth\Admin::whereIn('id', $adminIds)->column('name', 'id');
|
||||
$nameMap = Admin::whereIn('id', $adminIds)->column('name', 'id');
|
||||
}
|
||||
|
||||
foreach ($rows as &$r) {
|
||||
@@ -583,7 +587,7 @@ class DiagnosisLogic extends BaseLogic
|
||||
}
|
||||
unset($r);
|
||||
|
||||
return $rows;
|
||||
return array_values($rows);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user