From c4d73aa5200c7da5aec927096c8290f968ad19b3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 20 五月 2024 16:19:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java | 10 ++++++++++
phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java | 5 +++--
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java | 25 +++++++++++++++++++++++++
6 files changed, 48 insertions(+), 2 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 c273def..79b5aee 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
@@ -56,6 +56,10 @@
private String positionY;
/** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
private int positionPageNo = 1;
+ /** 绛惧悕瀹藉害 */
+ private Integer width;
+ /** 绛惧悕楂樺害 */
+ private Integer height;
//鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌
/** 鍙備笌浜虹被鍨�(FddActorConstants) */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index 9ed4794..cef0e81 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -24,6 +24,8 @@
private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
+ private Boolean isCanUseIntegralCash = false;
/**鎶垫墸鐜伴噾閲戦*/
private BigDecimal cash = BigDecimal.ZERO;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
@@ -35,6 +37,8 @@
/**闈炲繀濉� 绗笁鏂筰tem鏍囪瘑 */
private String commonItemId;
+ /**闈炲繀濉� 绗笁鏂筰tem鐨剆pu鏍囪瘑 */
+ private String commonItemGoodsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鏍囪瘑 */
private String bodyPartsId;
/**闈炲繀濉� 韬綋閮ㄤ綅鍚嶇О */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index b17c67c..81e9e45 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -69,5 +69,7 @@
private String giveIncreaseTitle;
/**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseInfo;
+ /**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
+ private List<String> canIntegralCashIdList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
index e0866b0..7c2d9e2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/pretriage/UserPretriageInfoDto.java
@@ -42,6 +42,8 @@
private List<UserPretriageProjectDto> pretriageProjectList;
//鏍囩list
private List<UserPretriageLabelDto>pretriageLabelList;
+ //鍒濊瘖鍗℃爣绛緇ist
+ private List<UserPretriageLabelDto> firstVisitLabelList;
//棰勭害鍗旾D
private String appointmentId;
@@ -216,4 +218,12 @@
public void setLabelIds(List<String> labelIds) {
this.labelIds = labelIds;
}
+
+ public List<UserPretriageLabelDto> getFirstVisitLabelList() {
+ return firstVisitLabelList;
+ }
+
+ public void setFirstVisitLabelList(List<UserPretriageLabelDto> firstVisitLabelList) {
+ this.firstVisitLabelList = firstVisitLabelList;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java
new file mode 100644
index 0000000..e815426
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MDoctorService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.marketing;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢鍔╂墜瀹℃牳鎺ュ彛
+ */
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-doctor")
+public interface MDoctorService {
+
+ /**
+ * 鐐硅瘖鍖荤敓鎺ュ彛
+ */
+ @PostMapping(value = "/doctor/apply/diagnosis/add")
+ Result diagnosisAdd(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
index ae63cc7..835b7f5 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
@@ -7,8 +7,9 @@
*/
@Data
public class LabelFindVo {
-
- /**鑼冨洿鏍囪瘑*/
+ /**鑼冨洿鏍囪瘑-鏂�(鍥犱负鏃у瓧娈电殑澶勭悊鏌ヨ琚睆钄�)*/
+ private String rangeCodeNew;
+ /**鑼冨洿鏍囪瘑-鏃�*/
private String rangeCode;
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
--
Gitblit v1.8.0