liquanyu / regional-platform

Commit 295cdaaffab3f015c95724ad89ec86b3448766d1

Authored by liquanyu over 8 years ago

操作日志

Showing 3 changed files with 44 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OperateLogFacade.java

...	...	@@ -406,7 +406,7 @@
406	406
407	407	babyBookbuildingService.updateBabyBuild(model, request.getId());
408	408
409		- operateLogFacade.addOptLog(userId, Integer.valueOf(model.getHospitalId()), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改儿童建档");
	409	+ operateLogFacade.addModifyOptLog(userId, Integer.valueOf(model.getHospitalId()), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改儿童建档");
410	410
411	411	model.setId(request.getId());
412	412	model.setPid(pid);
...	...	@@ -609,7 +609,7 @@
609	609	patient.setPid(pm.getId());
610	610	patient.setCreated(new Date());
611	611	patients = yunBookbuildingService.addPregnantBookbuilding(patient);
612		- operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,null,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档");
	612	+ operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档");
613	613	}
614	614	}
615	615
...	...	@@ -636,7 +636,7 @@
636	636	patient.setCreated(new Date());
637	637	patients = yunBookbuildingService.addPregnantBookbuilding(patient);
638	638
639		- operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,null,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档");
	639	+ operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.ADD.getId(),"儿童建档时候添加孕妇建档");
640	640	}
641	641
642	642
...	...	@@ -672,7 +672,7 @@
672	672	// String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName();
673	673	model = babyBookbuildingService.addBabyBookbuilding(model);
674	674
675		- operateLogFacade.addOptLog(userId,Integer.valueOf(request.getHospitalId()),model,null,OptActionEnums.ADD.getId(),"儿童建档");
	675	+ operateLogFacade.addOptLog(userId,Integer.valueOf(request.getHospitalId()),model,OptActionEnums.ADD.getId(),"儿童建档");
676	676
677	677	if (model == null \|\| model.getId() == null) {
678	678	br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
...	...	@@ -1180,7 +1180,7 @@
1180	1180	personService.updatePerson(personModel, allModels.get(0).getPid());
1181	1181	}
1182	1182	}
1183		- operateLogFacade.addOptLog(userId, Integer.valueOf(models.get(0).getHospitalId()), models.get(0), null, OptActionEnums.DELETE.getId(), "删除儿童建档");
	1183	+ operateLogFacade.addDelteOptLog(userId, Integer.valueOf(models.get(0).getHospitalId()), models.get(0), OptActionEnums.DELETE.getId(), "删除儿童建档");
1184	1184	}
1185	1185
1186	1186	babyBookbuildingService.deleteBabyById(id);

...	...	@@ -252,7 +252,7 @@
252	252	patient.setOperator(userId);
253	253	Patients p = yunBookbuildingService.addPregnantBookbuilding(patient);
254	254
255		- operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,null,OptActionEnums.ADD.getId(),"孕妇建档");
	255	+ operateLogFacade.addOptLog(userId,Integer.valueOf(yunRequest.getHospitalId()),p,OptActionEnums.ADD.getId(),"孕妇建档");
256	256
257	257	/** 孕妇建档后把所有以前未使用的优惠券作废 */
258	258	couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8");
...	...	@@ -461,7 +461,7 @@
461	461	patient.setOperator(userId);
462	462	Patients p = yunBookbuildingService.addPregnantBookbuilding(patient);
463	463
464		- operateLogFacade.addOptLog(userId, Integer.valueOf(patient.getHospitalId()), p, null, OptActionEnums.UPDATE.getId(), "孕妇建档修改");
	464	+ operateLogFacade.addModifyOptLog(userId, Integer.valueOf(patient.getHospitalId()), p, null, OptActionEnums.UPDATE.getId(), "孕妇建档修改");
465	465
466	466	if (p == null \|\| p.getId() == null) {
467	467	br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
...	...	@@ -878,7 +878,7 @@
878	878
879	879	yunBookbuildingService.updatePregnant(patient, id);
880	880
881		- operateLogFacade.addOptLog(userId, Integer.valueOf(patient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改");
	881	+ operateLogFacade.addModifyOptLog(userId, Integer.valueOf(patient.getHospitalId()), beforePatient, patient, OptActionEnums.UPDATE.getId(), "孕妇建档修改");
882	882
883	883	//如果当前是建档医院,那么需要修改其他非建档医院的数据
884	884	if (autoMatchFacade.checkBStatus(userId)) {
...	...	@@ -1391,7 +1391,7 @@
1391	1391	String hospital = autoMatchFacade.getHospitalId(userId);
1392	1392	Patients patients = yunBookbuildingService.findOneById(id);
1393	1393
1394		- operateLogFacade.addOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,null,OptActionEnums.DELETE.getId(),"删除孕妇建档");
	1394	+ operateLogFacade.addDelteOptLog(userId,Integer.valueOf(patients.getHospitalId()),patients,OptActionEnums.DELETE.getId(),"删除孕妇建档");
1395	1395
1396	1396	if (!deleteProcessHandler.deleteBookBuild(patients.getPid(), patients.getBookbuildingDate(), hospital)) {
1397	1397	return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("孕妇存在检查记录,不能删除建档");

...	...	@@ -36,13 +36,13 @@
36	36	@Autowired
37	37	private UsersService usersService;
38	38
39		- public void addOptLog(Integer userId,Integer hospitalId,
40		- Object operateBeforeContent,
41		- Object operateAfterContent,
42		- String operateAction,
43		- String operateRemark)
44		- {
45	39
	40	+ public void addModifyOptLog(Integer userId,Integer hospitalId,
	41	+ Object operateBeforeContent,
	42	+ Object operateAfterContent,
	43	+ String operateAction,
	44	+ String operateRemark)
	45	+ {
46	46	OperateLogModel model = new OperateLogModel();
47	47
48	48	UsersQuery usersQuery = new UsersQuery();
...	...	@@ -72,6 +72,35 @@
72	72
73	73	operateLogService.addOptLog(model);
74	74	}
	75	+
	76	+ public void addOptLog(Integer userId,Integer hospitalId,
	77	+ Object operateBeforeContent,
	78	+ String operateAction,
	79	+ String operateRemark)
	80	+ {
	81	+
	82	+ addModifyOptLog( userId, hospitalId,
	83	+ operateBeforeContent,
	84	+ null,
	85	+ operateAction,
	86	+ operateRemark);
	87	+ }
	88	+
	89	+
	90	+
	91	+ public void addDelteOptLog(Integer userId,Integer hospitalId,
	92	+ Object operateBeforeContent,
	93	+ String operateAction,
	94	+ String operateRemark)
	95	+ {
	96	+
	97	+ addModifyOptLog( userId, hospitalId,
	98	+ operateBeforeContent,
	99	+ null,
	100	+ operateAction,
	101	+ operateRemark);
	102	+ }
	103	+
75	104
76	105
77	106