From b92f672511421c4f1b673242ef6ac5b186d10d1a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 09 Dec 2020 09:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
index b63f0e4..fe8379d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
@@ -6,8 +6,10 @@
import com.kidgrow.oprationcenter.feign.fallback.DiagnosticServiceFallbackFactory;
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Map;
/**
@@ -24,6 +26,12 @@
/**
* feign rpc访问远程 接口
*/
- @PostMapping(value = "/diagnostic/diagnosticitem")
- ResultBody<PageResult> getDiagnosticItemList(@RequestBody Map<String, Object> params);
+ @GetMapping(value = "/diagnostic/diagnosticitem")
+ ResultBody<PageResult> getDiagnosticItemList(@RequestParam Map<String, Object> params);
+
+ /**
+ * feign rpc访问远程 接口
+ */
+ @PostMapping(value = "/ReportRecord/operation/pdfname/{diagnosticId}/{reportType}/{hospitalId}/{departId}")
+ ResultBody getPdfPathForOperation(@PathVariable("diagnosticId") String diagnosticId,@PathVariable("reportType") Integer reportType,@PathVariable("hospitalId") Long hospitalId,@PathVariable("departId") Long departId);
}
--
Gitblit v1.8.0