From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java |  125 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 125 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 cc3a354..f5e506b 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
@@ -1,6 +1,7 @@
 package com.hz.his.dto.consultation;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
@@ -11,6 +12,7 @@
  * 鍜ㄨ璁板綍dto 鏂扮増
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
 public class ConsultRecordDto{
 
     //鐢ㄦ埛id
@@ -33,10 +35,20 @@
     private String treatPlanQuote;
     //鍓傞噺鍙傛暟
     private String dosageParams;
+    /**鏄惁鏃犳棦寰�鍙诧細0鍚�1鏄�*/
+    private Integer unanamnesis;
     //鏃㈠線鐥呭彶
     private String anamnesis;
     //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�
     private String hasTreatProjects;
+
+    /**鏃㈠線娌荤枟鏈烘瀯*/
+    private String anamTreatAgency;
+    /**鏃㈠線娌荤枟鍖荤敓*/
+    private String anamTreatDoctor;
+    /**鏃㈠線娌荤枟鍖荤敓*/
+    private String anamTreatSatisfaction;
+
     //鏄惁鑽夌 0=鍚� 1=鏄�
     private Integer isDraft;
     //鍒涘缓浜虹被鍨� 0=鍛樺伐 1=鍚庡彴
@@ -62,6 +74,28 @@
     //鍜ㄨ鏂瑰紡鍚嶇О
     private String methodCodeName;
 
+    /**鏈垚浜ゅ師鍥�*/
+    private String description;
+    /**鐢ㄦ埛鑱屼笟*/
+    private String userCareer;
+    /**浣滄伅*/
+    private String workRest;
+    /**鎬ф牸*/
+    private String characterInfo;
+    /**鐢ㄦ埛鍠滃ソ*/
+    private String userLike;
+    /**濠氬Щ鐘跺喌*/
+    private Integer maritalStatus = 0;
+    /**澶囧瓡鎯呭喌*/
+    private Integer preparationPregnancy = 0;
+
+    /**杩囨晱鍙�*/
+    private String allergyHistory;
+    /**鐤剧梾鍙�*/
+    private String diseaseHistory;
+    /**鐧藉厜缇庣揣鑲屽鐢熻瘎浼�*/
+    private String estimateMapper;
+
     //------------- 淇敼浼犲��
     private String id;
 
@@ -81,6 +115,10 @@
     private List<Map<String,Object>> recommendProjectList;
     //涓婃娌荤枟椤圭洰
     private List<Map<String,Object>> lastTreatProjectList;
+    /**棰勭害椤圭洰闆嗗悎*/
+    private List<ConsultTreatProjectVo> preProjectList;
+    /**棰滃�艰鍒掗泦鍚�*/
+    private List<ConsultAppearancePlanVo> appearancePlanList;
 
 
     //-------------- 鎼滅储鏉′欢
@@ -135,12 +173,35 @@
     @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 specialSituation;
+    //寮傝
+    private String dissent;
+    //棰勭畻
+    private String budget;
+    // 鎰熷叴瓒ｇ殑娲诲姩
+    private String interestedActivities;
+    //瀹汉鍚庣画鏄惁鏈夊畨鎺掍簨鎯呭拰宸ヤ綔
+    private String followUpWorks;
+
+
+    /***瀵煎尰鐢ㄦ埛娌荤枟灞忔搷浣滄椂 鏌ヨ鍜ㄨ璁板綍闇�瑕佽緭鍏ユ牎楠屽瘑鐮� 鐢ㄦ埛ciq鍚庡洓浣�**/
+    private String checkPassword;
 
     public ConsultRecordDto() {
     }
@@ -553,4 +614,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