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/consultation/ConsultRecordDto.java |   80 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
index 663dd5a..c1df09a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -17,7 +17,7 @@
     private String userId;
     //闂ㄥ簵/璇婃墍ID
     private String shopId;
-    //鍜ㄨ绫诲瀷 0=鏍囧噯锛堟棫鐗堬級 1=鍒濊瘖 2=澶嶈瘖 3=澶嶆煡 4=鐤楃▼鍐� 5=鍐嶆秷璐� 6=娌夌潯瀹�
+    //鍜ㄨ绫诲瀷 0=鏍囧噯锛堟棫鐗堬級 1=鍒濊瘖 2=澶嶈瘖
     private Integer consultType;
     //婊℃剰搴� 0=涓嶆弧鎰� 1=涓�鑸� 2=婊℃剰
     private Integer satisfie;
@@ -54,22 +54,24 @@
     //鎺ㄨ崘椤圭洰 澶氫釜閫楀彿鍒嗗壊
     private String recommendProjectIds;
     //涓婃娌荤枟鍖荤敓ID
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String lastTreatDoctorId;
     //涓婃娌荤枟椤圭洰json瀛楃涓� ["椤圭洰ID","椤圭洰ID"]
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String lastTreatProjects;
+    //鍜ㄨ鏂瑰紡浠ｇ爜
+    private String methodCode;
+    //鍜ㄨ鏂瑰紡鍚嶇О
+    private String methodCodeName;
 
     //------------- 淇敼浼犲��
     private String id;
 
 
-    //------------- 闈炲垵璇� 澶嶈瘖 璇︽儏杩斿洖
+    //------------- 璇︽儏杩斿洖
     //娌荤枟鍖荤敓鍚嶇О
-    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String faceDoctorName;
+    //娌荤枟鍖荤敓鍚嶇О
     private String treatDoctorName;
     //涓婃娌荤枟鍖荤敓鍚嶇О
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String lastTreatDoctorName;
 
     //------------ 璇︽儏杩斿洖鍊艰ˉ鍏�
@@ -104,6 +106,10 @@
     //鍜ㄨ甯�
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String hisCorpUserId;
+    //鐢ㄦ埛椤鹃棶鍚嶇О
+    private String hisCorpUserName;
+    //鎵嬫満鍙�
+    private String tel;
     //鐢电綉鍜ㄨ甯�
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String internetCorpUserId;
@@ -129,13 +135,17 @@
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Integer isMakeADeal;
 
+    //鍒楄〃鎺ュ彛 灏忕▼搴忎篃浣跨敤 鍖哄垎鏄惁鏄粠鐢ㄦ埛璇︽儏杩涘幓鐨�
+    private Integer isDetail;
+
     /**褰撳墠椤垫暟*/
     private Integer pageNum = 1;
     /**褰撳墠椤垫樉绀烘潯鏁�*/
     private Integer pageSize = 20;
     /**鍏抽敭瀛�*/
     private String keyWord;
-
+    /**鏌ヨ鏂瑰紡*/
+    private String useType;
     public ConsultRecordDto() {
     }
 
@@ -307,6 +317,14 @@
         this.satisfie = satisfie;
     }
 
+    public String getFaceDoctorName() {
+        return faceDoctorName;
+    }
+
+    public void setFaceDoctorName(String faceDoctorName) {
+        this.faceDoctorName = faceDoctorName;
+    }
+
     public String getTreatDoctorName() {
         return treatDoctorName;
     }
@@ -378,6 +396,22 @@
 
     public void setHisCorpUserId(String hisCorpUserId) {
         this.hisCorpUserId = hisCorpUserId;
+    }
+
+    public String getHisCorpUserName() {
+        return hisCorpUserName;
+    }
+
+    public void setHisCorpUserName(String hisCorpUserName) {
+        this.hisCorpUserName = hisCorpUserName;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
     }
 
     public String getInternetCorpUserId() {
@@ -507,4 +541,36 @@
     public void setKeyWord(String keyWord) {
         this.keyWord = keyWord;
     }
+
+    public String getMethodCode() {
+        return methodCode;
+    }
+
+    public void setMethodCode(String methodCode) {
+        this.methodCode = methodCode;
+    }
+
+    public String getMethodCodeName() {
+        return methodCodeName;
+    }
+
+    public void setMethodCodeName(String methodCodeName) {
+        this.methodCodeName = methodCodeName;
+    }
+
+    public String getUseType() {
+        return useType;
+    }
+
+    public void setUseType(String useType) {
+        this.useType = useType;
+    }
+
+    public Integer getIsDetail() {
+        return isDetail;
+    }
+
+    public void setIsDetail(Integer isDetail) {
+        this.isDetail = isDetail;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0