From 82c3f19b64db521d2a28c8e5fdae4cc37bdea628 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 01 十一月 2022 15:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java | 4 +++-
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java
index b605114..7f239c0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java
@@ -31,4 +31,6 @@
private String userCardId;
/*鍗￠」id*/
private String cardId;
+ /*韬綋閮ㄤ綅 */
+ private String bodyPartType;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
index 98caee4..7b2ad58 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java
@@ -23,8 +23,10 @@
private String effectiveStartTime;
/**鏈夋晥缁撴潫*/
private String effectiveEndTime;
- /*鏄惁SPA(0:鍚�,1:鏄�)*/
+ /**鏄惁SPA(0:鍚�,1:鏄�)*/
private Integer isSpa;
+ /**鏄惁澶辨晥:0鍚�1鏄�,澶辨晥瀵瑰簲鏈夋晥鐘舵�佺殑4鍜�5*/
+ private Integer isInvalid;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java
index 6b249df..5c3eac7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java
@@ -50,4 +50,12 @@
Result del(@RequestBody PreOrderDto preOrderDto);
+ /**
+ * 鍒犻櫎棰勭害
+ */
+ @PostMapping(value = "/pre/order/updateStatus")
+ Result updateStatus(@RequestBody PreOrderDto preOrderDto);
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0