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

更新

Browse Source
This commit is contained in:
Your Name
2026-04-16 11:13:26 +08:00
parent 3d9c5dd8f5
commit 8022229e71
16 changed files with 1703 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/logic/tcm/PrescriptionLogic.php
+2
View File
@@ -230,6 +230,7 @@ class PrescriptionLogic
'dosage_amount' => isset($params['dosage_amount']) ? (float)$params['dosage_amount'] : null,
'dosage_unit' => $params['dosage_unit'] ?? '',
'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),
'appointment_id' => (int)($params['appointment_id'] ?? 0),
'patient_id' => (int)($params['patient_id'] ?? 0),
@@ -358,6 +359,7 @@ class PrescriptionLogic
'dosage_amount' => isset($params['dosage_amount']) ? (float)$params['dosage_amount'] : $prescription->dosage_amount,
'dosage_unit' => $params['dosage_unit'] ?? $prescription->dosage_unit,
'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,
'gender' => (int)($params['gender'] ?? $prescription->gender),
'age' => (int)($params['age'] ?? $prescription->age),
server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
+12
View File
@@ -477,6 +477,18 @@ class PrescriptionOrderLogic
$order->creator_id = $adminId;
$order->recipient_name = (string) $params['recipient_name'];
$order->recipient_phone = (string) $params['recipient_phone'];
// 处理省市区字段
if (isset($params['shipping_province'])) {
$order->shipping_province = (string) $params['shipping_province'];
}
if (isset($params['shipping_city'])) {
$order->shipping_city = (string) $params['shipping_city'];
}
if (isset($params['shipping_district'])) {
$order->shipping_district = (string) $params['shipping_district'];
}
$order->shipping_address = (string) $params['shipping_address'];
$order->is_follow_up = (int) ($params['is_follow_up'] ?? 0) === 1 ? 1 : 0;
$order->medication_days = $medDays > 0 ? $medDays : null;
server/app/adminapi/validate/tcm/PrescriptionValidate.php
+6 -4
View File
@@ -28,10 +28,11 @@ class PrescriptionValidate extends BaseValidate
public function sceneAdd()
{
return $this->only([
'prescription_type', 'patient_name', 'gender', 'age',
'prescription_type', 'dosage_amount', 'dosage_unit', 'need_decoction', 'bags_per_dose',
'patient_name', 'gender', 'age',
'visit_no', 'prescription_date', 'tongue', 'tongue_image', 'pulse',
'pulse_condition', 'clinical_diagnosis', 'herbs', 'dose_count', 'dose_unit',
'usage_days', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
'usage_days', 'times_per_day', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
'usage_notes', 'doctor_name', 'is_shared', 'visible_role_ids',
'diagnosis_id', 'appointment_id', 'audit_status',
]);
@@ -40,10 +41,11 @@ class PrescriptionValidate extends BaseValidate
public function sceneEdit()
{
return $this->only([
'id', 'prescription_type', 'patient_name', 'gender', 'age',
'id', 'prescription_type', 'dosage_amount', 'dosage_unit', 'need_decoction', 'bags_per_dose',
'patient_name', 'gender', 'age',
'visit_no', 'prescription_date', 'tongue', 'tongue_image', 'pulse',
'pulse_condition', 'clinical_diagnosis', 'herbs', 'dose_count', 'dose_unit',
'usage_days', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
'usage_days', 'times_per_day', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
'usage_notes', 'doctor_name', 'is_shared', 'visible_role_ids', 'diagnosis_id',
]);
}
server/app/common/service/gancao/GancaoScmRecipelService.php
+37 -8
View File
@@ -412,21 +412,50 @@ final class GancaoScmRecipelService
'package' => 'igc_scm.ops.api.order',
'class' => 'CTM_PREVIEW',
];
dd($rx);
if ($dfId === 101) {
$isDecoct = (int) $c['default_is_decoct'] ? 1 : 0;
$base['df101ext'] = [
'times_per_day' => max(1, min(10, (int) $c['default_times_per_day'])),
'is_decoct' => $isDecoct,
'num_per_pack' => max(1, min(9, (int) $c['default_num_per_pack'])),
'is_special_writing' => 0,
'dose' => max(50, min(250, (int) $c['default_dose_ml'])),
'times_per_day' =>$rx['times_per_day'],
'is_decoct' => $rx['need_decoction'],
'num_per_pack' => $rx['bags_per_dose'],
'is_special_writing' => $rx['bags_per_dose']==$rx['times_per_day']?0:1,
'dose' => $rx['dosage_amount'],
'usage_mode' => 'ORAL',
'ds_type' => 1
];
$base['doct_advice']=[
'taboo'=>$rx['dietary_taboo'],
'usage_time'=>$rx['usage_time'],
'usage_brief'=>$rx['usage_instruction'],
'others'=>$rx['usage_notes']
];
$base['express_type']="general";
$base['cradle_store']="线上接诊";
$base['app_order_no']=$order['order_no'];
$base['express_to']=[
'name'=>$order['recipient_name'],
'phone'=>$order['recipient_phone'],
'province'=>$order['shipping_province'],
'city'=>$order['shipping_city'],
'addr'=>$order['shipping_province'].$order['shipping_city'].$order['shipping_city'].$order['shipping_address']
];
$base['callback_url']= $c['callback_url'];
$base['diagnosis']= $rx['clinical_diagnosis']||'无';
$base['disease']= $rx['clinical_diagnosis']||'无';
$base['doctor']=[
'name'=>$rx['doctor_name'],
'phone'=>''
];
$base['patient']=[
'name'=>$rx['patient_name'],
'age'=>$rx['age'],
'sex'=>$rx['gender_desc']=='男'?1:0
];
}
if ($dfId === 102) {
$isDecoct = (int) $c['default_is_decoct'] ? 1 : 0;
$base['df102ext'] = [
'times_per_day' =>$rx['times_per_day'],
'take_days'=>$order['medication_days']?$order['medication_days']:$rx['usage_days'],