jiangjiazhi / regional-platform | GitLab

Commit 65735e10c1609878fb90315c4a171deba5b08313

Authored by zhangchao over 1 year ago

1 parent 862fd4f7c1

Exists in dev

#fix:优化

Showing 3 changed files with 11 additions and 2 deletions

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

...	...	@@ -3097,7 +3097,14 @@
3097	3097	result.setCloseCaseCode(p.getCloseCaseCode());
3098	3098	result.setBuildingManualCode(p.getBuildingManualCode());
3099	3099	result.setHighRiskFileCode(p.getHighRiskFileCode());
3100		- result.setLastCheckEmployeeId(p.getLastCheckEmployeeId());
	3100	+ if (StringUtils.isNotEmpty(p.getLastCheckEmployeeId())){
	3101	+ Integer userCheckId = usersService.getUserId(p.getHospitalId(),p.getLastCheckEmployeeId());
	3102	+ if (userCheckId==null){
	3103	+ userCheckId=Integer.valueOf(p.getLastCheckEmployeeId());
	3104	+ }
	3105	+ result.setLastCheckEmployeeId(String.valueOf(userCheckId));
	3106	+ }
	3107	+
3101	3108	result.setUserType(p.getUserType());
3102	3109	result.setDept(p.getDept());
3103	3110	result.setLowerHairOgr(p.getLowerHairOgr());

...	...	@@ -3452,7 +3452,7 @@
3452	3452	//TODO 优化产检医生是汉字的逻辑
3453	3453	String lastCheckEmployeeId = "";
3454	3454	if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
3455		- Integer userCheckId = usersService.getUserId(hospitalId,patientManagerRequest.getLastCheckEmployeeId());
	3455	+ Integer userCheckId = usersService.getUserId(hospitalId,patients.getLastCheckEmployeeId());
3456	3456	if (userCheckId==null){
3457	3457	userCheckId=Integer.valueOf(patients.getLastCheckEmployeeId());
3458	3458	}

...	...	@@ -1117,6 +1117,8 @@
1117	1117	} else {
1118	1118	result.setCreateUserStr("小程序开通");
1119	1119	}
	1120	+
	1121	+
1120	1122	result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate()));
1121	1123	result.setBackUser(ps.getSerDoct());
1122	1124	result.setSerDoct(ps.getSerDoct());