From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 22 五月 2024 11:37:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊

---
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java |  121 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 116 insertions(+), 5 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 d45a363..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
@@ -54,10 +54,8 @@
     //鎺ㄨ崘椤圭洰 澶氫釜閫楀彿鍒嗗壊
     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;
@@ -68,12 +66,12 @@
     private String id;
 
 
-    //------------- 闈炲垵璇� 澶嶈瘖 璇︽儏杩斿洖
+    //------------- 璇︽儏杩斿洖
     //娌荤枟鍖荤敓鍚嶇О
-    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String faceDoctorName;
+    //娌荤枟鍖荤敓鍚嶇О
     private String treatDoctorName;
     //涓婃娌荤枟鍖荤敓鍚嶇О
-    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String lastTreatDoctorName;
 
     //------------ 璇︽儏杩斿洖鍊艰ˉ鍏�
@@ -108,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;
@@ -133,12 +135,33 @@
     @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;
+
+    // --------- 澶嶈瘖琛ュ厖鏂板瓧娈�
+    //瀹㈡埛鐤戣檻
+    private String doubt;
+    //寮傝
+    private String dissent;
+    //棰勭畻
+    private String budget;
+    // 鎰熷叴瓒ｇ殑娲诲姩
+    private String interestedActivities;
+    //瀹汉鍚庣画鏄惁鏈夊畨鎺掍簨鎯呭拰宸ヤ綔
+    private String followUpWorks;
+
+
+    /***瀵煎尰鐢ㄦ埛娌荤枟灞忔搷浣滄椂 鏌ヨ鍜ㄨ璁板綍闇�瑕佽緭鍏ユ牎楠屽瘑鐮� 鐢ㄦ埛ciq鍚庡洓浣�**/
+    private String checkPassword;
 
     public ConsultRecordDto() {
     }
@@ -311,6 +334,14 @@
         this.satisfie = satisfie;
     }
 
+    public String getFaceDoctorName() {
+        return faceDoctorName;
+    }
+
+    public void setFaceDoctorName(String faceDoctorName) {
+        this.faceDoctorName = faceDoctorName;
+    }
+
     public String getTreatDoctorName() {
         return treatDoctorName;
     }
@@ -382,6 +413,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() {
@@ -527,4 +574,68 @@
     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;
+    }
+
+    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