From 5fe107b01e611e03034efbb76b97c3faae539f6b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 25 四月 2025 11:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
index d5508dd..a0b4db6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -50,16 +50,16 @@
aBoolean = serviceExternalService.generalInterface(dataMap);
} catch (Exception e) {
e.printStackTrace();
- log.error("serviceExternal---addDeptInfo鍑哄紓甯镐簡锛歿}", e.getMessage());
+ log.error("serviceExternal---generalInterface鍑哄紓甯镐簡锛歿}", e.getMessage());
aBoolean = false;
}
return returnParam(aBoolean, dataMap);
}
/**
- * 鏂板浠诲姟
+ * 鏂板浣撴浠诲姟杩涘瓙浠诲姟
*/
- @ApiOperation("鏂板浠诲姟")
+ @ApiOperation("鏂板浣撴浠诲姟杩涘瓙浠诲姟")
@PostMapping("/generalInterfaceAddTask")
public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) {
log.error("------serviceTaskInfo鐨勫�间负锛歿}", serviceTaskInfo);
@@ -80,6 +80,7 @@
@ApiOperation("360鎮ｈ�呬俊鎭幏鍙�")
@PostMapping("/query360PatInfo")
public Map query360PatInfo(@RequestBody ServiceQueryInfo serviceQueryInfo) {
+ log.error("------serviceQueryInfo鐨勫叆鍙備负锛歿}", serviceQueryInfo);
Map map = null;
try {
map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
@@ -229,6 +230,23 @@
}
/**
+ * 鏂板鍑洪櫌鐧昏淇℃伅
+ */
+ @ApiOperation("鏂板棰勫嚭闄㈢櫥璁颁俊鎭�")
+ @PostMapping("/addPreOutHospInfo")
+ public Map<String, Object> addPreOutHospInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addPreOutHospInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addPreOutHospInfo锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+ }
+
+ /**
* 鏂板瀹屾垚鎺ヨ瘖淇℃伅
*/
@ApiOperation("鏂板瀹屾垚鎺ヨ瘖淇℃伅")
--
Gitblit v1.9.3