jiangjiazhi / regional-platform

Commit a0af7a36ea581d67570bd33bd008afc783931d73

Authored by zhangchao 11 months ago

Exists in dev

#fix:优化大同课程统计

Showing 3 changed files with 19 additions and 14 deletions

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/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java

...	...	@@ -130,7 +130,7 @@
130	130	@RequestParam(required = true) String patientId,
131	131	@RequestParam(required = true) String hospitalId,
132	132	@RequestParam(required = true) Integer orderType,
133		- @RequestParam(required = true) Integer type,
	133	+ @RequestParam(required = false) Integer type,
134	134	HttpServletRequest request) {
135	135
136	136	return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType,type);

...	...	@@ -4353,8 +4353,6 @@
4353	4353	String deliveryMode = getDelivery(maternalDeliverModel);
4354	4354	params.put("dueDate", dueDate.equals("") ? dueDate : getTime(DateUtil.parseYMDHMS(dueDate)));
4355	4355	params.put("deliveryMode", deliveryMode);
4356		- params.put("parentId",maternalDeliverModel.getParentId());
4357		-
4358	4356	}
4359	4357	List<String> riskId = patientsList.get(0).getRiskFactorId();
4360	4358	StringBuffer sb = new StringBuffer();
...	...	@@ -4367,7 +4365,7 @@
4367	4365	}
4368	4366	}
4369	4367	}
4370		-
	4368	+ params.put("parentId",patientsList.get(0).getId());
4371	4369	String highRisk = sb.toString();
4372	4370	if (highRisk.length() > 0) {
4373	4371	params.put("riskType", highRisk.substring(0, highRisk.length() - 1));

...	...	@@ -317,16 +317,21 @@
317	317	model.setModified(new Date());
318	318	model.setYn(YnEnums.YES.getId());
319	319	model.setStatus(1);
320		- model.setType(type);
	320	+ if (type!=null){
	321	+ model.setType(type);
	322	+ }
	323	+
321	324	patientCourseService.addPatientCourse(model);
322	325	objectResponse.setData(model.getId());
323	326	CourseModel courseModel = new CourseModel();
324	327	courseModel.setId(courseId);
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);
	328	+ if (type!=null){
	329	+ // 1是线上 2是线下
	330	+ if (type==1){
	331	+ courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1);
	332	+ }else {
	333	+ courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 1 : courseModels.get(0).getEnrolmentUnderNum()+1);
	334	+ }
330	335	}
331	336	courseService.updateCourse(courseModel);
332	337
...	...	@@ -709,10 +714,12 @@
709	714	{
710	715	CourseModel courseModel = new CourseModel();
711	716	courseModel.setId(courseId);
712		- if (type!=null&&type==2){
713		- courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0);
714		- }else {
715		- courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0);
	717	+ if (type!=null){
	718	+ if (type!=null&&type==2){
	719	+ courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0);
	720	+ }else {
	721	+ courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0);
	722	+ }
716	723	}
717	724	courseService.updateCourse(courseModel);
718	725	}