jiangjiazhi / regional-platform

Authored by haorp 8 months ago

Exists in dev

Showing 2 changed files with 27 additions and 1 deletions

...	...	@@ -63,6 +63,27 @@
63	63
64	64	private Integer type;
65	65
	66	+
	67	+ private String orderTimeStr;
	68	+
	69	+ private String signTimeStr;
	70	+
	71	+ public String getSignTimeStr() {
	72	+ return signTimeStr;
	73	+ }
	74	+
	75	+ public void setSignTimeStr(String signTimeStr) {
	76	+ this.signTimeStr = signTimeStr;
	77	+ }
	78	+
	79	+ public String getOrderTimeStr() {
	80	+ return orderTimeStr;
	81	+ }
	82	+
	83	+ public void setOrderTimeStr(String orderTimeStr) {
	84	+ this.orderTimeStr = orderTimeStr;
	85	+ }
	86	+
66	87	public Integer getType() {
67	88	return type;
68	89	}

...	...	@@ -196,6 +196,11 @@
196	196	objectResponse.setErrormsg("成功");
197	197	return objectResponse;
198	198	}
	199	+ }else {
	200	+ for (PatientCourseModel temp : patientCourseModels) {
	201	+ temp.setSignTimeStr(DateUtil.gety_m_dhm(temp.getSignTime()));
	202	+ temp.setOrderTimeStr(DateUtil.gety_m_dhm(temp.getOrderTime()));
	203	+ }
199	204	}
200	205	BaseListResponse objectResponse = new BaseListResponse();
201	206	objectResponse.setData(patientCourseModels);
...	...	@@ -227,7 +232,7 @@
227	232	patientCourseQuery.setStatus(1);
228	233	patientCourseQuery.setId(patientCourseId);
229	234	List<PatientCourseModel> patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery);
230		- if (!CollectionUtils.isNotEmpty(patientCourseModels))
	235	+ if (!CollectionUtils.isEmpty(patientCourseModels))
231	236	{
232	237	objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXPIRE);
233	238	objectResponse.setErrormsg("您签到的课程还没有预约，请预约后签到!");