jiangjiazhi / regional-platform

Commit 5714e075d27664a7cfc2a4d9d28c10f07bcf6a4c

Authored by zhangchao 11 months ago

Exists in dev

#fix:新增孕妇学校线上、线下签到、报道数据统计字段及逻辑

Showing 7 changed files with 82 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/PatientCourseModel.java
platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java

...	...	@@ -43,6 +43,10 @@
43	43
44	44	//签到人数
45	45	private Integer signNum;
	46	+ //线下报名人数
	47	+ private Integer enrolmentUnderNum;
	48	+ //线下签到人数
	49	+ private Integer signUnderNum;
46	50
47	51	//状态 1待发布，2 已发布，3已结束 4 已取消
48	52	private Integer status;
...	...	@@ -85,6 +89,22 @@
85	89
86	90	//听课方式 1线上 2现场
87	91	private String courseType;
	92	+
	93	+ public Integer getEnrolmentUnderNum() {
	94	+ return enrolmentUnderNum;
	95	+ }
	96	+
	97	+ public void setEnrolmentUnderNum(Integer enrolmentUnderNum) {
	98	+ this.enrolmentUnderNum = enrolmentUnderNum;
	99	+ }
	100	+
	101	+ public Integer getSignUnderNum() {
	102	+ return signUnderNum;
	103	+ }
	104	+
	105	+ public void setSignUnderNum(Integer signUnderNum) {
	106	+ this.signUnderNum = signUnderNum;
	107	+ }
88	108
89	109	public String getCourseType() {
90	110	return courseType;

...	...	@@ -61,6 +61,16 @@
61	61
62	62	private String hospitalId;
63	63
	64	+ private Integer type;
	65	+
	66	+ public Integer getType() {
	67	+ return type;
	68	+ }
	69	+
	70	+ public void setType(Integer type) {
	71	+ this.type = type;
	72	+ }
	73	+
64	74	public String getId() {
65	75	return id;
66	76	}

...	...	@@ -47,8 +47,10 @@
47	47	//报名人数
48	48	private Integer enrolmentNum;
49	49
	50	+
50	51	//签到人数
51	52	private Integer signNum;
	53	+
52	54
53	55	//状态 1待发布，2 已发布，3已结束
54	56	private Integer status;

...	...	@@ -106,9 +106,10 @@
106	106	public BaseResponse signCourse(
107	107	@RequestParam(required = true) String patientCourseId,
108	108	@RequestParam(required = true) String courseId,
	109	+ @RequestParam(required = true) Integer type,
109	110	HttpServletRequest request) {
110	111
111		- return patientCourseFacade.signCourse(patientCourseId, courseId);
	112	+ return patientCourseFacade.signCourse(patientCourseId, courseId,type);
112	113	}
113	114
114	115
115	116
...	...	@@ -129,9 +130,10 @@
129	130	@RequestParam(required = true) String patientId,
130	131	@RequestParam(required = true) String hospitalId,
131	132	@RequestParam(required = true) Integer orderType,
	133	+ @RequestParam(required = true) Integer type,
132	134	HttpServletRequest request) {
133	135
134		- return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType);
	136	+ return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType,type);
135	137	}
136	138
137	139

...	...	@@ -255,6 +255,8 @@
255	255	result.setCourseObj(model.getCourseObjId() == null ? "全部" : CourseStatusEnums.CourseObjEnums.getNameById(model.getCourseObjId()));
256	256	result.setCourseObjId(model.getCourseObjId() == null ? 0 : model.getCourseObjId());
257	257	result.setType(model.getCourseType());
	258	+ result.setSignUnderNum(model.getSignUnderNum());
	259	+ result.setEnrolmentUnderNum(model.getEnrolmentUnderNum());
258	260	results.add(result);
259	261	}
260	262	}

...	...	@@ -223,7 +223,7 @@
223	223	return results;
224	224	}
225	225
226		- public BaseResponse orderCourse(String courseId, String patientId,String hospitalId,Integer orderType) {
	226	+ public BaseResponse orderCourse(String courseId, String patientId,String hospitalId,Integer orderType,Integer type) {
227	227
228	228	BaseObjectResponse objectResponse = new BaseObjectResponse();
229	229	CourseQuery query = new CourseQuery();
230	230
...	...	@@ -317,11 +317,17 @@
317	317	model.setModified(new Date());
318	318	model.setYn(YnEnums.YES.getId());
319	319	model.setStatus(1);
	320	+ model.setType(type);
320	321	patientCourseService.addPatientCourse(model);
321	322	objectResponse.setData(model.getId());
322	323	CourseModel courseModel = new CourseModel();
323	324	courseModel.setId(courseId);
324		- courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1);
	325	+ // 1是线上 2是线下
	326	+ if (type==1){
	327	+ courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1);
	328	+ }else {
	329	+ courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 1 : courseModels.get(0).getEnrolmentUnderNum()+1);
	330	+ }
