diff --git a/app/Model/DiseaseClass.php b/app/Model/DiseaseClass.php index 523f57a..730a157 100644 --- a/app/Model/DiseaseClass.php +++ b/app/Model/DiseaseClass.php @@ -37,7 +37,7 @@ class DiseaseClass extends Model /** * The attributes that should be cast to native types. */ - protected array $casts = ['disease_class_id' => 'integer', 'expertise_id' => 'integer', 'disease_class_status' => 'integer', 'disease_class_enable' => 'integer', 'icd_id' => 'integer', 'is_hot' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime']; + protected array $casts = ['disease_class_id' => 'string', 'expertise_id' => 'string', 'disease_class_status' => 'integer', 'disease_class_enable' => 'integer', 'icd_id' => 'string', 'is_hot' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime']; protected string $primaryKey = "disease_class_id"; diff --git a/app/Model/OrderEvaluation.php b/app/Model/OrderEvaluation.php index 02d2a0b..03f34b5 100644 --- a/app/Model/OrderEvaluation.php +++ b/app/Model/OrderEvaluation.php @@ -13,10 +13,11 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property int $doctor_id 医生id * @property int $patient_id 患者id * @property int $order_inquiry_id 订单-问诊id + * @property string $name_mask 患者姓名(掩码) * @property string $reply_quality 回复质量(百分制) * @property string $service_attitude 服务态度(百分制) * @property string $reply_progress 回复速度(百分制) - * @property string $avg_score 平均得分(百分制) + * @property string $avg_score 平均得分(百分制,回复质量占4、服务态度占3、回复速度占3,计算公式:每个得分 * 占比 相加) * @property int $type 类型(1:默认评价 2:主动评价) * @property string $content 评价内容 * @property \Carbon\Carbon $created_at 创建时间 @@ -34,7 +35,7 @@ class OrderEvaluation extends Model /** * The attributes that are mass assignable. */ - protected array $fillable = ['evaluation_id', 'doctor_id', 'patient_id', 'order_inquiry_id', 'reply_quality', 'service_attitude', 'reply_progress', 'avg_score', 'type', 'content', 'created_at', 'updated_at']; + protected array $fillable = ['evaluation_id', 'doctor_id', 'patient_id', 'order_inquiry_id', 'name_mask', 'reply_quality', 'service_attitude', 'reply_progress', 'avg_score', 'type', 'content', 'created_at', 'updated_at']; /** * The attributes that should be cast to native types. diff --git a/app/Services/BasicDataService.php b/app/Services/BasicDataService.php index 9552f96..dc88b25 100644 --- a/app/Services/BasicDataService.php +++ b/app/Services/BasicDataService.php @@ -137,11 +137,15 @@ class BasicDataService extends BaseService { $disease_class_name = $this->request->input('disease_class_name'); + $fields = [ + 'disease_class_id', + 'disease_class_name', + ]; $params = array(); $params[] = ["disease_class_status",1]; $params[] = ["disease_class_enable",1]; $params[] = ['disease_class_name', 'like', '%' . $disease_class_name . '%']; - $disease_class = DiseaseClass::getList($params); + $disease_class = DiseaseClass::getList($params,$fields); return empty($disease_class) ? success() : success($disease_class->toArray()) ; } @@ -152,11 +156,16 @@ class BasicDataService extends BaseService */ public function getDiseaseHot(): array { + $fields = [ + 'disease_class_id', + 'disease_class_name', + ]; + $params = array(); $params[] = ["disease_class_status",1]; $params[] = ["disease_class_enable",1]; $params[] = ['is_hot', 1]; - $disease_class = DiseaseClass::getLimit($params,10); + $disease_class = DiseaseClass::getLimit($params,10,$fields); return empty($disease_class) ? success() : success($disease_class->toArray()) ; } @@ -167,7 +176,12 @@ class BasicDataService extends BaseService */ public function getDiseaseExpertiseList(): array { - $disease_class_expertise = DiseaseClassExpertise::getOrderList(); + $params = array(); + $fields = [ + 'expertise_id', + 'expertise_name', + ]; + $disease_class_expertise = DiseaseClassExpertise::getOrderList($params,$fields); return success($disease_class_expertise); } } \ No newline at end of file diff --git a/app/Services/DoctorInquiryService.php b/app/Services/DoctorInquiryService.php index 20ca8e5..aa46568 100644 --- a/app/Services/DoctorInquiryService.php +++ b/app/Services/DoctorInquiryService.php @@ -122,6 +122,13 @@ class DoctorInquiryService extends BaseService // 沟通时长(分钟,0为不限制时长) $result['config']['duration'] = $system_inquiry_config['duration']; + // 系统价格(公益问诊) + $result['config']['system_inquiry_price'] = []; + if ($inquiry_type == 3) + { + $result['config']['system_inquiry_price'] = explode(',',$system_inquiry_config['inquiry_price']); + } + return success($result); }