diff --git a/Laravel.zip b/Laravel.zip
index 4867bc7..8577519 100644
Binary files a/Laravel.zip and b/Laravel.zip differ
diff --git a/Laravel/app/Http/Controllers/API/Third/EntrustController.php b/Laravel/app/Http/Controllers/API/Third/EntrustController.php
index 5a78e88..dfda3db 100644
--- a/Laravel/app/Http/Controllers/API/Third/EntrustController.php
+++ b/Laravel/app/Http/Controllers/API/Third/EntrustController.php
@@ -77,17 +77,21 @@ class EntrustController extends Controller
public function CreateRecordXml(Request $request)
{
$xmlString = $request->getContent(); // 获取请求的原始内容(XML)
+ // try {
+ $res = explode('', $xmlString)[1];
+ $res = explode('', $res)[0];
+ $xmlData = simplexml_load_string($res);
+ $jsonData = json_encode($xmlData,JSON_UNESCAPED_UNICODE);
+ $result = json_decode($jsonData, true);
+ //如果是推送的检查申请单
+ if($result['action']=='T0002'){
+ $service = new ShenQingDanService();
+ return $service->Save($result,$jsonData);
+ }
+ // }catch (\Exception $e){
+ // return \Yz::XMLReturn('SYS001', '269624', -1, '处理失败,接收数据不符合预期结构 '.$e->getMessage());
+ // }
- $res = explode('', $xmlString)[1];
- $res = explode('', $res)[0];
- $xmlData = simplexml_load_string($res);
- $jsonData = json_encode($xmlData,JSON_UNESCAPED_UNICODE);
- $result = json_decode($jsonData, true);
- //如果是推送的检查申请单
- if($result['action']=='T0002'){
- $service = new ShenQingDanService();
- return $service->Save($result,$jsonData);
- }
}
diff --git a/Laravel/app/Http/Middleware/XmlLog.php b/Laravel/app/Http/Middleware/XmlLog.php
index 4e60ddc..ceff44d 100644
--- a/Laravel/app/Http/Middleware/XmlLog.php
+++ b/Laravel/app/Http/Middleware/XmlLog.php
@@ -25,6 +25,7 @@ class XmlLog
"接收申请单"=>'/api/v1/T/CreateEntrustRecordXml',
];
Log::info($request->getContent());
+
$insertid=0;
$data=[
'mark'=>array_search($request->getPathInfo(), $routers),
diff --git a/Laravel/app/Lib/Yz.php b/Laravel/app/Lib/Yz.php
index 7dcb3ad..12ee1cd 100644
--- a/Laravel/app/Lib/Yz.php
+++ b/Laravel/app/Lib/Yz.php
@@ -43,7 +43,7 @@ class Yz{
],
];
// 将数据转换为 XML
- $xml = simplexml_load_string('' . "\n");
+ $xml = simplexml_load_string('' . "");
array_walk_recursive($data, function($value, $key) use ($xml) {
$child = $xml->addChild($key, $value);
});
diff --git a/Laravel/app/Services/Xml/ShenQingDanService.php b/Laravel/app/Services/Xml/ShenQingDanService.php
index 6b1c23e..4979fd8 100644
--- a/Laravel/app/Services/Xml/ShenQingDanService.php
+++ b/Laravel/app/Services/Xml/ShenQingDanService.php
@@ -53,14 +53,15 @@ class ShenQingDanService
'reg_num', 'user_name', 'user_sex', 'entrust', 'is_pay',
'reservation_department', 'entrust_date', 'entrust_time',
'user_brithday', 'docotr', 'patient_type', 'user_phone',
- 'implement_department', 'entrust_id', 'episodeid',
- 'RISRExamID', 'RISRAcceptDeptCode'
+ 'implement_department', 'entrust_id', 'episodeid', 'RISRAcceptDeptCode'
];
// 判断是否为空
foreach ($requiredFields as $field) {
if (!isset($params[$field]) || $params[$field] === null) {
- return \Yz::echoError1('参数' . $field . '不能为空');
+ // return \Yz::echoError1('参数' . $field . '不能为空');
+ DB::rollBack();
+ return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '参数' . $field . '不能为空');
}
}
diff --git a/YiJi-admin/.env.production b/YiJi-admin/.env.production
index 53ac21d..eccfff5 100644
--- a/YiJi-admin/.env.production
+++ b/YiJi-admin/.env.production
@@ -1,6 +1,6 @@
ENV = 'production'
-VITE_APP_API_65 = 'http://10.50.120.166/YiJiYuYue/Laravel/public/api/'
-VITE_APP_FILE_34343 = 'http://10.50.120.166/YiJiYuYue/Laravel/public/'
+VITE_APP_API = 'http://10.50.120.166/YiJiYuYue/Laravel/public/api/'
+VITE_APP_FILE = 'http://10.50.120.166/YiJiYuYue/Laravel/public/'
-VITE_APP_API = 'https://yiji.yuluo.online/Laravel/public/api/'
-VITE_APP_FILE = 'https://yiji.yuluo.online/Laravel/public/'
+VITE_APP_API_6666 = 'https://yiji.yuluo.online/Laravel/public/api/'
+VITE_APP_FILE_555 = 'https://yiji.yuluo.online/Laravel/public/'
diff --git a/YiJi-admin/dist.zip b/YiJi-admin/dist.zip
index 2dd4990..c570749 100644
Binary files a/YiJi-admin/dist.zip and b/YiJi-admin/dist.zip differ