~chenjiahe/phis-service-feign.git

Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-07 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7

提交 \| 用户 \| age
ee2d8b	1	package com.hz.his.dto.consultation;
R	2
6eeb78	3	import com.fasterxml.jackson.annotation.JsonInclude;
ee2d8b	4
ce40d7	5	import java.util.Date;
ee2d8b	6	import java.util.List;
R	7	import java.util.Map;
	8
	9
	10	/**
	11	* 咨询记录dto 新版
	12	*/
6eeb78	13	@JsonInclude(JsonInclude.Include.NON_NULL)
R	14	public class ConsultRecordDto{
ee2d8b	15
R	16	//用户id
	17	private String userId;
	18	//门店/诊所ID
	19	private String shopId;
7baf1a	20	//咨询类型 0=标准（旧版） 1=初诊 2=复诊
ee2d8b	21	private Integer consultType;
6eeb78	22	//满意度 0=不满意 1=一般 2=满意
R	23	private Integer satisfie;
ee2d8b	24	//面诊医生id
R	25	private String faceDoctorId;
	26	//治疗医生id
	27	private String treatDoctorId;
6eeb78	28	//基本信息
R	29	private String content;
ee2d8b	30	//主要诉求
R	31	private String appealDetail;
	32	//治疗方案&报价
	33	private String treatPlanQuote;
	34	//剂量参数
	35	private String dosageParams;
	36	//既往病史
	37	private String anamnesis;
6eeb78	38	//来院前治疗过的项目
ee2d8b	39	private String hasTreatProjects;
R	40	//是否草稿 0=否 1=是
	41	private Integer isDraft;
6eeb78	42	//创建人类型 0=员工 1=后台
ee2d8b	43	private Integer adminType;
R	44	//创建人id
	45	private String adminId;
	46	//创建人名称
	47	private String adminName;
5bc66d	48	//面诊方案
R	49	private String facePlan;
ce40d7	50	//创建时间
R	51	private Date createTime;
ee2d8b	52	//本次治疗项目多个逗号分割
R	53	private String treatProjectIds;
	54	//推荐项目多个逗号分割
	55	private String recommendProjectIds;
6eeb78	56	//上次治疗医生ID
R	57	private String lastTreatDoctorId;
	58	//上次治疗项目json字符串 ["项目ID","项目ID"]
	59	private String lastTreatProjects;
7baf1a	60	//咨询方式代码
R	61	private String methodCode;
	62	//咨询方式名称
	63	private String methodCodeName;
ee2d8b	64
6eeb78	65	//------------- 修改传值
ee2d8b	66	private String id;
R	67
6eeb78	68
90b0c7	69	//------------- 详情返回
6eeb78	70	//治疗医生名称
90b0c7	71	private String faceDoctorName;
R	72	//治疗医生名称
6eeb78	73	private String treatDoctorName;
R	74	//上次治疗医生名称
	75	private String lastTreatDoctorName;
	76
	77	//------------ 详情返回值补充
ee2d8b	78	//治疗项目
R	79	private List<Map<String,Object>> treatProjectList;
	80	//推荐项目
	81	private List<Map<String,Object>> recommendProjectList;
6eeb78	82	//上次治疗项目
R	83	private List<Map<String,Object>> lastTreatProjectList;
ee2d8b	84
6eeb78	85
R	86	//-------------- 搜索条件
7c089c	87	//小程序搜索时有个页面是需要传时间的
6eeb78	88	@JsonInclude(JsonInclude.Include.NON_NULL)
7c089c	89	private String startTime;
6eeb78	90	@JsonInclude(JsonInclude.Include.NON_NULL)
7c089c	91	private String endTime;
a015fd	92
R	93	//搜索条件
	94	//用户名查找
6eeb78	95	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	96	private String userName;
R	97	//客户来源渠道分类
6eeb78	98	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	99	private String channelsTypeId;
R	100	//客户来源一级渠道
6eeb78	101	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	102	private String channelId;
R	103	//客户来源二级渠道
6eeb78	104	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	105	private String channel2Id;
R	106	//咨询师
6eeb78	107	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	108	private String hisCorpUserId;
90b0c7	109	//用户顾问名称
R	110	private String hisCorpUserName;
1ea71b	111	//手机号
R	112	private String tel;
a015fd	113	//电网咨询师
6eeb78	114	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	115	private String internetCorpUserId;
R	116	//客服
6eeb78	117	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	118	private String chatCorpUserId;
R	119	//创建人
6eeb78	120	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	121	private String createEmployeeId;
R	122	//创建人部门
6eeb78	123	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	124	private String createEmployeePartId;
R	125	//关注活动
6eeb78	126	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	127	private String focusActivityId;
R	128	//到访类型
6eeb78	129	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	130	private String recentVisitType;
R	131	//到访状态
6eeb78	132	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	133	private Integer recentVisitStatus;
R	134	//是否成交
6eeb78	135	@JsonInclude(JsonInclude.Include.NON_NULL)
a015fd	136	private Integer isMakeADeal;
6eeb78	137
0b0e1f	138	//列表接口小程序也使用区分是否是从用户详情进去的
R	139	private Integer isDetail;
	140
6eeb78	141	/*当前页数/
R	142	private Integer pageNum = 1;
	143	/*当前页显示条数/
	144	private Integer pageSize = 20;
	145	/*关键字/
	146	private String keyWord;
6b9064	147	/*查询方式/
R	148	private String useType;
ee2d8b	149	public ConsultRecordDto() {
R	150	}
	151
	152	public String getUserId() {
	153	return userId;
	154	}
	155
	156	public void setUserId(String userId) {
	157	this.userId = userId;
	158	}
	159
	160	public String getShopId() {
	161	return shopId;
	162	}
	163
	164	public void setShopId(String shopId) {
	165	this.shopId = shopId;
	166	}
	167
	168	public Integer getConsultType() {
	169	return consultType;
	170	}
	171
	172	public void setConsultType(Integer consultType) {
	173	this.consultType = consultType;
	174	}
	175
	176	public String getContent() {
	177	return content;
	178	}
	179
	180	public void setContent(String content) {
	181	this.content = content;
	182	}
	183
	184	public String getFaceDoctorId() {
	185	return faceDoctorId;
	186	}
	187
	188	public void setFaceDoctorId(String faceDoctorId) {
	189	this.faceDoctorId = faceDoctorId;
	190	}
	191
	192	public String getTreatDoctorId() {
	193	return treatDoctorId;
	194	}
	195
	196	public void setTreatDoctorId(String treatDoctorId) {
	197	this.treatDoctorId = treatDoctorId;
	198	}
	199
	200	public String getAppealDetail() {
	201	return appealDetail;
	202	}
	203
	204	public void setAppealDetail(String appealDetail) {
	205	this.appealDetail = appealDetail;
	206	}
	207
	208	public String getTreatPlanQuote() {
	209	return treatPlanQuote;
	210	}
	211
	212	public void setTreatPlanQuote(String treatPlanQuote) {
	213	this.treatPlanQuote = treatPlanQuote;
	214	}
	215
	216	public String getDosageParams() {
	217	return dosageParams;
	218	}
	219
	220	public void setDosageParams(String dosageParams) {
	221	this.dosageParams = dosageParams;
	222	}
	223
	224	public String getAnamnesis() {
	225	return anamnesis;
	226	}
	227
	228	public void setAnamnesis(String anamnesis) {
	229	this.anamnesis = anamnesis;
	230	}
	231
	232	public String getHasTreatProjects() {
	233	return hasTreatProjects;
	234	}
	235
	236	public void setHasTreatProjects(String hasTreatProjects) {
	237	this.hasTreatProjects = hasTreatProjects;
	238	}
	239
	240	public Integer getIsDraft() {
	241	return isDraft;
	242	}
	243
	244	public void setIsDraft(Integer isDraft) {
	245	this.isDraft = isDraft;
	246	}
	247
	248	public Integer getAdminType() {
	249	return adminType;
	250	}
	251
	252	public void setAdminType(Integer adminType) {
	253	this.adminType = adminType;
	254	}
	255
	256	public String getAdminId() {
	257	return adminId;
	258	}
	259
	260	public void setAdminId(String adminId) {
	261	this.adminId = adminId;
	262	}
	263
	264	public String getAdminName() {
	265	return adminName;
	266	}
	267
	268	public void setAdminName(String adminName) {
	269	this.adminName = adminName;
	270	}
	271
	272	public String getTreatProjectIds() {
	273	return treatProjectIds;
	274	}
	275
	276	public void setTreatProjectIds(String treatProjectIds) {
	277	this.treatProjectIds = treatProjectIds;
	278	}
	279
	280	public String getRecommendProjectIds() {
	281	return recommendProjectIds;
	282	}
	283
	284	public void setRecommendProjectIds(String recommendProjectIds) {
	285	this.recommendProjectIds = recommendProjectIds;
	286	}
	287
	288	public List<Map<String, Object>> getTreatProjectList() {
	289	return treatProjectList;
	290	}
	291
	292	public void setTreatProjectList(List<Map<String, Object>> treatProjectList) {
	293	this.treatProjectList = treatProjectList;
	294	}
	295
	296	public List<Map<String, Object>> getRecommendProjectList() {
	297	return recommendProjectList;
	298	}
	299
	300	public void setRecommendProjectList(List<Map<String, Object>> recommendProjectList) {
	301	this.recommendProjectList = recommendProjectList;
	302	}
5bc66d	303
R	304	public String getFacePlan() {
	305	return facePlan;
	306	}
	307
	308	public void setFacePlan(String facePlan) {
	309	this.facePlan = facePlan;
	310	}
	311
	312	public Integer getSatisfie() {
	313	return satisfie;
	314	}
	315
	316	public void setSatisfie(Integer satisfie) {
	317	this.satisfie = satisfie;
	318	}
	319
90b0c7	320	public String getFaceDoctorName() {
R	321	return faceDoctorName;
	322	}
	323
	324	public void setFaceDoctorName(String faceDoctorName) {
	325	this.faceDoctorName = faceDoctorName;
	326	}
	327
5bc66d	328	public String getTreatDoctorName() {
R	329	return treatDoctorName;
	330	}
	331
	332	public void setTreatDoctorName(String treatDoctorName) {
	333	this.treatDoctorName = treatDoctorName;
	334	}
7c089c	335
R	336	public String getStartTime() {
	337	return startTime;
	338	}
	339
	340	public void setStartTime(String startTime) {
	341	this.startTime = startTime;
	342	}
	343
	344	public String getEndTime() {
	345	return endTime;
	346	}
	347
	348	public void setEndTime(String endTime) {
	349	this.endTime = endTime;
	350	}
	351
ce40d7	352
R	353	public Date getCreateTime() {
	354	return createTime;
	355	}
	356
	357	public void setCreateTime(Date createTime) {
	358	this.createTime = createTime;
	359	}
a015fd	360
R	361	public String getUserName() {
	362	return userName;
	363	}
	364
	365	public void setUserName(String userName) {
	366	this.userName = userName;
	367	}
	368
	369	public String getChannelsTypeId() {
	370	return channelsTypeId;
	371	}
	372
	373	public void setChannelsTypeId(String channelsTypeId) {
	374	this.channelsTypeId = channelsTypeId;
	375	}
	376
	377	public String getChannelId() {
	378	return channelId;
	379	}
	380
	381	public void setChannelId(String channelId) {
	382	this.channelId = channelId;
	383	}
	384
	385	public String getChannel2Id() {
	386	return channel2Id;
	387	}
	388
	389	public void setChannel2Id(String channel2Id) {
	390	this.channel2Id = channel2Id;
	391	}
	392
	393	public String getHisCorpUserId() {
	394	return hisCorpUserId;
	395	}
	396
	397	public void setHisCorpUserId(String hisCorpUserId) {
	398	this.hisCorpUserId = hisCorpUserId;
	399	}
	400
90b0c7	401	public String getHisCorpUserName() {
R	402	return hisCorpUserName;
	403	}
	404
	405	public void setHisCorpUserName(String hisCorpUserName) {
	406	this.hisCorpUserName = hisCorpUserName;
	407	}
	408
1ea71b	409	public String getTel() {
R	410	return tel;
	411	}
	412
	413	public void setTel(String tel) {
	414	this.tel = tel;
	415	}
	416
a015fd	417	public String getInternetCorpUserId() {
R	418	return internetCorpUserId;
	419	}
	420
	421	public void setInternetCorpUserId(String internetCorpUserId) {
	422	this.internetCorpUserId = internetCorpUserId;
	423	}
	424
	425	public String getChatCorpUserId() {
	426	return chatCorpUserId;
	427	}
	428
	429	public void setChatCorpUserId(String chatCorpUserId) {
	430	this.chatCorpUserId = chatCorpUserId;
	431	}
	432
	433	public String getCreateEmployeeId() {
	434	return createEmployeeId;
	435	}
	436
	437	public void setCreateEmployeeId(String createEmployeeId) {
	438	this.createEmployeeId = createEmployeeId;
	439	}
	440
	441	public String getCreateEmployeePartId() {
	442	return createEmployeePartId;
	443	}
	444
	445	public void setCreateEmployeePartId(String createEmployeePartId) {
	446	this.createEmployeePartId = createEmployeePartId;
	447	}
	448
	449	public String getFocusActivityId() {
	450	return focusActivityId;
	451	}
	452
	453	public void setFocusActivityId(String focusActivityId) {
	454	this.focusActivityId = focusActivityId;
	455	}
	456
	457	public String getRecentVisitType() {
	458	return recentVisitType;
	459	}
	460
	461	public void setRecentVisitType(String recentVisitType) {
	462	this.recentVisitType = recentVisitType;
	463	}
	464
	465	public Integer getRecentVisitStatus() {
	466	return recentVisitStatus;
	467	}
	468
	469	public void setRecentVisitStatus(Integer recentVisitStatus) {
	470	this.recentVisitStatus = recentVisitStatus;
	471	}
	472
	473	public Integer getIsMakeADeal() {
	474	return isMakeADeal;
	475	}
	476
	477	public void setIsMakeADeal(Integer isMakeADeal) {
	478	this.isMakeADeal = isMakeADeal;
	479	}
6eeb78	480
R	481	public String getLastTreatDoctorId() {
	482	return lastTreatDoctorId;
	483	}
	484
	485	public void setLastTreatDoctorId(String lastTreatDoctorId) {
	486	this.lastTreatDoctorId = lastTreatDoctorId;
	487	}
	488
	489	public String getLastTreatProjects() {
	490	return lastTreatProjects;
	491	}
	492
	493	public void setLastTreatProjects(String lastTreatProjects) {
	494	this.lastTreatProjects = lastTreatProjects;
	495	}
	496
	497	public String getLastTreatDoctorName() {
	498	return lastTreatDoctorName;
	499	}
	500
	501	public void setLastTreatDoctorName(String lastTreatDoctorName) {
	502	this.lastTreatDoctorName = lastTreatDoctorName;
	503	}
	504
	505	public List<Map<String, Object>> getLastTreatProjectList() {
	506	return lastTreatProjectList;
	507	}
	508
	509	public void setLastTreatProjectList(List<Map<String, Object>> lastTreatProjectList) {
	510	this.lastTreatProjectList = lastTreatProjectList;
	511	}
	512
	513	public String getId() {
	514	return id;
	515	}
	516
	517	public void setId(String id) {
	518	this.id = id;
	519	}
	520
	521	public Integer getPageNum() {
	522	return pageNum;
	523	}
	524
	525	public void setPageNum(Integer pageNum) {
	526	this.pageNum = pageNum;
	527	}
	528
	529	public Integer getPageSize() {
	530	return pageSize;
	531	}
	532
	533	public void setPageSize(Integer pageSize) {
	534	this.pageSize = pageSize;
	535	}
	536
	537	public String getKeyWord() {
	538	return keyWord;
	539	}
	540
	541	public void setKeyWord(String keyWord) {
	542	this.keyWord = keyWord;
	543	}
7baf1a	544
R	545	public String getMethodCode() {
	546	return methodCode;
	547	}
	548
	549	public void setMethodCode(String methodCode) {
	550	this.methodCode = methodCode;
	551	}
	552
	553	public String getMethodCodeName() {
	554	return methodCodeName;
	555	}
	556
	557	public void setMethodCodeName(String methodCodeName) {
	558	this.methodCodeName = methodCodeName;
	559	}
6b9064	560
R	561	public String getUseType() {
	562	return useType;
	563	}
	564
	565	public void setUseType(String useType) {
	566	this.useType = useType;
	567	}
0b0e1f	568
R	569	public Integer getIsDetail() {
	570	return isDetail;
	571	}
	572
	573	public void setIsDetail(Integer isDetail) {
	574	this.isDetail = isDetail;
	575	}
ee2d8b	576	}