diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
index ccf530f..9de1706 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml
@@ -96,15 +96,17 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
index bd5bc8a..f7b7e19 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
@@ -99,6 +99,7 @@ public class SyncDataController extends BaseController {
}
return baseResponse;
} catch (Exception e) {
+ e.printStackTrace();
BaseResponse baseResponse = new BaseResponse();
baseResponse.setObject(e.getMessage());
baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
index 4038164..646fc27 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
@@ -183,11 +183,31 @@ public class ConfigServiceFacade {
}
}
}
+ if (StringUtils.isNotEmpty(hs.getCreateUser())) {
+ try {
+ Users users = usersService.getUsers(Integer.parseInt(hs.getCreateUser()));
+ if (users != null) {
+ result.setCreateUser(users.getName());
+ }
+ } catch (Exception e) {
+ result.setCreateUser("产检医生");
+ }
+ }
+
+ if(StringUtils.isNotEmpty(hs.getSerTypes())){
+ String serTypes [] = hs.getSerTypes().split(",");
+ StringBuffer stb = new StringBuffer();
+ for(String st:serTypes){
+ String serType = PatientSerEnums.SerTypeEnums.getTitle(Integer.parseInt(st));
+ stb.append(serType+"/");
+ }
+ result.setSerType(stb.toString().substring(0,stb.length()-1));
+ }
+
result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
- String serType = PatientSerEnums.SerTypeEnums.getTitle(hs.getSerType());
- result.setSerType(serType);
- result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
- result.setCreateUser(hs.getCreateUser());
+ if(hs.getStatus()!=null){
+ result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
+ }
return result;
}