完善功能

app/admin/controller/member/WellnessRecordController.php

@@ -11,6 +11,7 @@ use app\model\WellnessRecord;
 use support\exception\BusinessException;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 
 class WellnessRecordController extends Curd
 {
@@ -49,7 +50,7 @@ class WellnessRecordController extends Curd
                 'wellness_record_content' => $item->wellness_record_content,
                 'wellness_record_remark' => $item->wellness_record_remark,
                 'wellness_record_extend_json' => $item->wellness_record_extend_json,
-                'wellness_record_addtimes' => $item->wellness_record_addtimes,
+                'wellness_record_addtimes' => date('Y-m-d H:i:s', $item->wellness_record_addtimes),
             ];
             if (!empty($item->wellness_record_file_json)) {
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
@@ -111,6 +112,12 @@ class WellnessRecordController extends Curd
                     ];
                 }
             }
+            if (!empty($item->wellness_record_json)) {
+                $itemNew['wellness_record_json'] = json_decode($item->wellness_record_json);
+            }
+            if (!empty($item->wellness_record_extend_json)) {
+                $itemNew['wellness_record_extend_json'] = json_decode($item->wellness_record_extend_json);
+            }
 
             $itemsNew[] = $itemNew;
         }
@@ -337,7 +344,7 @@ class WellnessRecordController extends Curd
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
                 $wellnessRecordFileJson = [];
                 foreach ($item->wellness_record_file_json as $value) {
-                    if (!empty($value['url']) && !empty($value['name'])){
+                    if (!empty($value['url']) && !empty($value['name'])) {
                         $wellnessRecordFileJson[] = [
                             'url' => getenv('STORAGE_DOMAIN') . $value['url'],
                             'name' => $value['name']
@@ -365,9 +372,24 @@ class WellnessRecordController extends Curd
                 ];
             }
             $data['wellness_record_file_json'] = json_encode($wellnessRecordFileJson);
-        }else{
+        } else {
             $data['wellness_record_file_json'] = '[]';
         }
+
+        $data['wellness_record_json'] = '[]';
+        if (!empty($request->post('records'))) {
+            $data['wellness_record_json'] = json_encode($request->post('records'));
+        }
+
+        // 记录医生
+        $extend = JwtToken::getExtend();
+        $data['wellness_record_extend_json'] = json_encode([
+            'doctor' => [
+                'name' => $extend['name'],
+                'header' => '',
+                'userid' => $extend['id']
+            ]]);
+
         return $data;
     }
 
@@ -387,9 +409,13 @@ class WellnessRecordController extends Curd
                 ];
             }
             $data['wellness_record_file_json'] = json_encode($wellnessRecordFileJson);
-        }else{
+        } else {
             $data['wellness_record_file_json'] = '[]';
         }
+        $data['wellness_record_json'] = '[]';
+        if (!empty($request->post('records'))) {
+            $data['wellness_record_json'] = json_encode($request->post('records'));
+        }
         $model = $this->model->find($id);
         if (!$model) {
             throw new BusinessException('记录不存在', 2);

app/admin/service/auth/AuthService.php

@@ -38,7 +38,8 @@ class AuthService
             }
             $extend = [
                 'id' => $user->user_id,
-                'client' => 'admin'
+                'client' => 'admin',
+                'name'=> $user->user_name
             ];
             $token = JwtToken::generateToken($extend);
             // 提交事务