From 907e135a0b0892524eea1be335b3439f1787d96a Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Wed, 26 Apr 2023 10:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F=E9=97=AE?=
 =?UTF-8?q?=E8=AF=8A=E4=BB=B7=E6=A0=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/TestController.php     |  3 ++
 app/Services/DoctorInquiryService.php | 57 +++++++++------------------
 app/Services/UserDoctorService.php    |  2 +-
 3 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php
index 6293531..fc28c85 100644
--- a/app/Controller/TestController.php
+++ b/app/Controller/TestController.php
@@ -51,6 +51,9 @@ use TCPDF;
 
 class TestController extends AbstractController
 {
+    // 疾病名称
+    protected string $icd_name;
+
     public function test(){
 //        $this->test_8();
 //        $this->test_3();
diff --git a/app/Services/DoctorInquiryService.php b/app/Services/DoctorInquiryService.php
index 7180ce6..41ac74a 100644
--- a/app/Services/DoctorInquiryService.php
+++ b/app/Services/DoctorInquiryService.php
@@ -286,6 +286,20 @@ class DoctorInquiryService extends BaseService
             return fail(HttpEnumCode::SERVER_ERROR);
         }
 
+        if ($work_num_day > $system_inquiry_config['max_work_num_day']) {
+            return fail(HttpEnumCode::HTTP_ERROR, "超出每日最大接诊数量");
+        }
+
+        // 验证-问诊价格
+        // 义诊时不判断，义诊为选择价格，价格后台可调节
+        if ($inquiry_type != 3) {
+            if (!empty($system_inquiry_config['min_inquiry_price']) && !empty($system_inquiry_config['max_inquiry_price'])) {
+                if ($inquiry_price > $system_inquiry_config['max_inquiry_price'] || $inquiry_price < $system_inquiry_config['min_inquiry_price']) {
+                    return fail(HttpEnumCode::HTTP_ERROR, "问诊价格填写错误");
+                }
+            }
+        }
+
         // 开启事务锁
         Db::beginTransaction();
         try {
@@ -296,19 +310,6 @@ class DoctorInquiryService extends BaseService
             $params['inquiry_mode'] = $inquiry_mode;
             $doctor_inquiry_config = DoctorInquiryConfig::getOne($params);
             if (empty($doctor_inquiry_config)) {
-                if ($work_num_day > $system_inquiry_config['max_work_num_day']) {
-                    return fail(HttpEnumCode::HTTP_ERROR, "超出每日最大接诊数量");
-                }
-
-                // 验证问诊价格 义诊时不判断，义诊为选择价格，价格后台可调节
-                if ($inquiry_type != 3) {
-                    if (!empty($system_inquiry_config['min_inquiry_price']) && !empty($system_inquiry_config['max_inquiry_price'])) {
-                        if ($inquiry_price > $system_inquiry_config['max_inquiry_price'] || $inquiry_price < $system_inquiry_config['min_inquiry_price']) {
-                            return fail(HttpEnumCode::HTTP_ERROR, "问诊价格填写错误");
-                        }
-                    }
-                }
-
                 // 创建
                 $data = array();
                 $data['doctor_id'] = $user_info['client_user_id'];
@@ -362,35 +363,15 @@ class DoctorInquiryService extends BaseService
                     }
                 }
 
-                $params = array();
-                $params['inquiry_config_id'] = $doctor_inquiry_config['inquiry_config_id'];
+                // 修改
+                if ($doctor_inquiry_config['work_num_day'] != $work_num_day || $doctor_inquiry_config['inquiry_price'] != $inquiry_price) {
+                    $params = array();
+                    $params['inquiry_config_id'] = $doctor_inquiry_config['inquiry_config_id'];
 
-                $data = array();
-
-                if ($doctor_inquiry_config['work_num_day'] != $work_num_day){
-                    // 新设置的每日接诊数量大于了系统配置的最高接诊数量
-                    if ($work_num_day > $system_inquiry_config['max_work_num_day']){
-                        Db::rollBack();
-                        return fail(HttpEnumCode::HTTP_ERROR, "超出每日最大接诊数量");
-                    }
+                    $data = array();
                     $data['work_num_day'] = $work_num_day;
-                }
-
-                if ($doctor_inquiry_config['inquiry_price'] != $inquiry_price){
-                    // 验证问诊价格 义诊时不判断，义诊为选择价格，价格后台可调节
-                    if ($inquiry_type != 3) {
-                        if (!empty($system_inquiry_config['min_inquiry_price']) && !empty($system_inquiry_config['max_inquiry_price'])) {
-                            if ($inquiry_price > $system_inquiry_config['max_inquiry_price'] || $inquiry_price < $system_inquiry_config['min_inquiry_price']) {
-                                Db::rollBack();
-                                return fail(HttpEnumCode::HTTP_ERROR, "问诊价格填写错误");
-                            }
-                        }
-                    }
-
                     $data['inquiry_price'] = $inquiry_price;
-                }
 
-                if (!empty($data)){
                     DoctorInquiryConfig::editInquiryConfig($params, $data);
 
                     // 记录修改记录
diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index cfec032..4a6f7d7 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -1424,7 +1424,7 @@ class UserDoctorService extends BaseService
 
                 $message = new AutoPharmacistCaVerifyDelayDirectProducer($data);
 
-                $message->setDelayMs(1000 * 60);
+                $message->setDelayMs(1000 * 10);
                 $producer = $this->container->get(Producer::class);
                 $result = $producer->produce($message);
                 if (!$result) {