From d87373b12e4217fe9a4ddd2aaaee952899ce0d63 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 六月 2024 14:53:09 +0800
Subject: [PATCH] 咨询记录-2024-06-03测
---
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 462 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 419 insertions(+), 43 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 ff6b1d4..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.hz.his.dto.PageDto;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
import java.util.Date;
import java.util.List;
@@ -10,35 +11,47 @@
/**
* 鍜ㄨ璁板綍dto 鏂扮増
*/
-public class ConsultRecordDto extends PageDto {
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+public class ConsultRecordDto{
//鐢ㄦ埛id
private String userId;
//闂ㄥ簵/璇婃墍ID
private String shopId;
- //鍜ㄨ绫诲瀷 0=鏍囧噯锛堟棫鐗堬級 1=鍒濊瘖 2=鐤楃▼鍐�/鍦ㄦ秷璐�/澶嶈瘖
+ //鍜ㄨ绫诲瀷 0=鏍囧噯锛堟棫鐗堬級 1=鍒濊瘖 2=澶嶈瘖
private Integer consultType;
- //鍩烘湰淇℃伅
- private String content;
+ //婊℃剰搴� 0=涓嶆弧鎰� 1=涓�鑸� 2=婊℃剰
+ private Integer satisfie;
//闈㈣瘖鍖荤敓id
private String faceDoctorId;
//娌荤枟鍖荤敓id
private String treatDoctorId;
+ //鍩烘湰淇℃伅
+ private String content;
//涓昏璇夋眰
private String appealDetail;
//娌荤枟鏂规&鎶ヤ环
private String treatPlanQuote;
//鍓傞噺鍙傛暟
private String dosageParams;
+ /**鏄惁鏃犳棦寰�鍙诧細0鍚�1鏄�*/
+ private Integer unanamnesis;
//鏃㈠線鐥呭彶
private String anamnesis;
- //鐗规畩淇℃伅璇存槑
- private String specialInfo;
- //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�(澶氫釜閫楀彿鎷兼帴)
+ //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�
private String hasTreatProjects;
+
+ /**鏃㈠線娌荤枟鏈烘瀯*/
+ private String anamTreatAgency;
+ /**鏃㈠線娌荤枟鍖荤敓*/
+ private String anamTreatDoctor;
+ /**鏃㈠線娌荤枟鍖荤敓*/
+ private String anamTreatSatisfaction;
+
//鏄惁鑽夌 0=鍚� 1=鏄�
private Integer isDraft;
- //鍒涘缓浜虹被鍨� 0 鏄憳宸� 1 鏄悗鍙�
+ //鍒涘缓浜虹被鍨� 0=鍛樺伐 1=鍚庡彴
private Integer adminType;
//鍒涘缓浜篿d
private String adminId;
@@ -46,33 +59,149 @@
private String adminName;
//闈㈣瘖鏂规
private String facePlan;
- //婊℃剰搴� 0=涓嶆弧鎰� 1=涓�鑸� 2=婊℃剰
- private Integer satisfie;
//鍒涘缓鏃堕棿
private Date createTime;
-
//鏈娌荤枟椤圭洰 澶氫釜閫楀彿鍒嗗壊
private String treatProjectIds;
//鎺ㄨ崘椤圭洰 澶氫釜閫楀彿鍒嗗壊
private String recommendProjectIds;
- //娌荤枟鍖荤敓鍚嶇О
- private String treatDoctorName;
+ //涓婃娌荤枟鍖荤敓ID
+ private String lastTreatDoctorId;
+ //涓婃娌荤枟椤圭洰json瀛楃涓� ["椤圭洰ID","椤圭洰ID"]
+ private String lastTreatProjects;
+ //鍜ㄨ鏂瑰紡浠ｇ爜
+ private String methodCode;
+ //鍜ㄨ鏂瑰紡鍚嶇О
+ 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;
- //璇︽儏杩斿洖鍊艰ˉ鍏�
+
+ //------------- 璇︽儏杩斿洖
+ //娌荤枟鍖荤敓鍚嶇О
+ private String faceDoctorName;
+ //娌荤枟鍖荤敓鍚嶇О
+ private String treatDoctorName;
+ //涓婃娌荤枟鍖荤敓鍚嶇О
+ private String lastTreatDoctorName;
+
+ //------------ 璇︽儏杩斿洖鍊艰ˉ鍏�
//娌荤枟椤圭洰
private List<Map<String,Object>> treatProjectList;
//鎺ㄨ崘椤圭洰
private List<Map<String,Object>> recommendProjectList;
+ //涓婃娌荤枟椤圭洰
+ private List<Map<String,Object>> lastTreatProjectList;
+ /**棰勭害椤圭洰闆嗗悎*/
+ private List<ConsultTreatProjectVo> preProjectList;
+ /**棰滃�艰鍒掗泦鍚�*/
+ private List<ConsultAppearancePlanVo> appearancePlanList;
+
+ //-------------- 鎼滅储鏉′欢
//灏忕▼搴忔悳绱㈡椂 鏈変釜椤甸潰鏄渶瑕佷紶鏃堕棿鐨�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
private String startTime;
+ @JsonInclude(JsonInclude.Include.NON_NULL)
private String endTime;
- //his鍔╂墜 鏌ヨ鍜ㄨ璁板綍鎸夌収鍒涘缓浜烘潵鏌ヨ
- private String employeeId;
+
+ //鎼滅储鏉′欢
+ //鐢ㄦ埛鍚嶆煡鎵�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String userName;
+ //瀹㈡埛鏉ユ簮娓犻亾鍒嗙被
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String channelsTypeId;
+ //瀹㈡埛鏉ユ簮涓�绾ф笭閬�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String channelId;
+ //瀹㈡埛鏉ユ簮浜岀骇娓犻亾
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String channel2Id;
+ //鍜ㄨ甯�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String hisCorpUserId;
+ //鐢ㄦ埛椤鹃棶鍚嶇О
+ private String hisCorpUserName;
+ //鎵嬫満鍙�
+ private String tel;
+ //鐢电綉鍜ㄨ甯�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String internetCorpUserId;
+ //瀹㈡湇
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String chatCorpUserId;
+ //鍒涘缓浜�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String createEmployeeId;
+ //鍒涘缓浜洪儴闂�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String createEmployeePartId;
+ //鍏虫敞娲诲姩
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String focusActivityId;
+ //鍒拌绫诲瀷
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String recentVisitType;
+ //鍒拌鐘舵��
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Integer recentVisitStatus;
+ //鏄惁鎴愪氦
+ @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() {
}
@@ -157,14 +286,6 @@
this.anamnesis = anamnesis;
}
- public String getSpecialInfo() {
- return specialInfo;
- }
-
- public void setSpecialInfo(String specialInfo) {
- this.specialInfo = specialInfo;
- }
-
public String getHasTreatProjects() {
return hasTreatProjects;
}
@@ -221,16 +342,6 @@
this.recommendProjectIds = recommendProjectIds;
}
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
public List<Map<String, Object>> getTreatProjectList() {
return treatProjectList;
}
@@ -263,6 +374,14 @@
this.satisfie = satisfie;
}
+ public String getFaceDoctorName() {
+ return faceDoctorName;
+ }
+
+ public void setFaceDoctorName(String faceDoctorName) {
+ this.faceDoctorName = faceDoctorName;
+ }
+
public String getTreatDoctorName() {
return treatDoctorName;
}
@@ -287,13 +406,6 @@
this.endTime = endTime;
}
- public String getEmployeeId() {
- return employeeId;
- }
-
- public void setEmployeeId(String employeeId) {
- this.employeeId = employeeId;
- }
public Date getCreateTime() {
return createTime;
@@ -302,4 +414,268 @@
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getChannelsTypeId() {
+ return channelsTypeId;
+ }
+
+ public void setChannelsTypeId(String channelsTypeId) {
+ this.channelsTypeId = channelsTypeId;
+ }
+
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getChannel2Id() {
+ return channel2Id;
+ }
+
+ public void setChannel2Id(String channel2Id) {
+ this.channel2Id = channel2Id;
+ }
+
+ public String getHisCorpUserId() {
+ return hisCorpUserId;
+ }
+
+ 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() {
+ return internetCorpUserId;
+ }
+
+ public void setInternetCorpUserId(String internetCorpUserId) {
+ this.internetCorpUserId = internetCorpUserId;
+ }
+
+ public String getChatCorpUserId() {
+ return chatCorpUserId;
+ }
+
+ public void setChatCorpUserId(String chatCorpUserId) {
+ this.chatCorpUserId = chatCorpUserId;
+ }
+
+ public String getCreateEmployeeId() {
+ return createEmployeeId;
+ }
+
+ public void setCreateEmployeeId(String createEmployeeId) {
+ this.createEmployeeId = createEmployeeId;
+ }
+
+ public String getCreateEmployeePartId() {
+ return createEmployeePartId;
+ }
+
+ public void setCreateEmployeePartId(String createEmployeePartId) {
+ this.createEmployeePartId = createEmployeePartId;
+ }
+
+ public String getFocusActivityId() {
+ return focusActivityId;
+ }
+
+ public void setFocusActivityId(String focusActivityId) {
+ this.focusActivityId = focusActivityId;
+ }
+
+ public String getRecentVisitType() {
+ return recentVisitType;
+ }
+
+ public void setRecentVisitType(String recentVisitType) {
+ this.recentVisitType = recentVisitType;
+ }
+
+ public Integer getRecentVisitStatus() {
+ return recentVisitStatus;
+ }
+
+ public void setRecentVisitStatus(Integer recentVisitStatus) {
+ this.recentVisitStatus = recentVisitStatus;
+ }
+
+ public Integer getIsMakeADeal() {
+ return isMakeADeal;
+ }
+
+ public void setIsMakeADeal(Integer isMakeADeal) {
+ this.isMakeADeal = isMakeADeal;
+ }
+
+ public String getLastTreatDoctorId() {
+ return lastTreatDoctorId;
+ }
+
+ public void setLastTreatDoctorId(String lastTreatDoctorId) {
+ this.lastTreatDoctorId = lastTreatDoctorId;
+ }
+
+ public String getLastTreatProjects() {
+ return lastTreatProjects;
+ }
+
+ public void setLastTreatProjects(String lastTreatProjects) {
+ this.lastTreatProjects = lastTreatProjects;
+ }
+
+ public String getLastTreatDoctorName() {
+ return lastTreatDoctorName;
+ }
+
+ public void setLastTreatDoctorName(String lastTreatDoctorName) {
+ this.lastTreatDoctorName = lastTreatDoctorName;
+ }
+
+ public List<Map<String, Object>> getLastTreatProjectList() {
+ return lastTreatProjectList;
+ }
+
+ public void setLastTreatProjectList(List<Map<String, Object>> lastTreatProjectList) {
+ this.lastTreatProjectList = lastTreatProjectList;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public Integer getPageNum() {
+ return pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ 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;
+ }
+
+ 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