3
Build Docker / build (push) Canceled after 0s

This commit is contained in:
haomingming
2026-09-08 13:54:59 +08:00
parent 07f0467484
commit 0d3da047a1
2 changed files with 8 additions and 13 deletions
+2 -4
View File
@@ -252,8 +252,7 @@ class BasicDataService extends BaseService
if (isset($pharmacy_id) && $pharmacy_id !== '') {
$pharmacy = Pharmacy::getValidPharmacy($pharmacy_id);
} else {
$defaultPharmacy = DoctorPharmacy::getDoctorDefaultPharmacy($doctor_id);
$pharmacy = ($defaultPharmacy && $defaultPharmacy->Pharmacy && $defaultPharmacy->Pharmacy->status == 1) ? $defaultPharmacy->Pharmacy : null;
$pharmacy = DoctorPharmacy::getDoctorDefaultPharmacy($doctor_id);
}
if (empty($pharmacy) || empty($pharmacy->pharmacy_code)) {
@@ -477,8 +476,7 @@ class BasicDataService extends BaseService
if (isset($pharmacy_id) && $pharmacy_id !== '') {
$pharmacy = Pharmacy::getValidPharmacy($pharmacy_id);
} else {
$defaultPharmacy = DoctorPharmacy::getDoctorDefaultPharmacy($doctor_id);
$pharmacy = ($defaultPharmacy && $defaultPharmacy->Pharmacy && $defaultPharmacy->Pharmacy->status == 1) ? $defaultPharmacy->Pharmacy : null;
$pharmacy = DoctorPharmacy::getDoctorDefaultPharmacy($doctor_id);
}
if (empty($pharmacy) || empty($pharmacy->pharmacy_code)) {