From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 218 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 183 insertions(+), 35 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 d6b575a..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
@@ -1,6 +1,6 @@
package com.hz.his.dto.consultation;
-import com.hz.his.dto.PageDto;
+import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.Date;
import java.util.List;
@@ -10,20 +10,23 @@
/**
* 鍜ㄨ璁板綍dto 鏂扮増
*/
-public class ConsultRecordDto extends PageDto {
+@JsonInclude(JsonInclude.Include.NON_NULL)
+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;
//娌荤枟鏂规&鎶ヤ环
@@ -32,13 +35,11 @@
private String dosageParams;
//鏃㈠線鐥呭彶
private String anamnesis;
- //鐗规畩淇℃伅璇存槑
- private String specialInfo;
- //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�(澶氫釜閫楀彿鎷兼帴)
+ //鏉ラ櫌鍓嶆不鐤楄繃鐨勯」鐩�
private String hasTreatProjects;
//鏄惁鑽夌 0=鍚� 1=鏄�
private Integer isDraft;
- //鍒涘缓浜虹被鍨� 0 鏄憳宸� 1 鏄悗鍙�
+ //鍒涘缓浜虹被鍨� 0=鍛樺伐 1=鍚庡彴
private Integer adminType;
//鍒涘缓浜篿d
private String adminId;
@@ -46,60 +47,105 @@
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 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;
+
+ //-------------- 鎼滅储鏉′欢
//灏忕▼搴忔悳绱㈡椂 鏈変釜椤甸潰鏄渶瑕佷紶鏃堕棿鐨�
+ @JsonInclude(JsonInclude.Include.NON_NULL)
private String startTime;
+ @JsonInclude(JsonInclude.Include.NON_NULL)
private String endTime;
//鎼滅储鏉′欢
//鐢ㄦ埛鍚嶆煡鎵�
+ @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;
public ConsultRecordDto() {
}
@@ -183,14 +229,6 @@
this.anamnesis = anamnesis;
}
- public String getSpecialInfo() {
- return specialInfo;
- }
-
- public void setSpecialInfo(String specialInfo) {
- this.specialInfo = specialInfo;
- }
-
public String getHasTreatProjects() {
return hasTreatProjects;
}
@@ -247,16 +285,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;
}
@@ -287,6 +315,14 @@
public void setSatisfie(Integer satisfie) {
this.satisfie = satisfie;
+ }
+
+ public String getFaceDoctorName() {
+ return faceDoctorName;
+ }
+
+ public void setFaceDoctorName(String faceDoctorName) {
+ this.faceDoctorName = faceDoctorName;
}
public String getTreatDoctorName() {
@@ -362,6 +398,22 @@
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;
}
@@ -425,4 +477,100 @@
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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0