From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 145 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 134 insertions(+), 11 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 772a66c..393375f 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,22 +2,145 @@
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;
+
+ // 鎺ヨ瘖鍜ㄨ甯坕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;
+
+ // 鍒掓墸鐓х墖json
+ private String deductionPictureJson;
+
+ // 鎵归噺娣诲姞椤圭洰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;
+
+ // 鏄惁鍙戦�佸垝鎵ｆ秷鎭� 0 鍚� 1 鏄�
+ private int isSentNotice = 1;
+
+ public DeductionDto() {
+
+ }
}
--
Gitblit v1.8.0