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

Merge branch 'master' into tongji-99

Browse Source
This commit is contained in:
Your Name
2026-05-07 15:43:49 +08:00
parent 49e7169630 d53f492d2a
commit a52380aa63
16 changed files with 11147 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/logic/tcm/DiagnosisTodoLogic.php
+2 -1
View File
@@ -31,7 +31,8 @@ use app\common\model\tcm\DiagnosisTodo;
* cancel() → status=2 (已取消，仅 status=0 可取消)
*
* 鉴权：
* add：诊单需存在；数据权限交由路由层「tcm.diagnosisTodo/add」节点 + 前端 tab disabled 控制。
* add：诊单需存在；数据权限交由路由层统一「tcm.diagnosis/dailyRecord」权限域控制，
* 并兼容历史 diagnosisTodo/* 接口路由。
* cancel：仅创建人本人或超级管理员 (role_id=1) 可取消，且仅 status=0 时。
*
* @package app\adminapi\logic\tcm
server/app/adminapi/logic/tcm/PrescriptionLogic.php
+16
View File
@@ -152,6 +152,19 @@ class PrescriptionLogic
return $ts ? date('Y-m-d', $ts) : date('Y-m-d');
}
private static function normalizeDosageBagCount($raw): int
{
$count = (int) $raw;
if ($count < 1) {
return 1;
}
if ($count > 5) {
return 5;
}
return $count;
}
/**
* 同一诊单、同一开方人、同一处方日期：仅允许一张「未作废」的未删除记录；已作废的可再新开一张。
*
@@ -230,6 +243,7 @@ class PrescriptionLogic
'prescription_type' => $params['prescription_type'] ?? '浓缩水丸',
'dosage_amount' => isset($params['dosage_amount']) ? (float)$params['dosage_amount'] : null,
'dosage_unit' => $params['dosage_unit'] ?? '',
'dosage_bag_count' => self::normalizeDosageBagCount($params['dosage_bag_count'] ?? 1),
'need_decoction' => (int)($params['need_decoction'] ?? 0),
'bags_per_dose' => isset($params['bags_per_dose']) ? (int)$params['bags_per_dose'] : 1,
'diagnosis_id' => (int)($params['diagnosis_id'] ?? 0),
@@ -359,6 +373,7 @@ class PrescriptionLogic
'prescription_type' => $params['prescription_type'] ?? $prescription->prescription_type,
'dosage_amount' => isset($params['dosage_amount']) ? (float)$params['dosage_amount'] : $prescription->dosage_amount,
'dosage_unit' => $params['dosage_unit'] ?? $prescription->dosage_unit,
'dosage_bag_count' => self::normalizeDosageBagCount($params['dosage_bag_count'] ?? ($prescription->dosage_bag_count ?? 1)),
'need_decoction' => isset($params['need_decoction']) ? (int)$params['need_decoction'] : (int)($prescription->need_decoction ?? 0),
'bags_per_dose' => isset($params['bags_per_dose']) ? (int)$params['bags_per_dose'] : (int)($prescription->bags_per_dose ?? 1),
'patient_name' => $params['patient_name'] ?? $prescription->patient_name,
@@ -811,6 +826,7 @@ class PrescriptionLogic
'prescription_type' => '浓缩水丸',
'dosage_amount' => 1.0,
'dosage_unit' => 'g',
'dosage_bag_count' => 1,
'need_decoction' => 0,
'bags_per_dose' => 1,
'diagnosis_id' => $diagnosisId,