From 9d155e045fbf7b1c50b2d44873f84e7be5b2333d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 04 七月 2023 16:24:39 +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 | 19 ++++
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 137 +++++++++++++++++++++++++++++++---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java | 30 +++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 4 +
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 5 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java | 31 +++++++
6 files changed, 212 insertions(+), 14 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 5d1e9d1..db77806 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
@@ -2,26 +2,139 @@
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
- * @ClassName DeductionDto
- * @Description 鍒掓墸
- * @Author Wrh
- * @Date 2022/10/13 10:37
- * @Version 1.0
+ * 鍒掓墸鎺ュ彈鍙傛暟 鍏堟敼鍚嶅悗缁簾寮�
+ * author:andru
+ * Date:2021/12/10 14:41
*/
@Data
public class DeductionDto {
- /**鍒掓墸id*/
+ // 鍒掓墸璁板綍id
private String deductionSingleId;
- /**鐢ㄦ埛id*/
- private String userId;
- /**鏄惁瀹㈡埛纭(0:鍚︼紝1:鏄�)*/
- private Integer isCustomerConfirm;
- /**娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d*/
+
+ // 鐢ㄦ埛椤圭洰id
+ private String userProjectId;
+
+ // 鐢ㄦ埛椤圭洰瀛愰」id(鍏蜂綋鍒掓墸鐨勯」鐩暟鎹殑id)
+ private String userProjectItemId;
+
+ // 鍏敤鏍囪瘑 (棰勭害璁㈠崟濉啓id)
+ private String commonId;
+
+ // 娌荤枟閫氱煡鍗昳d
+ private String treatSingleId;
+
+ // 娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d
private String treatProjectId;
- /**椤圭洰id鍒楄〃*/
+
+ // 鎺ヨ瘖鍜ㄨ甯坕d
+ private String receptionConsultantId;
+
+ // 鏂板绫诲瀷 DeductionSingleConstants.TYPE_SELF_ADD 榛樿鑷
+ private String type = "self_add";
+
+ // 绉戝id(FamiliesRoom)
+ private String departmentId;
+ // 绉戝缂栧彿
+ private String departmentCode;
+ // 绉戝鍚嶇О
+ private String departmentName;
+
+ // 涓昏瘖鍖荤敓鏍囪瘑(Employee)
+ private String primaryDoctorId;
+ // 涓昏瘖鍖荤敓鍚嶇О
+ private String primaryDoctorName;
+
+ // 娌荤枟鍖荤敓鏍囪瘑(Employee)
+ private String treatmentDoctorId;
+ // 娌荤枟鍖荤敓鍚嶇О
+ private String treatmentDoctorName;
+
+ // 澶囨敞淇℃伅
+ private String remarkInfo;
+
+ // 鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴)
+ private String appId;
+
+ // 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～)
+ private String appIdCode;
+
+ // 鏉ユ簮浠ｇ爜锛堝簲鐢╝ppId锛�
+ private String sourceCode;
+
+ // 鏉ユ簮鍚嶇О
+ private String sourceName;
+
+ // 鏁伴噺/鍒掓墸娆℃暟
+ private Integer deductionNum = 0;
+
+ // 鎵ц寮�濮嬫椂闂�
+ private Date executeStartTime;
+
+ // 鎵ц缁撴潫鏃堕棿
+ private Date executeEndTime;
+
+ // 鍙備笌浜哄憳鏁版嵁 json
+ private String deductionJoinJson;
+
+ // 鍒掓墸椤圭洰娑堣�楀鏂�/鑽搧鏁版嵁 json
+ private String deductionDrugsJson;
+
+ // 鍒掓墸璁惧鍙傛暟鏁版嵁 json
+ private String deductionDeviceParameterJson;
+
+ // 瀹㈡埛绛惧悕鏁版嵁 json
+ private String deductionSignJson;
+
+ // 鍒掓墸韬綋閮ㄤ綅鏁版嵁 json
+ private String deductionBodyPartJson;
+
+ // 瀵规瘮鐓х墖璁板綍
+ private String comparePhotoRecordJson;
+
+ // 鎵归噺娣诲姞椤圭洰id鍒楄〃
+ private String userProjectIds;
+
+ // 闂ㄥ簵id
+ private String shopId;
+
+ // 鎿嶄綔浜哄憳宸d
+ private String operatorId;
+
+ // 鐢ㄦ埛id
+ private String userId;
+
+ // 鍒掓墸鏃ュ織寮�濮嬫椂闂�
+ private String logStartTime;
+
+ // 鍒掓墸鏃ュ織缁撴潫鏃堕棿
+ private String logEndTime;
+
+ // 鍒掓墸鏃ュ織-鏌ヨHis鍒掓墸鍒嗛〉鏃ュ織椤垫暟
+ private Integer page;
+
+ // 鍒掓墸鏃ュ織-鏌ヨHis鍒掓墸鍒嗛〉鏃ュ織鏉℃暟
+ private Integer size;
+
+ // 瀹㈡埛纭鐘舵��
+ private Integer isCustomerConfirm;
+
+ //閮ㄤ綅绫诲瀷锛圖eductionSingleConstants锛�
+ private Integer partType;
+ //璁㈠崟鍒嗙被锛圤rderTotalConstants锛�
+ private Integer orderClassify;
+
+ // 椤圭洰id鍒楄〃
private List<String> projectIds;
+
+ // phitab鍒掓墸鍒涘缓鏃堕棿
+ private Date phitabCreateTime;
+
+ public DeductionDto() {
+
+ }
}
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
new file mode 100644
index 0000000..8d3062e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.doctorTime;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @ClassName DoctorTimeDto
+ * @Description 鍖荤敓鎺掔彮dto
+ * @Author wrh
+ * @Date 2023/7/4 14:40
+ * @Version 1.0
+ */
+@Data
+public class DoctorTimeDto extends PageDto {
+
+ String monthStr;
+ String shopId;
+ String doctorId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index bc5dfb3..a0a1f97 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -26,4 +26,8 @@
private List<OrderItemPHisDto> orderItem;
/**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
private List<OrderDeveloperDto> orderDeveloper;
+
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
+
}
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 65fa209..a8b6967 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
@@ -50,6 +50,9 @@
private String otherOrderNo;
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
+
/**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
- private Integer directDeduction;
+ private Integer directDeduction = 0;
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
new file mode 100644
index 0000000..438240e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.phis;
+
+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;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName SActivityController
+ * @Description 娲诲姩瑙勫垯
+ * @Author Wrh
+ * @Date 2022/8/8 17:36
+ * @Version 1.0
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "doctorTime")
+public interface SDoctorTimeService {
+
+ /**
+ * 鑾峰彇鍖荤敓鎺掔彮鍒楄〃
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/list")
+ Result list(@RequestBody DoctorTimeDto dto);
+
+
+}
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 a347d90..a3397c3 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
@@ -24,7 +24,6 @@
@PostMapping(value = "/deduction/customer/confirm/all")
Result customerConfirmAll(@RequestBody DeductionDto dto);
-
/**
* 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁
*/
@@ -32,8 +31,38 @@
Result customerConfirmBefore(@RequestBody DeductionDto dto);
/**
+ * 瀹㈡埛纭鍒掓墸涔嬪墠椤甸潰鏁版嵁鎵�鏈夋湭纭鏁版嵁
+ */
+ @PostMapping(value = "/deduction/customer/confirm/all/before")
+ Result customerConfirmAllBefore(@RequestBody DeductionDto dto);
+
+ /**
* 鑾峰彇鐢ㄦ埛鍒掓墸淇℃伅涔嬪墠鐨勫尰鐢熶俊鎭�
*/
@PostMapping(value = "/deduction/project/before/doctor/info")
Result projectBeforeDoctorInfo(@RequestBody DeductionDto dto);
+
+ /**
+ * 鏂板鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/add")
+ Result addData(@RequestBody DeductionDto dto);
+
+ /**
+ * 淇敼鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/update")
+ Result updateData(@RequestBody DeductionDto dto);
+
+ /**
+ * 浣滃簾鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/rescinded")
+ Result rescindedData(@RequestBody DeductionDto dto);
+
+ /**
+ * 鍒犻櫎鍒掓墸璁板綍
+ */
+ @PostMapping(value = "/deduction/delete")
+ Result deleteData(@RequestBody DeductionDto dto);
}
\ No newline at end of file
--
Gitblit v1.8.0