diff --git a/Laravel/app/Lib/Tools.php b/Laravel/app/Lib/Tools.php
index b1bf2fc..ea9d1c0 100644
--- a/Laravel/app/Lib/Tools.php
+++ b/Laravel/app/Lib/Tools.php
@@ -138,7 +138,7 @@ class Tools
         curl_setopt($ch, CURLOPT_POSTFIELDS, $xml_data);
         $r = curl_exec($ch);
         \Illuminate\Support\Facades\Log::info($r);
-       
+
         try {
             $xml = simplexml_load_string($r, 'SimpleXMLElement', LIBXML_NOCDATA);
             $namespaces = $xml->getNamespaces(true);
diff --git a/Laravel/app/Services/Xml/ShenQingDanService.php b/Laravel/app/Services/Xml/ShenQingDanService.php
index 4315beb..f1da0d2 100644
--- a/Laravel/app/Services/Xml/ShenQingDanService.php
+++ b/Laravel/app/Services/Xml/ShenQingDanService.php
@@ -117,7 +117,7 @@ class ShenQingDanService
         //dd($orderList);
         $u_count = 0;//循环的数量
         try {
-            $msg='';
+            $msg='提示:';
             DB::beginTransaction();
             $data=[];
             $zuofei=['D','U','C'];
@@ -162,18 +162,17 @@ class ShenQingDanService
                         $msg=$msg.$order['OEORIOrderItemID'].' 无更新;';
                     }
                 }else{
-                    DB::rollBack();
-                    return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '更新失败:'.$order['OEORIOrderItemID'].'未找到此医嘱');
+                    //推送过来的检查项目可能不在库里，不在的直接忽略
+//                    DB::rollBack();
+//                    return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '更新失败:'.$order['OEORIOrderItemID'].'未找到此医嘱');
+                    $msg=$msg.$order['OEORIOrderItemID'].'不存在;';
                 }
             }
 
-            if (count($orderList) == $u_count) {
+
                 DB::commit();
-                return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], 0, '成功');
-            } else {
-                DB::rollBack();
-                return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '更新失败:'.$msg);
-            }
+                return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], 0, '成功。'.$msg);
+
         } catch (\Exception $e) {
             DB::rollBack();
             // 处理异常
diff --git a/YiJi-admin/src/views/AutoLogin.vue b/YiJi-admin/src/views/AutoLogin.vue
index 05e1a08..0d71894 100644
--- a/YiJi-admin/src/views/AutoLogin.vue
+++ b/YiJi-admin/src/views/AutoLogin.vue
@@ -106,13 +106,30 @@
 		passwordRef.value.focus()
 	}
 	onMounted(()=>{
-		console.log(route.query)
-		let p=route.query
-		username.value=p.u
-		pwd.value=p.p
-		login()
+		  
+		// let p=route.query
+		
+		username.value=getParameterByName('u')
+		pwd.value=getParameterByName('p')
+		
+		 console.log(username.value)
+		 console.log(pwd.value)
+		 
+			login()
+		 
+		
 		  })
 
+//获取url参数
+    function getParameterByName(name, url) {
+        if (!url) url = decodeURIComponent(window.location.href)
+        name = name.replace(/[\[\]]/g, '\\$&')
+        var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
+            results = regex.exec(url)
+        if (!results) return null
+        if (!results[2]) return ''
+        return decodeURIComponent(results[2].replace(/\+/g, ' '))
+    }
 </script>
 
 <style scoped>
diff --git a/YiJi-admin/src/views/YeWu/DevicesConfig.vue b/YiJi-admin/src/views/YeWu/DevicesConfig.vue
index 8e32777..9a97299 100644
--- a/YiJi-admin/src/views/YeWu/DevicesConfig.vue
+++ b/YiJi-admin/src/views/YeWu/DevicesConfig.vue
@@ -103,8 +103,8 @@
 	}
 	const Add=()=>{
 		dialogVisible.value=true
-		DeviceInfo.id=null
-		searchInfo.name=''
+		DeviceInfo.value.id=null
+		searchInfo.value.name=''
 	}
 	const Edit=(row)=>{
 		DeviceInfo.value={
diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue
index 19f8850..ce92793 100644
--- a/YiJi-admin/src/views/YeWu/MainList.vue
+++ b/YiJi-admin/src/views/YeWu/MainList.vue
@@ -21,7 +21,7 @@
 					</el-select>
 				</el-form-item>
 		
-					<el-form-item v-if="loginUserinfo.group!=2">
+					<el-form-item v-if="loginUserinfo && loginUserinfo.group!=2">
 						<el-select :filterable="true" clearable v-model="searchInfo.patient_type" placeholder="患者类型"
 							style="margin-left: 8px;width: 150px;">
 							<el-option label="住院" value="0" />
@@ -30,14 +30,14 @@
 							<el-option label="体检" value="3" />
 						</el-select>
 					</el-form-item>
-					<el-form-item v-if="loginUserinfo.group!=2">
+					<el-form-item v-if="loginUserinfo && loginUserinfo.group!=2">
 						<el-select multiple :filterable="true" clearable v-model="searchInfo.resources" placeholder="资源"
 							style="margin-left: 8px;width: 250px;">
 							<el-option v-for="(item,index) in enableResourceList" :key="index"
 								:label="item.department_resources_name" :value="item.id" />
 						</el-select>
 					</el-form-item >
-					<el-form-item v-if="loginUserinfo.group!=2">
+					<el-form-item v-if="loginUserinfo && loginUserinfo.group!=2">
 						<el-select :filterable="true" clearable v-model="searchInfo.services_group" placeholder="服务组"
 							style="margin-left: 8px;width: 150px;">
 							<el-option v-for="(item,index) in EnableDeviceList" :key="index" :label="item.device_name"
@@ -642,7 +642,7 @@
 		})
 	}
 	onMounted(() => {
-		if(loginUserinfo.value.group!=2){
+		if(loginUserinfo.value && loginUserinfo.value.group!=2){
 			getEnableResource()
 		}
 		GetEnableDeviceListFunc()