jiangjiazhi / regional-platform

Commit e6909d9c9c9db5425157916b8f5f1eab01e49e1c

Authored by liquanyu over 8 years ago

1 parent 519902aa83

Exists in master and in 6 other branches

操作日志

Showing 3 changed files with 23 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

...	...	@@ -334,6 +334,9 @@
334	334	if (CollectionUtils.isEmpty(list1)) {
335	335	//增加产筛
336	336	applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
	337	+
	338	+ operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderModel, OptActionEnums.ADD.getId(), "申请产前筛查");
	339	+
337	340	SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
338	341	sieveApplyOrderQuery.setStatus(0);
339	342	sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
...	...	@@ -356,6 +359,7 @@
356	359	sieveModel.setHospitalId(orderModel.getHospitalId());
357	360	SieveService.handOrder(sieveModel);
358	361	sieveService.addChanQianSieve(sieveModel);
	362	+ operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "添加产前筛查");
359	363	}
360	364	}
361	365	idList.add(orderModel.getId());
...	...	@@ -368,6 +372,8 @@
368	372	sieveApplyOrderModel1.setModified(new Date());
369	373	sieveApplyOrderModel1.setStatus(1);
370	374	applyOrderService.updateSieve(sieveApplyOrderModel1);
	375	+
	376	+// operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), ,sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
371	377	}
372	378	}
373	379	SieveQuery sieveQuery = new SieveQuery();

...	...	@@ -66,7 +66,7 @@
66	66	}
67	67
68	68	model.setOperateAction(operateAction);
69		- model.set_class(operateBeforeContent.getClass().getName());
	69	+
70	70	model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent));
71	71	model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent));
72	72	model.setOperateRemark(operateRemark);
73	73
...	...	@@ -74,9 +74,13 @@
74	74	if (operateAfterContent != null && operateBeforeContent != null)
75	75	{
76	76	String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent));
77		- System.out.print(json);
78	77	model.setModifyContent(json);
79	78	}
	79	+ if (operateAfterContent != null)
	80	+ {
	81	+ model.set_class(operateAfterContent.getClass().getName());
	82	+ }
	83	+
80	84	model.setOperateHospitalId(hospitalId);
81	85	model.setCreated(new Date());
82	86	operateLogService.addOptLog(model);

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.biz.service.PatientsService;
6	6	import com.lyms.platform.biz.service.SieveService;
7	7	import com.lyms.platform.common.constants.ErrorCodeConstants;
	8	+import com.lyms.platform.common.enums.OptActionEnums;
8	9	import com.lyms.platform.common.enums.YnEnums;
9	10	import com.lyms.platform.common.result.BaseListResponse;
10	11	import com.lyms.platform.common.result.BaseObjectResponse;
...	...	@@ -65,6 +66,9 @@
65	66	private PatientsService patientsService;
66	67
67	68	@Autowired
	69	+ private OperateLogFacade operateLogFacade;
	70	+
	71	+ @Autowired
68	72	@Qualifier("commonThreadPool")
69	73	private ThreadPoolTaskExecutor commonThreadPool;
70	74
71	75
72	76
73	77
74	78
...	...	@@ -76,12 +80,19 @@
76	80	*/
77	81	public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest, Integer userId) {
78	82	SieveResultModel sieveResultModel = sieveAddRequest.convertToDataModel();
	83	+ String hospital = autoMatchFacade.getHospitalId(userId);
79	84	if (StringUtils.isNotEmpty(sieveAddRequest.getId())) {
80	85	SieveResultQuery sieveResultQuery = new SieveResultQuery();
81	86	sieveResultQuery.setId(sieveAddRequest.getId());
	87	+
	88	+// List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
	89	+//
82	90	sieveService.update(sieveResultQuery.convertToQuery(), sieveResultModel);
	91	+// operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital),list.get(0), sieveResultModel, OptActionEnums.UPDATE.getId(), "修改产前筛查");
83	92	} else {
	93	+
84	94	sieveService.addSieve(sieveResultModel);
	95	+// operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveResultModel, OptActionEnums.ADD.getId(), "添加产前筛查");
85	96	}
86	97
87	98	SieveQuery sieveQuery = new SieveQuery();