From 9fd5c6f5473e692b2f15d182d07bb5cf278f57a5 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 07 八月 2023 14:59:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckItemDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java | 10 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDoctorTimeService.java | 20 ++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4 ++++
6 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
index 8eb208c..d8eb62d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/appearance/AppearanceDto.java
@@ -35,6 +35,16 @@
/** 鍒拌璁㈠崟id(闂ㄥ簵鍔╂墜浣跨敤缁熻浣跨敤) */
private String visitOrderId;
+ /**鏁版嵁绫诲瀷(AppearanceConstants)*/
+ private Integer dataType;
+
+ /** 鐭湡瑙勫垝 */
+ private String shortPlan;
+ /** 涓湡瑙勫垝 */
+ private String middlePlan;
+ /** 闀挎湡瑙勫垝 */
+ private String longPlan;
+
public AppearanceDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckItemDto.java
index 31b7b0c..0feef60 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckItemDto.java
@@ -21,7 +21,7 @@
private String hisId;
/**鍟嗗搧phis绫诲瀷*/
private String hisType;
- /**鍟嗗搧鎵�灞瀙his鍒嗙被鏍囪瘑闆嗗悎*/
+ /**鍟嗗搧鎵�灞瀙his鍒嗙被鏍囪瘑闆嗗悎-涓嶇敤浼�*/
private List<String> hisTypeIdList;
/**鍗曚釜鍟嗗搧閲戦*/
private BigDecimal price;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index a79a32c..fdb98a9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -2,6 +2,7 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import org.dom4j.tree.BaseElement;
import java.math.BigDecimal;
import java.util.List;
@@ -47,4 +48,7 @@
private String couponGoodsArr;
/** 璁㈠崟搴斾粯閲戦 */
private BigDecimal shouldTotal;
+
+ /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
+ private Integer isMarketApply = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
index 249900a..2a1b367 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
@@ -23,4 +23,10 @@
Date endTime;
Integer intervalTime;
+ private String remark;
+ private Integer timeType;
+ private Integer isSpec;
+ private String opEmpName;
+ private String opEmpId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDoctorTimeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDoctorTimeService.java
new file mode 100644
index 0000000..b6e0744
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDoctorTimeService.java
@@ -0,0 +1,20 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.doctorTime.DoctorTimeDto;
+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-doctor-time")
+public interface SPhipDoctorTimeService {
+
+ /**
+ * 鍖荤敓鎺掔彮鏂板
+ * */
+ @PostMapping(value = "/doctor/time/add")
+ Result addDoctorTime(@RequestBody DoctorTimeDto doctorTimeDto);
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
index b94aef4..7b124a0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
@@ -21,6 +21,14 @@
Result list(@RequestBody RevenueQuery revenueQuery);
/**
+ * 鑾峰彇涓婃捣鍗洃璐圭敤鍒楄〃
+ * @param revenueQuery
+ * @return
+ */
+ @PostMapping("/revenue/recogntion/shanghai/hs/fee/list")
+ Result shanghaiHsFeeList(@RequestBody RevenueQuery revenueQuery);
+
+ /**
* 瀵煎嚭excel
*/
@PostMapping("/revenue/recogntion/export/excel")
--
Gitblit v1.8.0