From 7c23b9962d35e38ec6c4e0dd32d75027e69bf189 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 03 四月 2024 18:50:10 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-CRM预约
---
phis-feign/src/main/java/com/hz/his/dto/label/UserLabelAddDto.java | 18 +++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java | 2
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 5 +
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/UserLabelVo.java | 4
phis-feign/src/main/java/com/hz/his/dto/fdd/FddTemplateDto.java | 21 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/fdd/SPhipFddTemplateService.java | 36 +++++++
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/dto/fdd/FddDto.java | 52 ++++++++++
13 files changed, 293 insertions(+), 4 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 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..3c6f3f0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -0,0 +1,52 @@
+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;
+
+ /** 鐧诲綍鎿嶄綔浜鸿鑹瞚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/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/feign/service/phis/SUserLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserLabelService.java
index aeed15c..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
@@ -25,7 +25,7 @@
* 鑾峰彇鐢ㄦ埛鏍囩
* @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
*/
- @PostMapping(value = "/label/user/label")
+ @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/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/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/UserLabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java
index aa6e881..ad314e2 100644
--- 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
@@ -13,6 +13,8 @@
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