Merge branch 'master' of https://gitee.com/v_cms/zyt

server/app/adminapi/validate/doctor/AppointmentValidate.php

@@ -19,11 +19,15 @@ class AppointmentValidate extends BaseValidate
         'id' => 'require',
         'patient_id' => 'require|integer',
         'doctor_id' => 'require|integer',
+        'diagnosis_id' => 'require|integer',
         'appointment_date' => 'require|date',
         'period' => 'in:morning,afternoon,all',
         'appointment_time' => 'require',
         'appointment_type' => 'in:video,text,phone',
         'channel_source' => 'require',
+        'note_id' => 'require|integer',
+        'image_type' => 'require|in:tongue_images,report_files',
+        'image_path' => 'require',
     ];
 
     /**
@@ -34,6 +38,7 @@ class AppointmentValidate extends BaseValidate
         'id' => '预约ID',
         'patient_id' => '患者ID',
         'doctor_id' => '医生ID',
+        'diagnosis_id' => '诊单ID',
         'appointment_date' => '预约日期',
         'period' => '时段',
         'appointment_time' => '预约时间',
@@ -85,4 +90,37 @@ class AppointmentValidate extends BaseValidate
     {
         return $this->only(['id']);
     }
+
+    /**
+     * @notes 接诊台聚合详情场景
+     * @return AppointmentValidate
+     */
+    public function sceneReception()
+    {
+        return $this->only(['id']);
+    }
+
+    /**
+     * @notes 通知接诊医助场景
+     * @return AppointmentValidate
+     */
+    public function sceneNotifyAssistant()
+    {
+        return $this->only(['id']);
+    }
+
+    public function sceneAddDoctorNote()
+    {
+        return $this->only(['diagnosis_id']);
+    }
+
+    public function sceneDoctorNotes()
+    {
+        return $this->only(['diagnosis_id']);
+    }
+
+    public function sceneDeleteDoctorNoteImage()
+    {
+        return $this->only(['note_id', 'image_type', 'image_path']);
+    }
 }

server/app/adminapi/validate/tcm/DiagnosisValidate.php

@@ -64,7 +64,7 @@ class DiagnosisValidate extends BaseValidate
 
     public function sceneEdit()
     {
-        return $this->only(['id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'marital_status', 'height', 'weight', 'region', 'systolic_pressure', 'diastolic_pressure', 'fasting_blood_sugar', 'diabetes_discovery_year', 'local_hospital_diagnosis', 'local_hospital_name', 'past_history', 'symptoms', 'tongue_coating', 'pulse', 'treatment_principle', 'prescription', 'doctor_advice', 'remark', 'current_medications', 'status', 'tongue_images', 'report_files']);
+        return $this->only(['id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'marital_status', 'height', 'weight', 'region', 'systolic_pressure', 'diastolic_pressure', 'fasting_blood_sugar', 'diabetes_discovery_year', 'local_hospital_diagnosis', 'local_hospital_name', 'past_history', 'symptoms', 'tongue_coating', 'pulse', 'treatment_principle', 'prescription', 'doctor_advice', 'remark', 'current_medications', 'status']);
     }
 
     public function sceneId()