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

i

Browse Source 
Merge branch '20260708'
This commit is contained in:
Your Name
2026-07-09 11:25:25 +08:00
parent a677b69e97 0f33f2ad28
commit 46b62229a6
15 changed files with 450 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/controller/tcm/DiagnosisController.php
+18
View File
@@ -94,6 +94,24 @@ class DiagnosisController extends BaseAdminController
return $this->fail(DiagnosisLogic::getError());
}
/**
* @notes 设置复诊接诊率统计起始偏移（业务订单 tab）
*/
public function setRevisitSlotStartOffset()
{
$params = (new DiagnosisValidate())->post()->goCheck('setRevisitSlotStartOffset');
$ok = DiagnosisLogic::setRevisitSlotStartOffset(
(int) $params['id'],
(int) $params['revisit_slot_start_offset'],
$this->adminInfo
);
if (!$ok) {
return $this->fail(DiagnosisLogic::getError());
}
return $this->success('保存成功');
}
/**
* @notes 删除诊单
* @return \think\response\Json
server/app/adminapi/lists/doctor/AppointmentLists.php
+35
View File
@@ -3,6 +3,8 @@
namespace app\adminapi\lists\doctor;
use app\adminapi\lists\BaseAdminDataLists;
use app\adminapi\logic\dept\DeptLogic;
use app\common\model\auth\AdminDept;
use app\common\model\DiagnosisViewRecord;
use app\common\model\doctor\Appointment;
use app\common\model\tcm\Prescription;
@@ -75,6 +77,35 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
});
}
/**
* 按部门筛选：接诊医生、诊单医助或挂号医助所属部门命中子树即可（选父级含子级）
*
* @param mixed $query
*/
private function applyAssistantDeptIdFilter($query): void
{
if (!isset($this->params['assistant_dept_id']) || $this->params['assistant_dept_id'] === '' || (int) $this->params['assistant_dept_id'] <= 0) {
return;
}
$rootDeptId = (int) $this->params['assistant_dept_id'];
$deptIds = DeptLogic::getSelfAndDescendantIds($rootDeptId);
$deptIds = array_values(array_filter(array_map('intval', $deptIds), static function (int $id): bool {
return $id > 0;
}));
if ($deptIds === []) {
$query->whereRaw('0 = 1');
return;
}
$inList = implode(',', $deptIds);
$adTbl = (new AdminDept())->getTable();
$query->whereRaw(
"(EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = a.`doctor_id` AND ad.`dept_id` IN ({$inList}))"
. " OR EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = u.`assistant_id` AND ad.`dept_id` IN ({$inList}))"
. " OR EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = a.`assistant_id` AND ad.`dept_id` IN ({$inList})))"
);
}
/**
* 渠道筛选：与 AppointmentLogic 一致，兼容仅有 channel_source、仅有 channels、或两者皆有的表结构
*
@@ -191,6 +222,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
$this->applyAssistantIdFilter($query);
$this->applyAssistantDeptIdFilter($query);
$this->applyChannelSourceFilter($query, $chFilter);
// 是否确认诊单：1=已确认 0=未确认
@@ -373,6 +406,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
$this->applyAssistantIdFilter($query);
$this->applyAssistantDeptIdFilter($query);
$this->applyChannelSourceFilter($query, $chFilter);
if ((int) ($this->params['exclude_cancelled'] ?? 0) === 1) {
server/app/adminapi/lists/tcm/PrescriptionOrderLists.php
+67
View File
@@ -741,6 +741,10 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
}
unset($item);
if ($this->shouldBypassListVisibilityForDiagnosisEdit()) {
$this->appendDiagnosisEditVisitSeqFields($lists);
}
$this->appendPrescriptionOrderAssignSnapshotErCenterFlags($lists);
if ((int) ($this->params['yeji_order_drawer'] ?? 0) === 1) {
@@ -1417,6 +1421,69 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
);
}
/**
* 诊单编辑-业务订单 tab：标注全局诊次及是否计入复诊接诊率（与 RevisitRateLogic 同口径）
*
* @param array<int, array<string, mixed>> $lists
*/
private function appendDiagnosisEditVisitSeqFields(array &$lists): void
{
if ($lists === []) {
return;
}
$diagIds = [];
foreach ($lists as $row) {
$d = (int) ($row['diagnosis_id'] ?? 0);
if ($d > 0) {
$diagIds[$d] = true;
}
}
$contextDid = (int) ($this->params['context_diagnosis_id'] ?? 0);
if ($contextDid > 0) {
$diagIds[$contextDid] = true;
}
$diagIdList = array_keys($diagIds);
if ($diagIdList === []) {
return;
}
$offsetRows = Diagnosis::whereIn('id', $diagIdList)
->whereNull('delete_time')
->column('revisit_slot_start_offset', 'id');
$offsetMap = [];
foreach ($offsetRows as $id => $offset) {
$offsetMap[(int) $id] = max(1, min(20, (int) $offset));
}
/** @var array<int, int> $seqByOrderId order_id => global seq within diagnosis */
$seqByOrderId = [];
foreach ($diagIdList as $did) {
$q = PrescriptionOrder::where('diagnosis_id', $did)->whereNull('delete_time');
YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, '');
$orderIds = $q
->order(['create_time' => 'asc', 'id' => 'asc'])
->column('id');
$seq = 0;
foreach ($orderIds as $oid) {
$seq++;
$seqByOrderId[(int) $oid] = $seq;
}
}
foreach ($lists as &$row) {
$oid = (int) ($row['id'] ?? 0);
$did = (int) ($row['diagnosis_id'] ?? 0);
$seq = (int) ($seqByOrderId[$oid] ?? 0);
$offset = (int) ($offsetMap[$did] ?? 1);
$effectiveSlot = $seq > 0 ? $seq + $offset : 0;
$row['global_visit_seq'] = $effectiveSlot > 0 ? $effectiveSlot : null;
$row['raw_visit_seq'] = $seq > 0 ? $seq : null;
$row['counts_for_revisit_rate'] = $effectiveSlot >= 2 ? 1 : 0;
}
unset($row);
}
/**
* 列表行标注：指派日志快照（related_po_creator_id + related_po_create_time）是否指向本业务单，
* 以及该次操作的新医助（to_assistant_id）是否归属「二中心」部门子树（与 DeptLogic / 业绩看板一致）。
server/app/adminapi/logic/stats/RevisitRateLogic.php
+51 -4
View File
@@ -15,6 +15,7 @@ use think\facade\Db;
* 同一诊单当月被多次指派给同一医助只计 1 次。
* - 第 N 次下单 = 诊单（患者）名下计入业绩的业务订单（剔除履约 4/9/10、软删）按 create_time 升序的**全局**序列中第 N 笔；
* 诊次**跨月累计不重置**：例如 5 月指派后旗下成交 4 单为二诊~五诊，6 月再成交即为六诊。
* 诊单可配置 `revisit_slot_start_offset`（默认 1：第 1 笔实单计为二诊；设为 2 则第 1 笔实单计为三诊，即在实单序号上叠加偏移，5 笔实单等价于计至七诊）。
* - 当月 N 诊单数 = **当月内下单**且全局序号为 N 的订单数，归属下单时点的**持有医助**——
* 按指派日志时间线取「订单时间之前最近一次指派」的 to_assistant_id（释放 to=0 即不再归属；
* 「继承」指派会转移持有人用于归属，但不计被指派数）。指派可发生在往月。
@@ -323,7 +324,7 @@ class RevisitRateLogic
* 核心统计上下文：
* 1. 全量指派日志（≤ 月末）构建持有时间线；
* 2. 分母：当月非继承指派的「医助 × 诊单」；
* 3. 分子：曾被指派诊单的当月订单按全局序号 ≥2 归属持有医助；
* 3. 分子：曾被指派诊单的当月订单，统计诊次 = 实单序号 + 诊单偏移（默认第 1 笔实单为二诊）；
* 4. 应用部门筛选（含组织下级）。
*
* @param array{month?:string,dept_ids?:int[]|string} $params
@@ -375,9 +376,10 @@ class RevisitRateLogic
}
}
// 分子：曾被指派诊单的当月订单（全局序号 ≥2），归属下单时点的持有医助
// 分子：曾被指派诊单的当月订单，统计诊次 = 实单全局序号 + 诊单偏移（默认偏移 1 → 第 1 笔实单为二诊）
/** @var array<int, array<int, list<array<string, mixed>>>> $slotOrdersByAssistant */
$slotOrdersByAssistant = [];
$offsetMap = self::fetchRevisitSlotStartOffsetMap(array_keys($candidateDiagSet));
foreach (array_chunk(array_keys($candidateDiagSet), 2000) as $chunk) {
$orderRows = self::fetchOrderSeqRows(
$chunk,
@@ -387,6 +389,7 @@ class RevisitRateLogic
$seq = 0;
$ptr = 0;
$holder = 0;
$offset = 1;
foreach ($orderRows as $r) {
$did = (int) ($r['diagnosis_id'] ?? 0);
if ($did <= 0) {
@@ -397,8 +400,10 @@ class RevisitRateLogic
$seq = 0;
$ptr = 0;
$holder = 0;
$offset = self::resolveRevisitSlotStartOffset($did, $offsetMap);
}
$seq++;
$effectiveSlot = $seq + $offset;
$ct = (int) ($r['create_time'] ?? 0);
// 推进时间线指针：订单时间之前（含同刻）最近一次指派的持有人
$tl = $timeline[$did] ?? [];
@@ -407,14 +412,14 @@ class RevisitRateLogic
$holder = (int) $tl[$ptr]['to'];
$ptr++;
}
if ($seq < 2 || $seq > self::MAX_VISIT_SLOT) {
if ($effectiveSlot < 2 || $effectiveSlot > self::MAX_VISIT_SLOT) {
continue;
}
if ($ct < $startTs || $ct > $endTs) {
continue;
}
if ($holder > 0) {
$slotOrdersByAssistant[$holder][$seq][] = $r;
$slotOrdersByAssistant[$holder][$effectiveSlot][] = $r;
}
}
}
@@ -619,6 +624,48 @@ class RevisitRateLogic
->toArray();
}
/**
* @param list<int> $diagIds
*
* @return array<int, int> diagnosis_id => revisit_slot_start_offset
*/
private static function fetchRevisitSlotStartOffsetMap(array $diagIds): array
{
if ($diagIds === []) {
return [];
}
$out = [];
foreach (array_chunk($diagIds, 2000) as $chunk) {
$rows = Db::name('tcm_diagnosis')
->whereIn('id', $chunk)
->whereNull('delete_time')
->column('revisit_slot_start_offset', 'id');
foreach ($rows as $id => $offset) {
$out[(int) $id] = (int) $offset;
}
}
return $out;
}
/**
* 诊单复诊统计起始偏移（默认 1：第 1 笔实单计为二诊；统计诊次 = 实单序号 + 偏移）
*
* @param array<int, int> $offsetMap
*/
private static function resolveRevisitSlotStartOffset(int $diagId, array $offsetMap): int
{
$offset = (int) ($offsetMap[$diagId] ?? 1);
if ($offset < 1) {
$offset = 1;
}
if ($offset > 20) {
$offset = 20;
}
return $offset;
}
/**
* @param list<int> $diagIds
*
server/app/adminapi/logic/tcm/DiagnosisLogic.php
+40
View File
@@ -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
+7 -11
View File
@@ -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;
}
server/app/adminapi/validate/tcm/DiagnosisValidate.php
+8
View File
@@ -44,6 +44,7 @@ class DiagnosisValidate extends BaseValidate
'end_date' => 'date|checkDateRange',
'diagnosis_id' => 'require|integer|checkDiagnosisId',
'tracking_content' => 'require|length:1,1000',
'revisit_slot_start_offset' => 'integer|between:1,20',
];
protected $message = [
@@ -139,6 +140,13 @@ class DiagnosisValidate extends BaseValidate
return $this->only(['id']);
}
/** 业务订单 tab：设置复诊接诊率统计起始偏移 */
public function sceneSetRevisitSlotStartOffset()
{
return $this->only(['id', 'revisit_slot_start_offset'])
->append('revisit_slot_start_offset', 'require|integer|between:1,20');
}
protected function checkDiagnosis($value)
{
$diagnosis = Diagnosis::findOrEmpty($value);
server/sql/1.9.20260709/add_diagnosis_revisit_slot_start_offset.sql
+7
View File
@@ -0,0 +1,7 @@
-- 诊单：复诊接诊率统计起始偏移（1=从二诊起计，2=从三诊起计…）
-- 执行前确认表前缀为 zyt_。
ALTER TABLE `zyt_tcm_diagnosis`
ADD COLUMN `revisit_slot_start_offset` tinyint(3) unsigned NOT NULL DEFAULT 1
COMMENT '复诊接诊率统计起始偏移：统计诊次=实单序号+偏移（1=第1笔实单计二诊，2=计三诊，5笔实单等价七诊）'
AFTER `show_card`;
server/sql/1.9.20260709/add_diagnosis_set_revisit_slot_offset_menu.sql
+14
View File
@@ -0,0 +1,14 @@
-- 诊单业务订单 tab：设置复诊统计起始偏移
SET @diag_menu_id := (SELECT id FROM zyt_system_menu WHERE perms = 'tcm.diagnosis/lists' LIMIT 1);
INSERT INTO zyt_system_menu (
pid, type, name, icon, sort, perms, paths, component,
selected, params, is_cache, is_show, is_disable, create_time, update_time
)
SELECT
@diag_menu_id, 'A', '设置复诊统计起始偏移', '', 71,
'tcm.diagnosis/setRevisitSlotStartOffset', '', '',
'', '', 0, 1, 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
FROM DUAL
WHERE @diag_menu_id IS NOT NULL
AND NOT EXISTS (SELECT 1 FROM zyt_system_menu WHERE perms = 'tcm.diagnosis/setRevisitSlotStartOffset');