From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java | 6 ++----
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 7 +++++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
index 77976ad..2bea684 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -40,4 +40,11 @@
/** 绛剧珷id */
private String sealId;
+
+ /** 瀹氫綅X杞翠綅缃� */
+ private String positionX;
+ /** 瀹氫綅Y杞翠綅缃� */
+ private String positionY;
+ /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
+ private int positionPageNo = 1;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
index 8dad0f7..bc77936 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -27,13 +27,11 @@
/** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
@RequestMapping(value="/fdd/sign/task/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
- , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
+ Result medicalRecordsSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);
/** 澶勬柟鍗� - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
@RequestMapping(value="/fdd/sign/task/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("id") String id
- , @RequestParam("loginRoleId") String loginRoleId, @RequestParam("redirectUrl")String redirectUrl);
+ Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);
/** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
@RequestMapping("/fdd/sign/task/cancelSignTask")
--
Gitblit v1.8.0