From abb5a863db85dd62045d7a2f463195d61029c9e5 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 01 六月 2023 10:56:03 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 4 ++--
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 10 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 13 +++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java | 6 +++++-
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index fe99df4..772a66c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -18,6 +18,6 @@
private String userId;
/**鏄惁瀹㈡埛纭(0:鍚︼紝1:鏄�)*/
private Integer isCustomerConfirm;
-
-
+ /**娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d*/
+ private String treatProjectId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index c374225..5a20166 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -178,6 +178,9 @@
/** 鐢ㄦ埛鍏磋叮鐖卞ソjson */
private String userInterestsJson;
+ /** 绉戝鍏崇郴json */
+ private String departmentJson;
+
/** email */
private String email;
@@ -222,6 +225,11 @@
/** 鎼滅储锛氬仛杩囬」鐩� */
private String projectName;
+ /** 鍖荤敓id */
+ private String doctorId;
+ /** 閮ㄩ棬id */
+ private String department;
+
/** 鐢ㄦ埛娑堣垂鏃堕棿锛堝紑濮嬶級锛屾牸寮忥細yyyy-MM-dd HH:mm:ss */
private String consumeStartTime;
@@ -229,6 +237,9 @@
private String createStartTime;
/** 鎼滅储锛氱敤鎴峰垱寤烘椂闂达紙缁撴潫锛夛紝鏍煎紡锛歽yyy-MM-dd HH:mm:ss */
private String createEndTime;
+
+ public UserParamDto() {
+ }
/**鎬у埆-鏈煡*/
public static final Integer SEX_UNKNOWN = 0;
@@ -260,4 +271,6 @@
//淇敼鎿嶄綔鐨勫娉�
private String note;
+
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
index 9067cda..a347d90 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -31,5 +31,9 @@
@PostMapping(value = "/deduction/customer/confirm/before")
Result customerConfirmBefore(@RequestBody DeductionDto dto);
-
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒掓墸淇℃伅涔嬪墠鐨勫尰鐢熶俊鎭�
+ */
+ @PostMapping(value = "/deduction/project/before/doctor/info")
+ Result projectBeforeDoctorInfo(@RequestBody DeductionDto dto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index ceb54ae..a1816d4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -85,5 +85,15 @@
@PostMapping("/attention/product/record/edit")
Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info")
+ Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+ /**
+ * 寮�鏀惧钩鍙�-淇敼鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info/update")
+ Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
--
Gitblit v1.8.0