修改获取处方列表多个病例问题

app/Services/BasicDataService.php

@@ -98,6 +98,11 @@ class BasicDataService extends BaseService
      */
     public function getOperationManual(): array
     {
+        $fields = [
+            'manual_id',
+            'title',
+        ];
+
         $params = array();
         $params['status'] = 1;
 
@@ -117,16 +122,11 @@ class BasicDataService extends BaseService
     {
         $manual_id = $this->request->route('manual_id');
 
-        $fields = [
-            'manual_id',
-            'title',
-        ];
-
         $params = array();
         $params['manual_id'] = $manual_id;
         $params['status'] = 1;
 
-        $operation_manual = OperationManual::getOne($params,$fields);
+        $operation_manual = OperationManual::getOne($params);
         if (empty($operation_manual)){
             return fail();
         }

app/Services/UserDoctorService.php

@@ -388,7 +388,7 @@ class UserDoctorService extends BaseService
         $params['doctor_id'] = $user_info['client_user_id'];
         $params['pharmacist_audit_status'] = $prescription_status;
         $params['is_delete'] = 0;
-        $order_prescriptions = OrderPrescription::getPage($params);
+        $order_prescriptions = OrderPrescription::getWithIcdPage($params);
         if (empty($order_prescriptions)) {
             return success($order_prescriptions);
         }
@@ -419,17 +419,6 @@ class UserDoctorService extends BaseService
             // 病情描述
             $data['disease_desc'] = $order_inquiry_case['disease_desc'];
 
-            // 获取icd诊断疾病信息
-            $params = array();
-            $params['icd_id'] = $order_prescription['icd_id'];
-            $disease_class_icd = DiseaseClassIcd::getOne($params);
-            if (empty($disease_class_icd)){
-                return fail(HttpEnumCode::SERVER_ERROR);
-            }
-
-            // 获取病情诊断名称，icd名称
-            $data['icd_name'] = $disease_class_icd['icd_name'];
-
             // 患病时长
             if (empty($order_inquiry_case['diagnosis_date'])){
                 $data['diagnosis_date'] = "未知";
@@ -437,6 +426,8 @@ class UserDoctorService extends BaseService
                 $data['diagnosis_date'] = date('Y-m-d',strtotime($order_inquiry_case['diagnosis_date']));
             }
 
+            // 疾病信息
+            $data['order_prescription_icd'] = $order_prescription['OrderPrescriptionIcd'] ?? [];
 
             $result[] = $data;
         }