调整 获取申请单细节，调整医生跳转系统显示

Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php

@@ -130,10 +130,10 @@ class WorkMainController extends Controller
 
             $list=$list->where(['reservation_department'=>$department->department_name]);
         }else{
-            $list=$list->where(['RISRAcceptDeptCode'=>$department->department_number]);
+         
             $list = $list->where(function ($q) use($department) {
                 $q->where(['RISRAcceptDeptCode'=>$department->department_number])
-                    ->orWhere('RISRAcceptDeptCode', $department->department_number);
+                    ->orWhere('reservation_department_code', $department->department_number);
             });
         }
         if ($searchInfo['dateRange']!=null and count($searchInfo['dateRange']) == 2) {

Laravel/app/Http/Controllers/API/Third/YiJiController.php

@@ -92,10 +92,12 @@ class YiJiController extends Controller
                                 'bedname' => $data_v["bedName"],  //病床号
                                 'bedno' => $data_v["bedNo"],  //病床号
                                 'app_num' => $data_v["requestNo"],  //申请单号
+                                'idCardNumber' => $data_v["idCardNumber"],  //身份证号
                                 'medicalHistory' => $data_v["medicalHistory"],  //病史摘要
                                 'diagnosisName' => $data_v["diagnosisName"],  //临床诊断（诊断名称）
-                                'idCardNumber' => $data_v["idCardNumber"],  //身份证号
+                                'his_is_emergency'=> intval($data_v["urgentFlag"]), //是否加急
-                                'his_is_emergency'=> intval($data_v["urgentFlag"]) //是否加急
+                                'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
+                                'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
                             ];
                            $list_id= DB::table('s_list')->insertGetId($params);
                            if($list_id){
@@ -110,6 +112,16 @@ class YiJiController extends Controller
                                ]);
                            }
 
+                        }else{
+                            //如果存在，更新一下部分字段
+                            $params = [
+                                'medicalHistory' => $data_v["medicalHistory"],  //病史摘要
+                                'diagnosisName' => $data_v["diagnosisName"],  //临床诊断（诊断名称）
+                                'his_is_emergency'=> intval($data_v["urgentFlag"]), //是否加急
+                                'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
+                                'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
+                            ];
+                            DB::table('s_list')->update($params)->where(['id' => $db_item->id])->first();
                         }
                     }
                 }