From 4c5d9b10c05a346a0b2b70bd9193ccdd49d97b32 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 29 五月 2023 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java                            |  578 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java |   30 ++
 2 files changed, 608 insertions(+), 0 deletions(-)

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
new file mode 100644
index 0000000..b94aef4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiRevenueRecognitionService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.bi.revenue.RevenueQuery;
+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-view-user", path = "/bi-view", contextId = "bi-revenue")
+public interface BiRevenueRecognitionService {
+
+    /**
+     * 鑾峰彇鍒楄〃
+     */
+    @PostMapping("/revenue/recogntion/list")
+    Result list(@RequestBody RevenueQuery revenueQuery);
+
+    /**
+     * 瀵煎嚭excel
+     */
+    @PostMapping("/revenue/recogntion/export/excel")
+    Result exportExcel(@RequestBody RevenueQuery revenueQuery);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
new file mode 100644
index 0000000..9840bb7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -0,0 +1,578 @@
+package com.hz.his.vo.bi.revenue;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *鏀跺叆纭琛ㄦ煡璇�
+ * @author CJH
+ */
+@Data
+public class RevenueQuery{
+
+    /**鍏朵粬鏌ヨ*/
+    private String KeyWord;
+    /**鐢ㄦ埛CIQ*/
+    private String CIQ;
+    /**鏄惁鍒掓墸*/
+    private Integer isDeduction;
+    /**鍒嗙被鍚嶇О(鍚屾椂鎼滅储涓�绾т簩绾�)*/
+    private String orderLevelTypeName;
+    /**鍏宠仈缂栧彿*/
+    private String associationNo;
+    /**涓嬪崟鏃ユ湡*/
+    private Date startOrderTime;
+    /**涓嬪崟鏃ユ湡*/
+    private Date endOrderTime;
+    /**鎵ц鏃ユ湡*/
+    private Date startDeductionTime;
+    /**鎵ц鏃ユ湡*/
+    private Date endDeductionTime;
+    /**鍒涘缓鏃ユ湡*/
+    private Date startCreateTime;
+    /**鍒涘缓鏃ユ湡*/
+    private Date endCreateTime;
+
+    /**璇锋眰鎿嶄綔浜�*/
+    private String operatorId;
+    /**璇锋眰鎿嶄綔浜�*/
+    private String operatorName;
+
+    @Column(comment = "鏉ユ簮绫诲瀷", length = 2, type = MySqlTypeConstant.INT, isNull = false)
+    private Integer sourceType;
+    @Column(comment = "鏉ユ簮绫诲瀷鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 10)
+    private String sourceTypeName;
+    @Index
+    @Column(comment = "鏉ユ簮鏍囪瘑(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍鏍囪瘑)", type = MySqlTypeConstant.VARCHAR, length = 32, isNull = false)
+    private String sourceId;
+    @Column(comment = "鏉ユ簮缂栧彿(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)", type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String sourceNo;
+    @Index
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(comment = "鏉ユ簮涓氱哗鏃堕棿", type = MySqlTypeConstant.DATETIME, isNull = false)
+    private Date sourceTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(comment = "鏉ユ簮鍒涘缓鏃堕棿", type = MySqlTypeConstant.DATETIME, isNull = false)
+    private Date sourceCreateTime;
+
+    @Column(comment = "鏉ユ簮鎬绘爣璇�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍鏍囪瘑)", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String sourceGeneralId;
+    @Column(comment = "鏉ユ簮鎬荤紪鍙�(鏍规嵁鏉ユ簮绫诲瀷瀛樺偍缂栧彿(渚�:鍗曞彿銆佸垝鎵ｅ彿)", type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String sourceGeneralNo;
+
+    @Column(comment = "钀ラ攢鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+    private String marketingType;
+    @Column(comment = "钀ラ攢鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String marketingTypeName;
+
+    @Column(comment = "钀ラ攢鍚嶇О", type = MySqlTypeConstant.VARCHAR,length = 128)
+    private String marketingName;
+
+    @Column(comment = "鍩虹鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+    private String basicType;
+    @Column(comment = "鍩虹鍒嗙被鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String basicTypeName;
+
+    @Column(comment = "涓�绾у垎绫�(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String firstLevelType;
+    @Column(comment = "涓�绾у垎绫诲悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String firstLevelTypeName;
+    @Column(comment = "浜岀骇鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String secondLevelType;
+    @Column(comment = "浜岀骇鍒嗙被鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String secondLevelTypeName;
+    @Column(comment = "鍒嗙被鐖剁被鍖呮嫭鑷繁JSON锛屾牸寮�:[{\"id\":\"娓犻亾鏍囪瘑\",\"name\":\"娓犻亾鍚嶇О\",\"parentId\":\"鐖剁被鏍囪瘑\"}]",  type = MySqlTypeConstant.TEXT,isNull = false)
+    private String classifyJson = "[]";
+
+    @Index
+    @Column(comment = "椤圭洰id/鍟嗗搧id锛堝叕鐢ㄦ爣璇嗭級", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String commonId;
+    @Column(comment = "椤圭洰缂栧彿/鍟嗗搧缂栫爜", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String commonNo;
+    @Column(comment = "椤圭洰鍚嶇О/鍟嗗搧鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String commonName;
+
+    @Column(comment = "瑙勬牸",  length = 128, type = MySqlTypeConstant.VARCHAR)
+    private String specification;
+    @Column(comment = "璧勮川", length = 128,  type = MySqlTypeConstant.VARCHAR)
+    private String qualification;
+    @Column(comment = "椤圭洰鍗曚綅", length = 128, type = MySqlTypeConstant.VARCHAR)
+    private String unit;
+
+    @Column(comment = "绉戝缂栧彿", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String departmentCode;
+    @Column(comment = "绉戝鍚嶇О",  length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String departmentName;
+
+    @Column(comment = "浠锋牸鏍囩", length = 128, type = MySqlTypeConstant.VARCHAR)
+    private String priceTag;
+
+    @Index
+    @Column(comment = "鏀惰垂璁㈠崟id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String payOrderId;
+    @Column(comment = "鏀惰垂鍗曞彿", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String payOrderNo;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @Column(comment="缁撶畻鏃堕棿(鏀惰垂鏃ユ湡)",type = MySqlTypeConstant.DATETIME)
+    private Date orderTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @Column(comment="鎵ц鏃ユ湡",type = MySqlTypeConstant.DATETIME)
+    private Date deductionTime;
+
+    @Column(comment = "涓氬姟绫诲瀷(PerformanceInfoEnum)",  type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String businessType;
+    @Column(comment = "涓氬姟绫诲瀷鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String businessTypeName;
+
+    @Index
+    @Column(comment = "鐢ㄦ埛id", length = 64, type = MySqlTypeConstant.VARCHAR, isNull = false)
+    private String userId;
+    @Column(comment = "浼氬憳鍙�(鐢ㄦ埛缂栧彿)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String memberNO;
+    @Column(comment = "CIQ", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String memberCIQ;
+    @Column(comment = "鐥呬緥鍙�", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String memberCaseNo;
+    @Column(comment = "瀹㈡埛绫诲埆", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String userClass;
+    @Column(comment="鏄惁棣栨鎵ц", length = 1, type = MySqlTypeConstant.INT)
+    private Integer isFirstDeduction;
+    @Column(comment="浼氬憳绛夌骇", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String userLevel;
+    @Column(comment="鐢ㄦ埛鍚嶇О", type = MySqlTypeConstant.VARCHAR)
+    private String userName;
+    @Column(comment="鍏变韩瀹㈡埛", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer shareCustomer;
+    @Column(comment = "瀹㈡埛绫诲瀷", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String userType;
+
+    @Column(comment = "鐧昏浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer registrantType;
+    @Index
+    @Column(comment = "鐧昏浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String registrantId;
+    @Column(comment = "鐧昏浜哄悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String registrantName;
+
+    @Index
+    @Column(comment = "鎵ц鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String deductionDoctorId;
+    @Column(comment = "鎵ц鍖荤敓鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String deductionDoctorName;
+
+    @Index
+    @Column(comment = "鍔╃悊鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String assistantDoctorId;
+    @Column(comment = "鍔╃悊鍖荤敓鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String assistantDoctorName;
+
+    @Index
+    @Column(comment = "缇庡甯圛d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String beauticianId;
+    @Column(comment = "缇庡甯堝悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String beauticianName;
+
+    @Index
+    @Column(comment = "璁㈠崟id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderId;
+    @Column(comment = "璁㈠崟缂栧彿", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderNo;
+
+    @Index
+    @Column(comment = "璁㈠崟鏉＄爜id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderItemId;
+    @Column(comment = "璁㈠崟鏉＄爜缂栧彿", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderItemNo;
+
+    @Column(comment = "寮�鍗曚汉绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer orderOpType;
+    @Index
+    @Column(comment = "寮�鍗曚汉Id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderOpId;
+    @Column(comment = "寮�鍗曚汉鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderOpName;
+
+
+    @Column(comment = "寮�鍙戜汉绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer developOpType;
+    @Column(comment = "寮�鍙戜汉Id", type = MySqlTypeConstant.VARCHAR)
+    private String developOpId;
+    @Column(comment = "寮�鍙戜汉鍚嶇О", type = MySqlTypeConstant.VARCHAR)
+    private String developOpName;
+
+    @Column(comment = "寮�鍙戜汉闂ㄥ簵鏍囪瘑", type = MySqlTypeConstant.VARCHAR,length = 64)
+    private String developShopId;
+    @Column(comment = "寮�鍙戜汉闂ㄥ簵鍚嶇О", type = MySqlTypeConstant.VARCHAR,length = 64)
+    private String developShopName;
+
+    @Column(comment = "鎵�灞炲挩璇㈠笀绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer belongConsultantType;
+    @Index
+    @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀id(Employee id) 鐢ㄦ埛鍒掓墸鏃剁殑鎵�灞炲挩璇㈠笀", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String belongConsultantId;
+    @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String belongConsultantName;
+
+    @Column(comment = "鐢ㄦ埛鎵�灞炲挩璇㈠笀鎵�灞為棬搴椾俊鎭�", type = MySqlTypeConstant.LONGTEXT)
+    private String belongConsultantShopInfo;
+
+    @Column(comment = "寮�鍗曞挩璇㈠笀绫诲瀷", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer orderConsultantType;
+    @Index
+    @Column(comment = "寮�鍗曞挩璇㈠笀id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderConsultantId;
+    @Column(comment = "寮�鍗曞挩璇㈠笀鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderConsultantName;
+
+    @Column(comment = "鏀堕摱鍜ㄨ甯堢被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer cashierConsultantType;
+    @Index
+    @Column(comment = "鏀堕摱鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String cashierConsultantId;
+    @Column(comment = "鏀堕摱鍜ㄨ甯堝悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String cashierConsultantName;
+
+    @Column(comment = "鎺ヨ瘖鍜ㄨ甯堝悕绉扮被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer receptionConsultantType;
+    @Index
+    @Column(comment = "鎺ヨ瘖鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String receptionConsultantId;
+    @Column(comment = "鎺ヨ瘖鍜ㄨ甯堝悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String receptionConsultantName;
+
+    @Column(comment = "鎵ц鍜ㄨ甯堢被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer deductionConsultantType;
+    @Index
+    @Column(comment = "鎵ц鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String deductionConsultantId;
+    @Column(comment = "鎵ц鍜ㄨ甯堝悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String deductionConsultantName;
+
+    @Column(comment = "鏀跺叆璁″叆", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String revenueRecordedType;
+    @Column(comment = "鏀跺叆璁″叆鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String revenueRecordedName;
+
+    @Column(comment = "鏀跺叆涓讳綋", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String revenueSubjectType;
+    @Column(comment = "鏀跺叆涓讳綋鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String revenueSubjectName;
+
+    @Column(comment = "鍘熷崟浠�", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal originalPrice = BigDecimal.ZERO;
+    @Column(comment = "鏁伴噺", type = MySqlTypeConstant.INT,length = 11)
+    private Integer quantity;
+    @Column(comment = "鏈墽琛屾鏁�", type = MySqlTypeConstant.INT)
+    private Integer notUsedNum;
+
+    @Column(comment = "鎶樻墸", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal discount = BigDecimal.ZERO;
+    @Column(comment = "鎶樺悗閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal discountAmount = BigDecimal.ZERO;
+    @Column(comment = "鏀堕摱閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal cashierAmount = BigDecimal.ZERO;
+
+    @Column(comment="鏄惁娆犺垂", length = 1, type = MySqlTypeConstant.INT)
+    private Integer isArrears;
+    @Column(comment = "棰勫畾閲�", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal deposit = BigDecimal.ZERO;
+    @Column(comment = "鍌ㄥ�奸噾", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal storedValueFund = BigDecimal.ZERO;
+    @Column(comment = "澧炲�奸噾", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal valueAddedFund = BigDecimal.ZERO;
+    @Column(comment = "绉垎", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal integral = BigDecimal.ZERO;
+    @Column(comment = "绉垎閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal integralAmount = BigDecimal.ZERO;
+    @Column(comment = "铏氭嫙閲戦", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal virtualAmount = BigDecimal.ZERO;
+
+    @Column(comment = "涓氱哗鎬婚", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal performanceTotal = BigDecimal.ZERO;
+    @Column(comment = "涓氱哗涓嶅惈绋�", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal performanceNotHasTax;
+    @Column(comment = "绋庨", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal taxAmount;
+
+    @Column(comment = "鏍囧噯鑰楁潗鎴愭湰", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal standardConsumablesCost = BigDecimal.ZERO;
+    @Column(comment = "瀹為檯鑰楁潗鎴愭湰", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal actualConsumablesCost = BigDecimal.ZERO;
+
+    @Column(comment = "娓犻亾鍒嗙被鏍囪瘑(ChannelsType)(蹇呭～锛屼唬鐮佸垽鏂�)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String channelsTypeId;
+    @Column(comment = "娓犻亾鍒嗙被鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String channelsTypeName;
+    @Column(comment = "娓犻亾鏍囪瘑", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String channelId;
+    @Column(comment = "娓犻亾鍚嶇О",  length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String channelName;
+
+    @Column(comment = "娓犻亾鑱旂郴浜虹被鍨�", length = 4, type = MySqlTypeConstant.TINYINT)
+    private Integer channelContactType;
+    @Index
+    @Column(comment = "娓犻亾鑱旂郴浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String channelContactId;
+    @Column(comment = "娓犻亾鑱旂郴浜哄悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String channelContactName;
+
+    @Column(comment = "娓犻亾鍚堜綔浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer channelPartnerType;
+    @Index
+    @Column(comment = "娓犻亾鍚堜綔浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String channelPartnerId;
+    @Column(comment = "娓犻亾鍚堜綔浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String channelPartnerName;
+
+    @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜虹被鍨�", length = 1, type = MySqlTypeConstant.TINYINT)
+    private Integer internalContactType;
+    @Index
+    @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String internalContactId;
+    @Column(comment = "璇婃墍鍐呴儴鑱旂粶浜哄悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String internalContactName;
+
+    @Column(comment = "鐢电綉鍜ㄨ甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String tmkServiceId;
+    @Column(comment = "鐢电綉鍜ㄨ甯堝悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String tmkServiceName;
+
+    @Column(comment = "瀹㈡湇id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String chatCorpUserId;
+    @Column(comment = "瀹㈡湇鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String chatCorpUserName;
+
+    @Column(comment = "鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String nurseCorpUserId;
+    @Column(comment = "鎶ゅ＋鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String nurseCorpUserName;
+
+    @Column(comment = "娲楁墜鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String handWashNurseId;
+    @Column(comment = "娲楁墜鎶ゅ＋鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String handWashNurseName;
+
+    @Column(comment = "宸″洖鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String circuitingNurseId;
+    @Column(comment = "宸″洖鎶ゅ＋鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String circuitingNurseName;
+
+    @Column(comment = "閰嶅彴鎶ゅ＋id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String tableNurseId;
+    @Column(comment = "閰嶅彴鎶ゅ＋鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String tableNurseName;
+
+    @Column(comment = "楹婚唹甯坕d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String anesthesiologistId;
+    @Column(comment = "楹婚唹甯堝悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String anesthesiologistName;
+
+    @Column(comment = "鐤楃▼鎬婚", length = 28, type = MySqlTypeConstant.DECIMAL)
+    private BigDecimal treatmentTotal;
+
+    @Column(comment = "TMK鐧昏浜篿d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String tmkRegistrantId;
+    @Column(comment = "TMK鐧昏浜哄悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String tmkRegistrantName;
+
+    @Column(comment = "鏀惰垂鍛榠d(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String chargeId;
+    @Column(comment = "鏀惰垂鍛樺悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String chargeName;
+
+    @Column(comment = "鏈嶅姟闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String serviceShopId;
+    @Column(comment = "鏈嶅姟闂ㄥ簵鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String serviceShopName;
+
+    @Column(comment = "鐢ㄦ埛鎵�灞為棬搴梚d", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String belongShopId;
+    @Column(comment = "鐢ㄦ埛鎵�灞為棬搴楀悕绉�", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String belongShopName;
+
+    @Column(comment = "涓嬪崟闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderShopId;
+    @Column(comment = "涓嬪崟闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderShopName;
+
+    @Column(comment = "鏀堕摱闂ㄥ簵id", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String cashierShopId;
+    @Column(comment = "鏀堕摱闂ㄥ簵鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String cashierShopName;
+
+    @Column(comment = "鏀惰垂澶囨敞", type = MySqlTypeConstant.TEXT)
+    private String chargeRemark;
+
+    @Column(comment = "钀ラ攢鏍囩", type = MySqlTypeConstant.TEXT)
+    private String marketingTag;
+
+    @Column(comment="鏄惁杞瘖杞枟", length = 1, type = MySqlTypeConstant.INT)
+    private Integer isTurn;
+    @Column(comment="鏄惁鍙墽琛岄」鐩�", length = 1, type = MySqlTypeConstant.INT)
+    private Integer isDeductionProject;
+    @Column(comment="鏄惁鐤楃▼椤圭洰", length = 1, type = MySqlTypeConstant.INT)
+    private Integer isTreatmentProject;
+
+    @Column(comment = "璐拱鏁伴噺", type = MySqlTypeConstant.INT,length = 11)
+    private Integer buyNum;
+    @Column(comment = "鐤楃▼娆℃暟", type = MySqlTypeConstant.INT,length = 11)
+    private Integer treatmentNum;
+    @Column(comment = "鐤楃▼鎬绘暟", type = MySqlTypeConstant.INT,length = 11)
+    private Integer treatmentTotality;
+    @Column(comment = "鐤楃▼搴忓彿", type = MySqlTypeConstant.INT,length = 11)
+    private Integer treatmentNo;
+
+    @Column(comment = "鍒掓墸澶囨敞", type = MySqlTypeConstant.TEXT)
+    private String deductionRemark;
+    @Column(comment = "鍏嶅崟鍘熷洜", type = MySqlTypeConstant.TEXT)
+    private String freeReason;
+
+    @Column(comment = "涓氱哗绫诲埆(PerformanceInfoEnum)", type = MySqlTypeConstant.VARCHAR, isNull = false)
+    private String performanceCategory;
+    @Column(comment = "涓氱哗绫诲埆鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String performanceCategoryName;
+
+    @Column(comment = "璁㈠崟绫诲瀷(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderType;
+    @Column(comment = "璁㈠崟绫诲瀷鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderTypeName;
+
+    @Column(comment = "璁㈠崟鍒嗙被(OrderItemConstants)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private int orderClassify;
+    @Column(comment = "璁㈠崟绫诲瀷鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderClassifyName;
+
+    @Column(comment = "瀹㈡埛鎴愪氦鏍囩", type = MySqlTypeConstant.TEXT)
+    private String customerTransactionTag;
+
+    @Column(comment = "璁㈠崟娓犻亾鍒嗙被鍚嶇О", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderChannelsTypeName;
+
+    @Column(comment = "璁㈠崟涓�绾у垎绫�(OrderItemConstants) 娓犻亾涓轰竴绾ф笭閬搃d 浼氬憳濉啓绌�", type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String orderFirstLevelType;
+    @Column(comment = "璁㈠崟涓�绾у垎绫诲悕绉�",  type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String orderFirstLevelTypeName;
+    @Column(comment = "璁㈠崟娓犻亾鐨刯son锛屾墍鏈夌埗绫诲寘鎷嚜宸�:[{\"id\":\"娓犻亾鏍囪瘑\",\"parentId\":\"鐖剁被娓犻亾鏍囪瘑\",\"name\":\"娓犻亾鍚嶇О\"}]", type = MySqlTypeConstant.TEXT)
+    private String orderChannelJson = "[]";
+    @Column(comment = "璁㈠崟娓犻亾涓�绾х紪鍙�", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel1No;
+    @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被鏍囪瘑", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel1TypeId;
+    @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel1TypeNo;
+    @Column(comment = "璁㈠崟娓犻亾涓�绾х殑鍒嗙被鍚嶇О", type = MySqlTypeConstant.VARCHAR, length = 50)
+    private String orderChannel1TypeName;
+
+    @Column(comment = "璁㈠崟浜岀骇鍒嗙被(OrderItemConstants) 娓犻亾涓轰簩绾ф笭閬搃d", type = MySqlTypeConstant.VARCHAR, length = 64)
+    private String orderSecondLevelType;
+    @Column(comment = "璁㈠崟浜岀骇鍒嗙被鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String orderSecondLevelTypeName;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel2No;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勮仈绯讳汉鍚嶇О", length = 50, type = MySqlTypeConstant.VARCHAR)
+    private String orderChannel2Contacts;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄦ爣璇�", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel2Depart;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勯儴闂ㄥ悕绉�", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel2DepartName;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫绘爣璇�", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel2TypeId;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫荤紪鍙�", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderChannel2TypeNo;
+    @Column(comment = "璁㈠崟娓犻亾浜岀骇鐨勫垎绫诲悕绉�", type = MySqlTypeConstant.VARCHAR, length = 50)
+    private String orderChannel2TypeName;
+    @Column(comment = "璁㈠崟娓犻亾鍚堜綔浜篒d", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderChannelPartnerId;
+    @Column(comment = "璁㈠崟娓犻亾鍚堜綔浜哄悕绉�", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderChannelPartnerName;
+
+    @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄垎绫绘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+    private String inviteeTypeId;
+    @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄垎绫诲悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String inviteeTypeName;
+    @Column(comment = "瀹㈡埛鎺ㄨ崘浜烘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+    private String inviteeId;
+    @Column(comment = "瀹㈡埛鎺ㄨ崘浜虹紪鍙�",length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String inviteeNo;
+    @Column(comment = "閭�璇蜂汉缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String inviteeCIQ;
+    @Column(comment = "瀹㈡埛鎺ㄨ崘浜哄悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String inviteeName;
+
+    @Column(comment = "璁㈠崟鎺ㄨ崘浜虹被鍨�", length = 32, type = MySqlTypeConstant.VARCHAR)
+    private String orderInviteeType;
+    @Column(comment = "璁㈠崟鎺ㄨ崘浜哄悕绉�",length = 32, type = MySqlTypeConstant.VARCHAR)
+    private String orderInviteeTypeName;
+    @Column(comment = "璁㈠崟鎺ㄨ崘浜烘爣璇�",length = 32, type = MySqlTypeConstant.VARCHAR)
+    private String orderInviteeId;
+    @Column(comment = "瀹㈡埛鎺ㄨ崘浜虹紪鍙�",length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderInviteeNo;
+    @Column(comment = "閭�璇蜂汉缂栧彿", type = MySqlTypeConstant.VARCHAR, length = 32)
+    private String orderInviteeCIQ;
+    @Column(comment = "璁㈠崟鎺ㄨ崘浜哄悕绉�",length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String orderInviteeName;
+    @Column(comment = "璁㈠崟鎺ㄨ崘浜鸿鑹蹭俊鎭�",length = 128, type = MySqlTypeConstant.VARCHAR)
+    private String orderInviteeRoleInfo;
+
+    @Index
+    @Column(comment = "浼氬憳涓昏瘖鍖荤敓Id(Employee id)", length = 64, type = MySqlTypeConstant.VARCHAR)
+    private String attendingDoctorId;
+    @Column(comment = "浼氬憳涓昏瘖鍖荤敓鍚嶇О", length = 64,  type = MySqlTypeConstant.VARCHAR)
+    private String attendingDoctorName;
+
+    @Column(comment = "娌荤枟鍗曠被鍨嬶紙OrderTotalConstants锛�", length = 2, type = MySqlTypeConstant.INT, isNull = false, defaultValue = "0")
+    private Integer treatOrderClassify;
+    @Column(comment = "娌荤枟鍗曠被鍨嬶紙OrderTotalConstants锛�", length = 32, type = MySqlTypeConstant.VARCHAR)
+    private String treatOrderClassifyName;
+
+    @Column(comment = "浼樻儬鍒稿彂鏀句汉" ,type = MySqlTypeConstant.LONGTEXT)
+    private String couponIssuer;
+    @Column(comment = "浼樻儬鍒稿彂鏀句汉瑙掕壊" ,type = MySqlTypeConstant.LONGTEXT)
+    private String couponIssuerRole;
+    @Column(comment = "浼樻儬鍒稿悕绉�" ,type = MySqlTypeConstant.LONGTEXT)
+    private String couponName;
+
+    @Column(comment = "涓绘笭閬�" ,type = MySqlTypeConstant.LONGTEXT)
+    private String mainChannelName;
+    @Column(comment = "鎵ц閮ㄤ綅" ,type = MySqlTypeConstant.LONGTEXT)
+    private String deductionBodyPartInfo;
+
+    /**椤垫暟*/
+    private Integer pageNum;
+    /**鏉℃暟*/
+    private Integer pageSize;
+
+    public Integer getPageNum() {
+        if(pageNum == null){
+            pageNum = 1;
+        }
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        if(pageSize == null || pageSize > 500){
+            pageSize = 20;
+        }
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}

--
Gitblit v1.8.0