From bceee99e4493c359e2c0872e4076d3db95718b71 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java |   76 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 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 094243b..8bbd680 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
@@ -135,6 +135,9 @@
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Integer isMakeADeal;
 
+    //鍒楄〃鎺ュ彛 灏忕▼搴忎篃浣跨敤 鍖哄垎鏄惁鏄粠鐢ㄦ埛璇︽儏杩涘幓鐨�
+    private Integer isDetail;
+
     /**褰撳墠椤垫暟*/
     private Integer pageNum = 1;
     /**褰撳墠椤垫樉绀烘潯鏁�*/
@@ -143,6 +146,23 @@
     private String keyWord;
     /**鏌ヨ鏂瑰紡*/
     private String useType;
+
+    // --------- 澶嶈瘖琛ュ厖鏂板瓧娈�
+    //瀹㈡埛鐤戣檻
+    private String doubt;
+    //寮傝
+    private String dissent;
+    //棰勭畻
+    private String budget;
+    // 鎰熷叴瓒ｇ殑娲诲姩
+    private String interestedActivities;
+    //瀹汉鍚庣画鏄惁鏈夊畨鎺掍簨鎯呭拰宸ヤ綔
+    private String followUpWorks;
+
+
+    /***瀵煎尰鐢ㄦ埛娌荤枟灞忔搷浣滄椂 鏌ヨ鍜ㄨ璁板綍闇�瑕佽緭鍏ユ牎楠屽瘑鐮� 鐢ㄦ埛ciq鍚庡洓浣�**/
+    private String checkPassword;
+
     public ConsultRecordDto() {
     }
 
@@ -562,4 +582,60 @@
     public void setUseType(String useType) {
         this.useType = useType;
     }
+
+    public Integer getIsDetail() {
+        return isDetail;
+    }
+
+    public void setIsDetail(Integer isDetail) {
+        this.isDetail = isDetail;
+    }
+
+    public String getDoubt() {
+        return doubt;
+    }
+
+    public void setDoubt(String doubt) {
+        this.doubt = doubt;
+    }
+
+    public String getDissent() {
+        return dissent;
+    }
+
+    public void setDissent(String dissent) {
+        this.dissent = dissent;
+    }
+
+    public String getBudget() {
+        return budget;
+    }
+
+    public void setBudget(String budget) {
+        this.budget = budget;
+    }
+
+    public String getInterestedActivities() {
+        return interestedActivities;
+    }
+
+    public void setInterestedActivities(String interestedActivities) {
+        this.interestedActivities = interestedActivities;
+    }
+
+    public String getFollowUpWorks() {
+        return followUpWorks;
+    }
+
+    public void setFollowUpWorks(String followUpWorks) {
+        this.followUpWorks = followUpWorks;
+    }
+
+    public String getCheckPassword() {
+        return checkPassword;
+    }
+
+    public void setCheckPassword(String checkPassword) {
+        this.checkPassword = checkPassword;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0