From e1972e6d92e6b57ecb65eb7998606e620d9f6811 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 11 四月 2024 17:22:39 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-颜值规划4.0
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java | 10
phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java | 28 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java | 40 +++
phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java | 16 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java | 27 ++
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java | 20 +
phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java | 21 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java | 16 +
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 3
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java | 24 ++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 5
phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java | 40 +++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 10
phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java | 37 +++
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 54 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 13 +
phis-feign/src/main/java/com/hz/his/dto/label/UserLabelAddDto.java | 18 +
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 5
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 6
phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java | 39 +++
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 53 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java | 36 +++
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java | 18 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 20 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java | 51 ++++
phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java | 16 +
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java | 21 +
28 files changed, 643 insertions(+), 8 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
index c1df09a..97d3bfb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -146,6 +146,19 @@
private String keyWord;
/**鏌ヨ鏂瑰紡*/
private String useType;
+
+ // --------- 澶嶈瘖琛ュ厖鏂板瓧娈�
+ //瀹㈡埛鐤戣檻
+ private String doubt;
+ //寮傝
+ private String dissent;
+ //棰勭畻
+ private String budget;
+ // 鎰熷叴瓒ｇ殑娲诲姩
+ private String interestedActivities;
+ //瀹汉鍚庣画鏄惁鏈夊畨鎺掍簨鎯呭拰宸ヤ綔
+ private String followUpWorks;
+
public ConsultRecordDto() {
}
@@ -573,4 +586,44 @@
public void setIsDetail(Integer isDetail) {
this.isDetail = isDetail;
}
+
+ public String getDoubt() {
+ return doubt;
+ }
+
+ public void setDoubt(String doubt) {
+ this.doubt = doubt;
+ }
+
+ public String getDissent() {
+ return dissent;
+ }
+
+ public void setDissent(String dissent) {
+ this.dissent = dissent;
+ }
+
+ public String getBudget() {
+ return budget;
+ }
+
+ public void setBudget(String budget) {
+ this.budget = budget;
+ }
+
+ public String getInterestedActivities() {
+ return interestedActivities;
+ }
+
+ public void setInterestedActivities(String interestedActivities) {
+ this.interestedActivities = interestedActivities;
+ }
+
+ public String getFollowUpWorks() {
+ return followUpWorks;
+ }
+
+ public void setFollowUpWorks(String followUpWorks) {
+ this.followUpWorks = followUpWorks;
+ }
}
\ No newline at end of file
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 393375f..6647a22 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
@@ -140,6 +140,11 @@
// 鏄惁鍙戦�佸垝鎵ｆ秷鎭� 0 鍚� 1 鏄�
private int isSentNotice = 1;
+ //浣滃簾鍒掓墸鍘熷洜绫诲瀷 瀹㈣瘔銆佸崌鍗曘�侀��娆俱�佹不鐤楁晥鏋滀笉婊℃剰銆佽/澶氬垝鎵ｃ�佸叾浠�
+ private String invalidReasonType;
+ //浣滃簾鍒掓墸鍘熷洜
+ private String invalidReason;
+
public DeductionDto() {
}
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
new file mode 100644
index 0000000..fdf078c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -0,0 +1,54 @@
+package com.hz.his.dto.fdd;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2024/3/6
+ **/
+@Data
+public class FddDto extends PageDto {
+
+ /** 鐢ㄦ埛鏍囪瘑 */
+ private String userId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
+ /** 闂ㄥ簵鏍囪瘑 */
+ private String shopId;
+
+ /** 绛剧讲妯℃澘ID */
+ private String signTemplateId;
+ /** 绛剧讲浠诲姟妯℃澘鍚嶇О */
+ private String signTemplateName;
+
+ /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+ private Integer opType;
+ /** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
+ private String loginRoleId;
+
+ /** 绛惧悕鍥剧墖璺緞 */
+ private String signImg;
+ /** 鐢ㄦ埛绫诲瀷 */
+ private Integer userType;
+ /** 鍏宠仈鏍囪瘑 */
+ private String commonId;
+
+ /** 閲嶅畾鍚戝湴鍧� */
+ private String redirectUrl;
+ /** 缂栫爜 */
+ private String codeNo;
+
+ /** 浣滃簾鍘熷洜锛岄暱搴︽渶澶�200瀛楃 */
+ private String reason;
+
+ /** 绛剧珷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/dto/fdd/FddTemplateDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java
new file mode 100644
index 0000000..a7576c2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto.fdd;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2024/3/6
+ **/
+@Data
+public class FddTemplateDto extends PageDto {
+
+ /** 妯℃澘绫诲瀷锛歞oc:鏂囨。妯℃澘/sign:绛剧讲妯℃澘 */
+ private String type;
+ /** 妯℃澘ID */
+ private String templateId;
+ /** 绛剧讲妯℃澘ID */
+ private String signTemplateId;
+ /** 鏂囨。妯℃澘ID */
+ private String docTemplateId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/label/UserLabelAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/label/UserLabelAddDto.java
new file mode 100644
index 0000000..e031a5d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/label/UserLabelAddDto.java
@@ -0,0 +1,18 @@
+package com.hz.his.dto.label;
+
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ */
+@Data
+public class UserLabelAddDto {
+
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鏍囩鍚�*/
+ private String labelName;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index a7bb2fa..dedcdc1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -12,7 +12,8 @@
**/
@Data
public class MicroRecordDto extends PageDto {
-
+ /**鏄惁鏌ヨ鏈�鏂扮殑*/
+ private Integer isSelectNew = 0;
/** 鐢ㄦ埛id */
private String userId;
/** 缇庨檯鐨偆鎶ュ憡鏍囪瘑 */
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 0e68d0c..b17c67c 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
@@ -59,15 +59,15 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
- /**璧犻�佸埌璐︾敤鎴�*/
+ /**璧犻�佸埌璐︾敤鎴�-锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private String giveIncreaseUserId;
- /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級*/
+ /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private BigDecimal giveIncrease;
- /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
+ /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private String giveIncreaseId;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseTitle;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseInfo;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java
new file mode 100644
index 0000000..615e26d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserTreatRecordDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.user;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛娌荤枟妗ｆdto
+ * @USER: fhx
+ * @DATE: 2024/2/23
+ **/
+@Data
+public class UserTreatRecordDto extends PageDto {
+
+ /** 鐢ㄦ埛鏍囪瘑 */
+ private String userId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
+ /** 寮�濮嬫椂闂� */
+ private String startTime;
+ /** 缁撴潫鏃堕棿 */
+ private String endTime;
+ /** 鐥呭巻绫诲瀷(瀛楀吀鑾峰彇) */
+ private String recordsType;
+ /** 澶勬柟绫诲瀷锛�1:鏅�氬鏂� 2:闈炴櫘閫氬鏂癸級 */
+ private Integer prescriptionType;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
index cbe32d9..0ff5a5a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.ToString;
+import java.util.List;
+
/**
* 鐢ㄦ埛璧勯噾
*
@@ -123,6 +125,9 @@
/**鏌ヨ涓嶅彲棰嗗彇鍘熷洜*/
private Integer isSelectNotUse = 0;
+ /**寰呴鍙栬褰曟爣璇嗛泦鍚�*/
+ private List<String> receiveIdList;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
* 搴旂敤绫诲瀷-绗笁鏂瑰钩鍙�
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
index c48d119..05f0770 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
@@ -3,6 +3,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import com.hz.his.dto.label.LabelTypePageDto;
+import com.hz.his.vo.label.LabelFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -28,4 +29,19 @@
@PostMapping(value = "/label/info/list")
Result getLabelInfoList(@RequestBody(required = false)PageDto pageDto);
+
+ /**
+ * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛撅紙鏍规嵁鑼冨洿鑾峰彇锛�
+ * @return Result鐨刣ata杞垚LabelTypeVo鐨勯泦鍚�
+ */
+ @PostMapping(value = "/label/type/tree/by-label")
+ Result getLabelTypeTreeByLabel(@RequestBody LabelFindVo labelFindVo);
+
+ /**鏍规嵁鑼冨洿鑾峰彇
+ * 鑾峰彇鐢ㄦ埛鏍囩
+ * @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
+ */
+ @PostMapping(value = "/label/user/label")
+ Result getLabelUserLabel(@RequestBody LabelFindVo labelFindVo);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
index c64c340..03dd41e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
@@ -1,8 +1,10 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
+import com.hz.his.vo.label.LabelFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -18,4 +20,12 @@
*/
@PostMapping(value = "/user/getUserLabel")
Result getUserLabel(@RequestParam("userId") String userId);
+
+ /**鏍规嵁鑼冨洿鑾峰彇
+ * 鑾峰彇鐢ㄦ埛鏍囩
+ * @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
+ */
+ @PostMapping(value = "/label/user/label/list")
+ Result getLabelUserLabel(@RequestBody LabelFindVo labelFindVo);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index 9e0b355..381af78 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -32,6 +32,12 @@
Result receive(@RequestBody UserMoneyDto userMoneyDto);
/**
+ * 寮�鏀惧钩鍙�-棰嗗彇鐢ㄦ埛璧勪骇-澶氭潯
+ */
+ @PostMapping(value = "/user/money/unclaimed/receive/more")
+ Result receiveMore(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
* 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛寰呴鍙栬褰�
*/
@PostMapping(value = "/user/money/unclaimed/cancel")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
new file mode 100644
index 0000000..2b34188
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserLabelService.java
@@ -0,0 +1,27 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.label.UserLabelVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-label")
+public interface SPhipUserLabelService {
+
+ /**鑷姩鎵撴爣绛炬帴鍙�
+ * 鐢ㄦ埛鏍囩鏂板锛屽彧鏂板-鏂扮増
+ */
+ @PostMapping(value = "/label/user/v2/auto-add")
+ Result autoAdd(@RequestBody UserLabelVo userLabelVo);
+
+ /**鐢ㄦ埛鏍囩鍙樻洿-鎵嬪姩鎵撴爣绛炬帴鍙�
+ * 褰撳墠鏍囩鍒嗙被涓嬮潰鐨勬墍鏈夊垎绫昏繘琛屽彉鏇达紝鍖呭惈鏂板鍜屽垹闄�-鏂扮増
+ */
+ @PostMapping(value = "/label/user/v2/update")
+ Result update(@RequestBody UserLabelVo userLabelVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index 2c73c3a..6952f60 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -141,4 +141,17 @@
*/
@PostMapping("/admin/consultant/report/appointment/arrive/late/detail/list")
Result appointmentArriveLateList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 椤鹃棶-鍚嶄笅浼氬憳+鍏捣閲婃斁浼氬憳鏈墽琛屾暟鎹�
+ */
+ @PostMapping("/admin/consultant/report/user/data/deduction/list")
+ Result userDataDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 椤鹃棶-鍚嶄笅浼氬憳+鍏捣閲婃斁浼氬憳鏈墽琛屾暟鎹�-瀵煎嚭
+ */
+ @PostMapping("/admin/consultant/report/user/data/deduction/list/export")
+ Result userDataDeductionExport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index 8fd0904..3dbd0af 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -94,12 +94,32 @@
*/
@PostMapping("/admin/doctor/sale/report/project/items/list/V2")
Result projectItemListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 閲嶇偣鍝侀」鏁版嵁-鎷嗗垎涓夊ぇ椤圭洰
+ */
+ @PostMapping("/admin/doctor/sale/report/project/items/list/V3")
+ Result projectItemListV3(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 瀹㈡埛棰勭害鍒拌鎯呭喌
*/
@PostMapping("/admin/doctor/sale/report/appoint/list/V2")
Result appointListV2(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 涓夊ぇ椤圭洰鎵ц涓氱哗
+ */
+ @PostMapping("/admin/doctor/sale/report/relation/project/list")
+ Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+ /**
+ * 鏈嶅姟闂ㄥ簵鎵ц鎸囨爣涓氱哗
+ */
+ @PostMapping("/admin/doctor/sale/report/shop/target/list")
+ Result shopTargetList(@RequestBody EmployeeReportDto employeeReportDto);
+
/*******************************涓嬮潰鎺ュ彛3.0搴熷純*********************************/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
index 3a6f609..30a3ff8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRelationProjectService.java
@@ -34,13 +34,19 @@
Result deductionCpList(@RequestBody ShopReportDto shopReportDto);
/**
- * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁
+ * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁 -2.0鐗堟湰
+ */
+ @PostMapping("/admin/project/relation/report/department/zs/list/V2")
+ Result deductionZsListV2(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * 鍐嶇敓閮�-鎵ц涓氱哗鏁版嵁 - 2.0搴熷純
*/
@PostMapping("/admin/project/relation/report/department/zs/list")
Result deductionZsList(@RequestBody ShopReportDto shopReportDto);
/**
- * 鍐嶇敓閮�-娓楅�忎笟缁╂暟鎹�
+ * 鍐嶇敓閮�-娓楅�忎笟缁╂暟鎹� - 2.0搴熷純
*/
@PostMapping("/admin/project/relation/report/department/zs/permeate/list")
Result deductionZsPermeateList(@RequestBody ShopReportDto shopReportDto);
@@ -52,4 +58,10 @@
Result deductionZsDoctorList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 鍖荤敓鎵ц涓氱哗鏁版嵁-鍚湇鍔￠棬搴楁寚鏍�
+ */
+ @PostMapping("/admin/project/relation/report/doctor/target/list")
+ Result deductionDoctorTargetList(@RequestBody ShopReportDto shopReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java
new file mode 100644
index 0000000..0066f54
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/poly/BiUserDoctorProjectService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.platform.bi.poly;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * 瀹㈡埛璧勬枡鍗�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name = "phiskin-bi-polymerize-service", path = "/bi-poly", contextId = "bi-poly-userDocPro")
+public interface BiUserDoctorProjectService {
+
+ /**
+ * 鍒濆鍖栨洿鏂�
+ */
+ @PostMapping("/user/doctor/relation/init/total")
+ Result init(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java
new file mode 100644
index 0000000..76b6456
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddService.java
@@ -0,0 +1,40 @@
+package com.hz.his.feign.service.platform.fdd;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
+import com.hz.his.dto.marketing.MarketActivityDto;
+import com.hz.his.dto.user.UserTreatRecordDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 娉曞ぇ澶ф巿鏉冨姛鑳絪ervice
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd")
+public interface SPhipFddService {
+
+ /** 鏌ヨ鐢ㄦ埛娉曞ぇ澶у姛鑳芥巿鏉冩暟鎹� */
+ @PostMapping(value = "/fdd/userFddAuthData")
+ Result userFddAuthData(@RequestBody FddDto dto);
+
+ /** 娉曞ぇ澶ф巿鏉冭璇侀摼鎺� */
+ @PostMapping(value = "/fdd/authUrl")
+ Result fddAuthUrl(@RequestBody FddDto dto);
+
+ /** 鎺堟潈鍚屾剰鍏嶉獙璇佺缃� */
+ @PostMapping(value = "/fdd/authFreeVisa")
+ Result authFreeVisa(@RequestBody FddDto dto);
+
+ /** 鏌ヨ涓汉绛惧悕鍒楄〃 */
+ @RequestMapping("/fdd/getPersonalSealList")
+ Result getPersonalSealList(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛惧悕璁剧疆鍏嶉獙璇佺閾炬帴 */
+ @RequestMapping("/fdd/getPersonalSealFreeSignUrl")
+ Result getPersonalSealFreeSignUrl(@RequestBody FddDto dto);
+}
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
new file mode 100644
index 0000000..99fb1fe
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddSignTaskService.java
@@ -0,0 +1,51 @@
+package com.hz.his.feign.service.platform.fdd;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 娉曞ぇ澶х缃蹭换鍔ervice
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd-sign-task")
+public interface SPhipFddSignTaskService {
+
+ /** 鑾峰彇绛剧讲闂ㄥ簵淇℃伅 */
+ @PostMapping(value = "/fdd/sign/task/getSignShop")
+ Result getSignShop(@RequestBody FddDto dto);
+
+ /** 鍙戣捣妯℃澘绛剧讲浠诲姟 */
+ @PostMapping(value = "/fdd/sign/task/template/signTask")
+ Result templateSignTask(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛剧讲浠诲姟鍙備笌浜洪摼鎺� to codeNo */
+ @PostMapping(value = "/fdd/sign/task/getSignTaskActorUrlToCodeNo")
+ Result getSignTaskActorUrlToCodeNo(@RequestBody FddDto dto);
+
+ /** 鐢靛瓙鐥呭巻 - 鍙戣捣娉曞ぇ澶х缃蹭换鍔� */
+ @RequestMapping(value="/fdd/sign/task/medicalRecords/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ 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("dataJson") String dataJson);
+
+ /** 浣滃簾(鎾ら攢绛剧讲浠诲姟) */
+ @RequestMapping("/fdd/sign/task/cancelSignTask")
+ Result cancelSignTask(@RequestBody FddDto dto);
+
+ /** 鑾峰彇绛剧讲浠诲姟鏂囦欢涓嬭浇鍦板潃 */
+ @PostMapping(value = "/fdd/sign/task/getSignTaskFileUrl")
+ Result getSignTaskFileUrl(@RequestBody FddDto dto);
+
+ /** 鏌ヨ绛剧讲瀹屾垚鐨勬枃浠� */
+ @PostMapping(value = "/fdd/sign/task/signTaskGetFile")
+ Result signTaskGetFile(@RequestBody FddDto dto);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java
new file mode 100644
index 0000000..9c2e47a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java
@@ -0,0 +1,36 @@
+package com.hz.his.feign.service.platform.fdd;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.fdd.FddDto;
+import com.hz.his.dto.fdd.FddTemplateDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 娉曞ぇ澶фā鏉跨鐞唖ervice
+ * @USER: fhx
+ * @DATE: 2023/8/2
+ **/
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-fdd-template")
+public interface SPhipFddTemplateService {
+
+ /** 娉曞ぇ澶х缃叉ā鏉垮垪琛� */
+ @PostMapping(value = "/fdd/template/signTemplateList")
+ Result signTemplateList(@RequestBody FddTemplateDto dto);
+
+ /** 鑾峰彇妯℃澘棰勮閾炬帴 */
+ @PostMapping(value = "/fdd/template/getTemplatePreviewUrl")
+ Result getTemplatePreviewUrl(@RequestBody FddTemplateDto dto);
+
+ /** 绛剧讲浠诲姟妯℃澘璇︽儏 */
+ @PostMapping(value = "/fdd/template/signTemplateDetail")
+ Result signTemplateDetail(@RequestBody FddTemplateDto dto);
+
+ /** 鏂囨。妯℃澘璇︽儏 */
+ @PostMapping(value = "/fdd/template/docTemplateDetail")
+ Result docTemplateDetail(@RequestBody FddTemplateDto dto);
+
+}
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
new file mode 100644
index 0000000..ae63cc7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
@@ -0,0 +1,16 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelFindVo {
+
+ /**鑼冨洿鏍囪瘑*/
+ private String rangeCode;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java
new file mode 100644
index 0000000..cad99c5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java
@@ -0,0 +1,37 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelTypeAddVo {
+
+ /**鏍囩鍒嗙被鏍囪瘑*/
+ private String id;
+ /**鏍囩鍒嗙被鍚嶇О*/
+ private String name;
+
+ /**閫夋嫨鍊兼暟閲忥紝涓嶅～鏃犻檺鍒�*/
+ private Integer selectValue;
+ /**鍙嚜瀹氫箟鏍囩锛�0鍚�1鏄�*/
+ private Integer customRule;
+
+ /**瀛愮被*/
+ private LabelTypeAddVo child;
+
+
+ public LabelTypeAddVo() {
+ }
+
+ public LabelTypeAddVo(String id, String name, Integer selectValue, Integer customRule) {
+ this.id = id;
+ this.name = name;
+ this.selectValue = selectValue;
+ this.customRule = customRule;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
new file mode 100644
index 0000000..122caa1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
@@ -0,0 +1,39 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelTypeVo {
+
+ /**鏍囩鍒嗙被鏍囪瘑*/
+ private String id;
+ /**鏍囩鍒嗙被鍚嶇О*/
+ private String name;
+
+ /**閫夋嫨鍊兼暟閲忥紝涓嶅～鏃犻檺鍒�*/
+ private Integer selectValue;
+ /**鍙嚜瀹氫箟鏍囩锛�0鍚�1鏄�*/
+ private Integer customRule;
+
+ /**鏍囩闆嗗悎*/
+ private List<LabelVo> labelList;
+ /**瀛愮被*/
+ private List<LabelTypeVo> childList = new ArrayList<>();
+
+
+ public LabelTypeVo() {
+ }
+
+ public LabelTypeVo(String id, String name,Integer selectValue,Integer customRule) {
+ this.id = id;
+ this.name = name;
+ this.selectValue = selectValue;
+ this.customRule = customRule;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
new file mode 100644
index 0000000..2781674
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
@@ -0,0 +1,40 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelVo {
+
+ /**鐢ㄦ埛鏍囩鏍囪瘑*/
+ private String id;
+ /**绯荤粺鏍囩鏍囪瘑*/
+ private String labelId;
+ /**绯荤粺鏍囩鍒嗙被鏍囪瘑*/
+ private String labelTypeId;
+ /**鏍囩鍚嶇О*/
+ private String name;
+ /**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
+ private Integer isCustom;
+
+ public LabelVo() {
+ }
+
+ public LabelVo(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public LabelVo(String id,String labelTypeId,String labelId, String name, Integer isCustom) {
+ this.id = id;
+ this.labelTypeId = labelTypeId;
+ this.labelId = labelId;
+ this.name = name;
+ this.isCustom = isCustom;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
new file mode 100644
index 0000000..6c9d765
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class UserLabelInfoVo {
+ /**鐢ㄦ埛鏍囩鏍囪瘑*/
+ private String id;
+ /**鏄惁鑷畾涔夛細0鍚�1鏄�-蹇呭～*/
+ private Integer isCustom;
+ /**绯荤粺鏍囩鏍囪瘑-閫夊～锛坕sCustom鏄�0蹇呭～锛�*/
+ private String labelId;
+ /**鏍囩鍚嶇О-閫夊～锛坕sCustom鏄�1蹇呭～锛�*/
+ private String labelName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
new file mode 100644
index 0000000..7108ce6
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
@@ -0,0 +1,21 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class UserLabelTypeVo {
+
+ /**绯荤粺鏍囩鍒嗙被鏍囪瘑-蹇呭～锛堣嚜鍔ㄦ墦鏍囩鍙┖锛�,璇ュ瓧娈垫瘮labelTypeAdd浼樺厛*/
+ private String labelTypeId;
+ /**鑷姩鐢熸垚鏍囩鍒嗙被-鑷姩鎵撴爣绛句娇鐢�*/
+ private LabelTypeAddVo labelTypeAdd;
+ /**鐢ㄦ埛鏍囩闆嗗悎*/
+ private List<UserLabelInfoVo> userLabelList;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java
new file mode 100644
index 0000000..ad314e2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java
@@ -0,0 +1,20 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class UserLabelVo {
+ /**鎵�灞炵敤鎴�-蹇呭～*/
+ private String userId;
+ /**鑼冨洿鏍囪瘑-蹇呭～*/
+ private String rangeCode;
+ /**鏂板/淇敼鐢ㄦ埛鏍囩鍒嗙被闆嗗悎*/
+ private List<UserLabelTypeVo> userLabelTypeList;
+ /**鍒犻櫎鐢ㄦ埛鏍囩闆嗗悎*/
+ private List<String> deleteLabelList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
index 683645f..f05f4ac 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardItemVo.java
@@ -13,6 +13,10 @@
private String itemId;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍚嶇О*/
private String itemName;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-绫诲瀷*/
+ private String itemType;
+ /**鐢ㄦ埛鍗￠」鏉＄洰-缂栧彿*/
+ private String itemCode;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍒嗘憡鎬婚噾棰�*/
private BigDecimal total;
/**鐢ㄦ埛鍗￠」鏉＄洰-鍗曟鎶垫墸閲戦*/
--
Gitblit v1.8.0