jiangjiazhi / regional-platform

Commit caf2d1db3cfb45f496aed530d96cc80f2cbbc981

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

服务

Showing 3 changed files with 58 additions and 46 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.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/PatientServiceFacade.java

...	...	@@ -100,6 +100,16 @@
100	100	*/
101	101	private Integer isOld;
102	102
	103	+ private Integer serviceWeek;
	104	+
	105	+ public Integer getServiceWeek() {
	106	+ return serviceWeek;
	107	+ }
	108	+
	109	+ public void setServiceWeek(Integer serviceWeek) {
	110	+ this.serviceWeek = serviceWeek;
	111	+ }
	112	+
103	113	public Integer getPerType() {
104	114	return perType;
105	115	}

...	...	@@ -60,44 +60,44 @@
60	60	final String operateRemark)
61	61	{
62	62
63		- commonThreadPool.execute(new Runnable() {
64		- @Override
65		- public void run() {
66		- OperateLogModel model = new OperateLogModel();
67		- UsersQuery usersQuery = new UsersQuery();
68		- usersQuery.setId(userId);
69		- List<Users> list = usersService.queryUsers(usersQuery);
70		- if (CollectionUtils.isNotEmpty(list))
71		- {
72		- Users users = list.get(0);
73		- model.setOperateId(users.getId());
74		- model.setOperateAccount(users.getAccount());
75		- model.setOperateName(users.getName());
76		- }
	63	+// commonThreadPool.execute(new Runnable() {
	64	+// @Override
	65	+// public void run() {
	66	+// OperateLogModel model = new OperateLogModel();
	67	+// UsersQuery usersQuery = new UsersQuery();
	68	+// usersQuery.setId(userId);
	69	+// List<Users> list = usersService.queryUsers(usersQuery);
	70	+// if (CollectionUtils.isNotEmpty(list))
	71	+// {
	72	+// Users users = list.get(0);
	73	+// model.setOperateId(users.getId());
	74	+// model.setOperateAccount(users.getAccount());
	75	+// model.setOperateName(users.getName());
	76	+// }
	77	+//
	78	+// model.setOperateAction(operateAction);
	79	+//
	80	+// model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent));
	81	+// model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent));
	82	+// model.setOperateRemark(operateRemark);
	83	+//
	84	+// if (operateAfterContent != null && operateBeforeContent != null)
	85	+// {
	86	+// String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent));
	87	+// model.setModifyContent(json);
	88	+// }
	89	+// if (operateAfterContent != null)
	90	+// {
	91	+// model.set_class(operateAfterContent.getClass().getName());
	92	+// }
	93	+//
	94	+// model.setOperateHospitalId(hospitalId);
	95	+// model.setCreated(new Date());
	96	+// operateLogService.addOptLog(model);
	97	+// }
	98	+// });
77	99
78		- model.setOperateAction(operateAction);
79	100
80		- model.setOperateBeforeContent(JsonUtil.obj2Str(operateBeforeContent));
81		- model.setOperateAfterContent(JsonUtil.obj2Str(operateAfterContent));
82		- model.setOperateRemark(operateRemark);
83		-
84		- if (operateAfterContent != null && operateBeforeContent != null)
85		- {
86		- String json = JsonUtil.obj2Str(getChangeItems(operateBeforeContent,operateAfterContent));
87		- model.setModifyContent(json);
88		- }
89		- if (operateAfterContent != null)
90		- {
91		- model.set_class(operateAfterContent.getClass().getName());
92		- }
93		-
94		- model.setOperateHospitalId(hospitalId);
95		- model.setCreated(new Date());
96		- operateLogService.addOptLog(model);
97		- }
98		- });
99		-
100		-
101	101	}
102	102
103	103	/**
...	...	@@ -114,11 +114,11 @@
114	114	String operateRemark)
115	115	{
116	116
117		- addModifyOptLog( userId, hospitalId,
118		- null,
119		- operateAfterContent,
120		- operateAction,
121		- operateRemark);
	117	+// addModifyOptLog( userId, hospitalId,
	118	+// null,
	119	+// operateAfterContent,
	120	+// operateAction,
	121	+// operateRemark);
122	122	}
123	123
124	124

...	...	@@ -337,11 +337,11 @@
337	337	patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
338	338	bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
339	339
340		- Patients patients = patientsService.findOnePatientById(ps.getParentid());
341		- if (patients != null)
342		- {
343		- saveServiceTimeRecord(4, patients);
344		- }
	340	+// Patients patients = patientsService.findOnePatientById(ps.getParentid());
	341	+// if (patients != null)
	342	+// {
	343	+// saveServiceTimeRecord(4, patients);
	344	+// }
345	345
346	346	}else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))){
347	347	PatientServiceQuery query = new PatientServiceQuery();
...	...	@@ -1035,6 +1035,8 @@
1035	1035	map.put("hosp_id", hospitalDoctService.getHospId());
1036	1036	map.put("hosp_service_id", hospitalDoctService.getHospServiceId());
1037	1037	map.put("status", hospitalDoctService.getStatus());
	1038	+ map.put("devicePrice", hospitalDoctService.getDevicePrice());
	1039	+ map.put("deviceCon", hospitalDoctService.getDeviceCon());
1038	1040	return map;
1039	1041	}
1040	1042