修改患者名称，评价名称

app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php

@@ -264,7 +264,7 @@ class AutoFinishInquiryDelayDirectConsumer extends ConsumerMessage
         $data['doctor_id'] = $order_inquiry['doctor_id'];
         $data['patient_id'] = $order_inquiry['patient_id'];
         $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-        $data['name_mask'] = Mask::maskNameStr($user_patient['user_name'],2);
+        $data['name_mask'] = Mask::maskNameStr($order_inquiry['patient_name'],2);
         $data['reply_quality'] = 100;//回复质量（百分制）
         $data['service_attitude'] = 100; // 服务态度（百分制）
         $data['reply_progress'] = 100; // 回复速度（百分制）

app/Controller/TestController.php

@@ -31,7 +31,9 @@ use App\Services\OrderPrescriptionService;
 use App\Services\OrderProductService;
 use App\Services\PatientOrderService;
 use App\Services\UserDoctorService;
+use App\Utils\Data;
 use App\Utils\Log;
+use App\Utils\Mask;
 use Extend\Alibaba\Oss;
 use Extend\Ca\Ca;
 use Extend\Ca\CaOnline;
@@ -67,10 +69,10 @@ class TestController extends AbstractController
 //        $this->test_5();
 //        $this->test_1();
 //        $this->test_11();
-        $this->test_12();
+//        $this->test_12();
 //        $this->test_13();
 //        $this->test_14();
-//        $this->test_15();
+        $this->test_15();
     }
 
 
@@ -327,6 +329,7 @@ class TestController extends AbstractController
     }
 
     public function test_15(){
-
+        $a = Mask::maskNameStr("gdxz123400000",2);
+        dump($a);
     }
 }

app/Services/InquiryService.php

@@ -575,7 +575,7 @@ class InquiryService extends BaseService
         $data['doctor_id'] = $doctor_id;
         $data['patient_id'] = $user_info['client_user_id'];
         $data['order_inquiry_id'] = $order_inquiry_id;
-        $data['name_mask'] = Mask::maskNameStr($user_patient['user_name'],2);
+        $data['name_mask'] = Mask::maskNameStr($order_inquiry['patient_name'],2);
         $data['reply_quality'] = $reply_quality;
         $data['service_attitude'] = $service_attitude;
         $data['reply_progress'] = $reply_progress;

app/Services/LoginService.php

@@ -72,7 +72,7 @@ class LoginService extends BaseService
 
                 // 新增用户表
                 $data = array();
-                $data['user_name'] = substr($phone_info['phone_info']['purePhoneNumber'],-4);
+                $data['user_name'] = 'gdxz' . substr($phone_info['phone_info']['purePhoneNumber'],-4) . mt_rand(10000,99999);
                 $data['mobile'] = $phone_info['phone_info']['purePhoneNumber'];
                 $data['wx_mobile'] = $phone_info['phone_info']['purePhoneNumber'];
                 $data['user_type'] = $user_type;
@@ -289,7 +289,7 @@ class LoginService extends BaseService
 
                 // 新增用户表
                 $data = array();
-                $data['user_name'] = substr($phone,-4);
+                $data['user_name'] = 'gdxz' . substr($phone,-4)  . mt_rand(10000,99999);;
                 $data['mobile'] = $phone;
                 $data['wx_mobile'] = $phone;
                 $data['user_type'] = $user_type;

app/Utils/Data.php

