刘桂岩 5 سال پیش
والد
کامیت
e493d79160
1فایلهای تغییر یافته به همراه36 افزوده شده و 59 حذف شده
  1. 36 59
      application/inter/controller/Reciveremote.php

+ 36 - 59
application/inter/controller/Reciveremote.php

@@ -11,42 +11,42 @@ use think\Log;
 class Reciveremote extends Base
 {
     /**
- * 远程申请列表
- *
- * @ApiTitle            (远程申请列表)
- * @ApiSummary          (远程申请列表)
- * @ApiSector           (远程诊断)
- * @ApiMethod           (POST)
- * @ApiRoute            (/inter/reciveremote/index)
- * @ApiHeaders        (name="sign", type="string", required=true, description="请求头-校验key")
- * @ApiHeaders        (name="nonce", type="string", required=true, description="请求头-随机数")
- * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
- * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
- * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
- * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
- * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
- * @ApiParams         (name="param[patient_num]",        type="string",      sample="",          description="预约登记exams表id值<选填>")
- * @ApiParams         (name="param[exam_class]",            type="string",      sample="",          description="检查类<选填>")
- * @ApiParams         (name="param[name]",           type="string",      sample="",          description="患者姓名<选填>")
- * @ApiParams         (name="param[applicationtime]",   type="string",      sample="",          description="申请时间<选填>")
- * @ApiParams         (name="param[is_urgent]",           type="string",      sample="",          description="是否急诊<选填>")
- * @ApiParams         (name="param[report_result]",                  type="string",      sample="",          description="检查结果<选填>")
- * @ApiParams         (name="param[exam_status]",                  type="string",      sample="",          description="检查状态<选填>")
- * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
- * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
- * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
- * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")
- * @ApiReturnParams   (name="count",                      type="object",      sample="{}",        description="总条数")
- * @ApiReturn   (data="
-{
-'status': ok,
-'code': '0000',
-'sessionid': 'a17z7a7a8f9g9rh9d89jio',
-'info' : ''
-'count' : '110'
-}
- *")
- **/
+     * 远程申请列表
+     *
+     * @ApiTitle            (远程申请列表)
+     * @ApiSummary          (远程申请列表)
+     * @ApiSector           (远程诊断)
+     * @ApiMethod           (POST)
+     * @ApiRoute            (/inter/reciveremote/index)
+     * @ApiHeaders        (name="sign", type="string", required=true, description="请求头-校验key")
+     * @ApiHeaders        (name="nonce", type="string", required=true, description="请求头-随机数")
+     * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
+     * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
+     * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
+     * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
+     * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
+     * @ApiParams         (name="param[patient_num]",        type="string",      sample="",          description="预约登记exams表id值<选填>")
+     * @ApiParams         (name="param[exam_class]",            type="string",      sample="",          description="检查类<选填>")
+     * @ApiParams         (name="param[name]",           type="string",      sample="",          description="患者姓名<选填>")
+     * @ApiParams         (name="param[applicationtime]",   type="string",      sample="",          description="申请时间<选填>")
+     * @ApiParams         (name="param[is_urgent]",           type="string",      sample="",          description="是否急诊<选填>")
+     * @ApiParams         (name="param[report_result]",                  type="string",      sample="",          description="检查结果<选填>")
+     * @ApiParams         (name="param[exam_status]",                  type="string",      sample="",          description="检查状态<选填>")
+     * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
+     * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
+     * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
+     * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")
+     * @ApiReturnParams   (name="count",                      type="object",      sample="{}",        description="总条数")
+     * @ApiReturn   (data="
+    {
+    'status': ok,
+    'code': '0000',
+    'sessionid': 'a17z7a7a8f9g9rh9d89jio',
+    'info' : ''
+    'count' : '110'
+    }
+     *")
+     **/
 //     public function index()
 //     {
 //         try{
@@ -331,29 +331,6 @@ class Reciveremote extends Base
                     DB::table('report')->insert($data);
                     $v['report_id'] = $data['id'];
                 }
-<<<<<<< HEAD
-                //申请医院
-                $local_institution = DB::table('institution')->where('id',$v['local_institution_id'])->field('name')->find();
-                $list[$k]['local_institution_name'] = $local_institution['name'];
-                //检查类型
-                $check_class = DB::table('constant')->where('id',$v['exam_class'])->field('constant_value as name')->find();
-                $list[$k]['class_name'] = $check_class['name'];
-                //检查子类
-                $subclass_name = DB::table('exam_subclass')->where('id',$v['exam_sub_class'])->field('name')->find();
-                $list[$k]['subclass_name'] = $subclass_name['name'];
-                //检查部位
-                $body_part = DB::table('bodypart')->where('id',$v['body_part'])->field('name')->find();
-                $list[$k]['body_name'] = $body_part['name'];
-                //检查设备
-                $device = DB::table('device')->where('id',$v['device'])->field('name')->find();
-                $list[$k]['device_name'] = $device['name'];
-                //报告医生
-                $report_doctor = DB::table('doctors')->where('id',$v['report_doctor_id'])->field('realname')->find();
-                $list[$k]['report_doctor_id'] = $report_doctor['realname'];
-                $list[$k]['datetime'] = $v['req_date_time'];
-                $list[$k]['rdatetime'] = $v['report_datetime'];
-=======
->>>>>>> 3497031c6f13575f19fa22458e26584b3178f762
             }
             // var_dump($res);
             return json_encode(['status'=>'ok','code'=>'0000','count'=>$count[0]['count'],'info'=>$list,'sessionid'=>$sessionid]);