325	331	courseService.updateCourse(courseModel);
326	332
327	333	}
...	...	@@ -388,7 +394,7 @@
388	394	List<Patients> patientses = patientsService.queryPatient(patientsQuery);
389	395	if (CollectionUtils.isNotEmpty(patientses)) {
390	396	Patients patients = patientses.get(0);
391		- orderCourse(courseId, patients.getId(),hospitalId,1);
	397	+ orderCourse(courseId, patients.getId(),hospitalId,1,1);
392	398	}
393	399
394	400	PatientCourseQuery patientCourseQuery1 = new PatientCourseQuery();
...	...	@@ -445,7 +451,7 @@
445	451	return objectResponse;
446	452	}
447	453
448		- public BaseResponse signCourse(String patientCourseId,String courseId) {
	454	+ public BaseResponse signCourse(String patientCourseId,String courseId,Integer type) {
449	455
450	456	BaseResponse objectResponse = new BaseResponse();
451	457	CourseQuery query = new CourseQuery();
452	458
...	...	@@ -483,12 +489,19 @@
483	489	model.setModified(new Date());
484	490	model.setYn(YnEnums.YES.getId());
485	491	model.setStatus(2);
	492	+ model.setType(type);
486	493	patientCourseService.updatePatientCourse(model);
487	494
488	495
489	496	CourseModel courseModel = new CourseModel();
490	497	courseModel.setId(courseId);
491		- courseModel.setSignNum(courseModels.get(0).getSignNum() == null ? 1 : courseModels.get(0).getSignNum() + 1);
	498	+ //1是线上 2是线下
	499	+ if (type==1){
	500	+ courseModel.setSignNum(courseModels.get(0).getSignNum() == null ? 1 : courseModels.get(0).getSignNum() + 1);
	501	+ }else {
	502	+ courseModel.setSignUnderNum(courseModels.get(0).getSignUnderNum() == null ? 1 : courseModels.get(0).getSignUnderNum() + 1);
	503	+
	504	+ }
492	505	courseService.updateCourse(courseModel);
493	506	}
494	507
...	...	@@ -685,6 +698,7 @@
685	698	if (CollectionUtils.isNotEmpty(patientCourseModels))
686	699	{
687	700	String id = patientCourseModels.get(0).getId();
	701	+ Integer type=patientCourseModels.get(0).getType();
688	702	patientCourseService.deletePatientCourse(id);
689	703
690	704	CourseQuery query = new CourseQuery();
...	...	@@ -695,7 +709,11 @@
695	709	{
696	710	CourseModel courseModel = new CourseModel();
697	711	courseModel.setId(courseId);
698		- courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1);
	712	+ if (type!=null&&type==2){
	713	+ courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1);
	714	+ }else {
	715	+ courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1);
	716	+ }
699	717	courseService.updateCourse(courseModel);
700	718	}
701	719	}

...	...	@@ -33,6 +33,10 @@
33	33
34	34	//签到人数
35	35	private Integer signNum;
	36	+ //线下报名人数
	37	+ private Integer enrolmentUnderNum;
	38	+ //线下签到人数
	39	+ private Integer signUnderNum;
36	40
37	41	//状态 1待发布，2 已发布，3已结束
38	42	private String status;
...	...	@@ -63,6 +67,22 @@
63	67	private String courseVideo;
64	68
65	69	private String type;
	70	+
	71	+ public Integer getEnrolmentUnderNum() {
	72	+ return enrolmentUnderNum;
	73	+ }
	74	+
	75	+ public void setEnrolmentUnderNum(Integer enrolmentUnderNum) {
	76	+ this.enrolmentUnderNum = enrolmentUnderNum;
	77	+ }
	78	+
	79	+ public Integer getSignUnderNum() {
	80	+ return signUnderNum;
	81	+ }
	82	+
	83	+ public void setSignUnderNum(Integer signUnderNum) {
	84	+ this.signUnderNum = signUnderNum;
	85	+ }
66	86
67	87	public String getType() {
68	88	return type;