@@ -18,108 +18,127 @@ class Data
     // 迁移医院数据
     public function hospital()
     {
-        $generator = $this->container->get(IdGeneratorInterface::class);
+        $prov_name = [
+            '新疆维吾尔自治区'
+        ];
+        $wg = new \Hyperf\Utils\WaitGroup();
+        $wg->add(count($prov_name));
+
+        foreach ($prov_name as $k => $v){
+            co(function () use ($wg,$v) {
+                $generator = $this->container->get(IdGeneratorInterface::class);
 
-        $params = array();
-        $params['prov_name'] = "贵州省";
-        $hospital = TbHospitalMy::getList($params);
-        foreach ($hospital as $key => $value) {
-            $params = array();
-            $params['hospital_name'] = $value['name'];
-            $params['province'] = $value['prov_name'];
-            $params['city'] = $value['city_name'];
-            $res = Hospital::getOne($params);
-            if(!empty($res)){
-                dump("重复-跳过-".$value['name']);
                 $params = array();
-                $params['id'] = $value['id'];
+                $params['prov_name'] = $v;
-                $res = Db::table('tb_hospital_my')->where($params)->delete();
+                $params['id'] = 39458;
-                if (!$res) {
+                $hospital = TbHospitalMy::getList($params);
-                    return "删除错误";
+                foreach ($hospital as $key => $value) {
+                    dump(111);
+                    $params = array();
+                    $params['hospital_name'] = $value['name'];
+                    $params['province'] = $value['prov_name'];
+                    $params['city'] = $value['city_name'];
+                    $res = Hospital::getOne($params);
+                    if(!empty($res)){
+                        dump("重复-跳过-".$value['name']);
+                        $params = array();
+                        $params['id'] = $value['id'];
+                        $res = Db::table('tb_hospital_my')->where($params)->delete();
+                        if (!$res) {
+                            return "删除错误";
+                        }
+                        continue;
+                    }
+
+                    $data = array();
+                    $data['hospital_id'] = $generator->generate();;
+                    $data['hospital_name'] = $value['name'];
+                    $data['hospital_status'] = 1;
+
+                    if ($value['level'] == 0){
+                        $data['hospital_level_name'] = "未知";
+                    }elseif ($value['level'] == 1){
+                        $data['hospital_level_name'] = "三甲";
+                    }elseif ($value['level'] == 2){
+                        $data['hospital_level_name'] = "三级";
+                    }elseif ($value['level'] == 3){
+                        $data['hospital_level_name'] = "二级";
+                    }elseif ($value['level'] == 4){
+                        $data['hospital_level_name'] = "其他";
+                    }else{
+                        continue;
+                    }
+
+                    $data['post_code'] = $value['postcode'];
+                    $data['tele_phone'] = $value['office_phone'];
+                    $data['lat'] = $value['lat'];
+                    $data['lng'] = $value['lng'];
+                    $data['desc'] = $value['info'];
+                    $data['created_at'] = date('Y-m-d H:i:s',time());
+                    $data['updated_at'] = date('Y-m-d H:i:s',time());
+
+                    // 省
+                    $params = array();
+                    $params['area_name'] = $value['prov_name'];
+                    $province = Area::getOne($params);
+                    if(empty($province)){
+                        dump("省份-未知-".$value['prov_name']);
+                        continue;
+                    }else{
+                        $data['province_id'] = $province['area_id'];
+                        $data['province'] = $province['area_name'];
+                    }
+
+                    // 市
+                    $params = array();
+                    $params['area_name'] = $value['city_name'];
+                    $params['parent_id'] = $province['area_id'];
+                    $city = Area::getOne($params);
+                    if(empty($city)){
+                        dump("市区-未知-".$value['city_name']);
+                        continue;
+                    }else{
+                        $data['city_id'] = $city['area_id'];
+                        $data['city'] = $city['area_name'];
+                    }
+
+                    $params = array();
+                    $params['area_name'] = $value['county_name'];
+                    $params['parent_id'] = $city['area_id'];
+                    $county = Area::getOne($params);
+                    if(empty($county)){
+                        dump("区县-未知-".$value['county_name']);
+                        continue;
+                    }else{
+                        $data['county_id'] = $county['area_id'];
+                        $data['county'] = $county['area_name'];
+                    }
+
+                    $data['address'] = $value['address'];
+
+                    $res = Hospital::addHospital($data);
+                    if (empty($res)) {
+                        dump("添加-失败-跳过");
+                        continue;
+                    }
+
+                    $params = array();
+                    $params['id'] = $value['id'];
+                    $res = Db::table('tb_hospital_my')->where($params)->delete();
+                    if (!$res) {
+                        return "删除错误";
+                    }
                 }
-                continue;
+                $wg->done();
-            }
+            });
-
-            $data = array();
-            $data['hospital_id'] = $generator->generate();;
-            $data['hospital_name'] = $value['name'];
-            $data['hospital_status'] = 1;
-
-            if ($value['level'] == 0){
-                $data['hospital_level_name'] = "未知";
-            }elseif ($value['level'] == 1){
-                $data['hospital_level_name'] = "三甲";
-            }elseif ($value['level'] == 2){
-                $data['hospital_level_name'] = "三级";
-            }elseif ($value['level'] == 3){
-                $data['hospital_level_name'] = "二级";
-            }elseif ($value['level'] == 4){
-                $data['hospital_level_name'] = "其他";
-            }else{
-                continue;
-            }
-
-            $data['post_code'] = $value['postcode'];
-            $data['tele_phone'] = $value['office_phone'];
-            $data['lat'] = $value['lat'];
-            $data['lng'] = $value['lng'];
-            $data['desc'] = $value['info'];
-            $data['created_at'] = date('Y-m-d H:i:s',time());
-            $data['updated_at'] = date('Y-m-d H:i:s',time());
-
-            // 省
-            $params = array();
-            $params['area_name'] = $value['prov_name'];
-            $province = Area::getOne($params);
-            if(empty($province)){
-                dump("省份-未知-".$value['prov_name']);
-                continue;
-            }else{
-                $data['province_id'] = $province['area_id'];
-                $data['province'] = $province['area_name'];
-            }
-
-            // 市
-            $params = array();
-            $params['area_name'] = $value['city_name'];
-            $params['parent_id'] = $province['area_id'];
-            $city = Area::getOne($params);
-            if(empty($city)){
-                dump("市区-未知-".$value['city_name']);
-                continue;
-            }else{
-                $data['city_id'] = $city['area_id'];
-                $data['city'] = $city['area_name'];
-            }
-
-            $params = array();
-            $params['area_name'] = $value['county_name'];
-            $params['parent_id'] = $city['area_id'];
-            $county = Area::getOne($params);
-            if(empty($county)){
-                dump("区县-未知-".$value['county_name']);
-                continue;
-            }else{
-                $data['county_id'] = $county['area_id'];
-                $data['county'] = $county['area_name'];
-            }
-
-            $data['address'] = $value['address'];
-
-            $res = Hospital::addHospital($data);
-            if (empty($res)) {
-                dump("添加-失败-跳过");
-                continue;
-            }
-
-            $params = array();
-            $params['id'] = $value['id'];
-            $res = Db::table('tb_hospital_my')->where($params)->delete();
-            if (!$res) {
-                return "删除错误";
-            }
         }
 
+        // 等待协程 A 和协程 B 运行完成
+        $wg->wait();
+
+
+
         return success();
     }
+
 }