代码修改

svr/svr-basic/pom.xml

@@ -76,6 +76,11 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>swagger-starter</artifactId>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>

svr/svr-basic/src/main/java/com/yihu/jw/basic/address/service/AddressDictService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.address.service;
import com.yihu.jw.entity.ehr.address.AddressDict;
import com.yihu.jw.basic.address.dao.AddressDictRepository;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/address/service/AddressService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.address.service;
import com.yihu.jw.basic.address.dao.AddressRepository;
import com.yihu.jw.entity.ehr.address.Address;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiCategoryService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.AppApiCategoryDao;
import com.yihu.jw.entity.ehr.apps.AppApiCategory;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiErrorCodeService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.AppApiErrorCodeDao;
import com.yihu.jw.entity.ehr.apps.AppApiErrorCode;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiParameterService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.AppApiParameterDao;
import com.yihu.jw.entity.ehr.apps.AppApiParameter;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiResponseService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.AppApiResponseDao;
import com.yihu.jw.entity.ehr.apps.AppApiResponse;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppApiService.java

@@ -17,7 +17,7 @@ import com.yihu.jw.entity.ehr.user.Roles;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.entity.ehr.apps.AppApiErrorCode;
import com.yihu.jw.exception.ApiException;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppFeatureService.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.apps.dao.AppFeatureDao;
import com.yihu.jw.entity.ehr.apps.AppFeature;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppService.java

@@ -14,7 +14,7 @@ import com.yihu.jw.entity.ehr.user.RoleApiRelation;
import com.yihu.jw.entity.ehr.user.RoleAppRelation;
import com.yihu.jw.entity.ehr.user.Roles;
import com.yihu.jw.entity.ehr.oauth2.OauthClientDetails;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
@@ -29,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Random;
/**
 * @author Sand

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppVersionService.java

@@ -2,9 +2,8 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.AppVersionRepository;
import com.yihu.jw.entity.ehr.apps.AppVersion;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.annotation.Version;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/AppsRelationService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.apps.dao.*;
import com.yihu.jw.entity.ehr.apps.AppsRelation;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/OauthClientDetailsService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.OauthClientDetailsDao;
import com.yihu.jw.entity.ehr.oauth2.OauthClientDetails;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/apps/service/UserAppService.java

@@ -2,13 +2,11 @@ package com.yihu.jw.basic.apps.service;
import com.yihu.jw.basic.apps.dao.UserAppDao;
import com.yihu.jw.entity.ehr.apps.UserApp;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/dict/service/SystemDictEntryService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.dict.service;
import com.yihu.jw.basic.dict.dao.SystemDictEntryRepository;
import com.yihu.jw.entity.ehr.dict.DictEntryKey;
import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

svr/svr-basic/src/main/java/com/yihu/jw/basic/dict/service/SystemDictService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.dict.service;
import com.yihu.jw.basic.dict.dao.SystemDictEntryRepository;
import com.yihu.jw.basic.dict.dao.SystemDictRepository;
import com.yihu.jw.entity.ehr.dict.SystemDict;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/fileresource/service/FileResourceManager.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.fileresource.service;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgDeptDetailService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.org.service;
import com.yihu.jw.basic.org.dao.OrgDeptDetailRepository;
import com.yihu.jw.entity.ehr.org.OrgDeptDetail;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.service.spi.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgDeptImportService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.ehr.org.Organization;
import com.yihu.jw.basic.org.dao.OrgDeptRepository;
import com.yihu.jw.entity.ehr.org.OrgDept;
import com.yihu.jw.entity.ehr.org.OrgDeptDetail;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgDeptService.java

@@ -6,7 +6,7 @@ import com.yihu.jw.basic.org.dao.OrgDeptRepository;
import com.yihu.jw.basic.org.dao.OrgMemberRelationRepository;
import com.yihu.jw.entity.ehr.org.OrgDept;
import com.yihu.jw.entity.ehr.org.OrgDeptDetail;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.service.spi.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgHealthCategoryService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.org.service;
import com.yihu.jw.entity.ehr.org.OrgHealthCategory;
import com.yihu.jw.basic.org.dao.OrgHealthCategoryDao;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgMemberRelationService.java

@@ -4,8 +4,7 @@ import com.yihu.jw.basic.org.dao.OrgMemberRelationRepository;
import com.yihu.jw.entity.ehr.org.OrgMemberRelation;
import com.yihu.jw.basic.user.service.DoctorService;
import com.yihu.jw.basic.user.service.UserService;
import com.yihu.jw.restmodel.ehr.org.MOrgDeptData;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.transform.Transformers;
@@ -16,8 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
 * @author HZY

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgSaasService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.org.service;
import com.yihu.jw.basic.org.dao.OrgSaasRepository;
import com.yihu.jw.entity.ehr.org.OrgSaas;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/org/service/OrgService.java

@@ -6,7 +6,7 @@ import com.yihu.jw.entity.ehr.org.OrgDept;
import com.yihu.jw.entity.ehr.org.Organization;
import com.yihu.jw.entity.ehr.address.Address;
import com.yihu.jw.restmodel.ehr.org.MOrgDeptJson;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.id.ObjectId;
import org.apache.commons.lang.StringUtils;
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/ArchiveApplyService.java

@@ -6,7 +6,7 @@ import com.yihu.jw.entity.ehr.patient.ArchiveApply;
import com.yihu.jw.entity.ehr.patient.ArchiveRelation;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/ArchiveRelationService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.patient.dao.XArchiveRelationDao;
import com.yihu.jw.entity.ehr.patient.ArchiveRelation;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +14,6 @@ import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/AuthenticationService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.patient.service;
import com.yihu.jw.basic.patient.dao.XAuthenticationRepository;
import com.yihu.jw.entity.ehr.patient.Authentication;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/DemographicService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.address.service.AddressService;
import com.yihu.jw.basic.patient.dao.XDemographicInfoRepository;
import com.yihu.jw.entity.ehr.patient.DemographicInfo;
import com.yihu.jw.util.date.DateTimeUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.Query;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/FamiliesService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.patient.service;
import com.yihu.jw.basic.patient.dao.XFamiliesRepository;
import com.yihu.jw.basic.patient.dao.XMembersRepository;
import com.yihu.jw.entity.ehr.patient.Families;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/MedicalCardsService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.patient.service;
import com.yihu.jw.basic.patient.dao.XMedicalCardsDao;
import com.yihu.jw.entity.ehr.patient.MedicalCards;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/MembersService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.patient.service;
import com.yihu.jw.basic.patient.dao.XMembersRepository;
import com.yihu.jw.entity.ehr.patient.Members;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/patient/service/UserCardsService.java

@@ -7,7 +7,7 @@ import com.yihu.jw.entity.ehr.patient.ArchiveRelation;
import com.yihu.jw.entity.ehr.patient.UserCards;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/ItResourceDownloadService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.portal.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.portal.dao.ItResourceDownloadRepository;
import com.yihu.jw.entity.ehr.portal.ItResourceDownload;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/ItResourceService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.ItResourceRepository;
import com.yihu.jw.entity.ehr.portal.ItResource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.service.spi.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalAccountRepresentationService.java

@@ -1,15 +1,13 @@
package com.yihu.jw.basic.portal.service;
import com.google.common.collect.Lists;
import com.yihu.jw.basic.portal.dao.PortalAccountRepresentationDao;
import com.yihu.jw.entity.ehr.portal.PortalAccountRepresentation;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
 * Created by zhangdan on 2018/4/19.

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalFeedbackService.java

@@ -2,12 +2,10 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.PortalFeedbackRepository;
import com.yihu.jw.entity.ehr.portal.PortalFeedback;
import com.yihu.jw.entity.ehr.portal.SurveyTemplate;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalMessageRemindService.java

@@ -3,9 +3,9 @@ package com.yihu.jw.basic.portal.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.portal.dao.PortalMessageRemindRepository;
import com.yihu.jw.entity.ehr.portal.ProtalMessageRemind;
import com.yihu.mysql.model.DataList;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.mysql.service.DBQuery;
import com.yihu.jw.mysql.model.DataList;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.service.DBQuery;
import com.yihu.utils.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalNoticesService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.portal.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.portal.dao.PortalNoticesRepository;
import com.yihu.jw.entity.ehr.portal.PortalNotices;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalSettingService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.PortalSettingRepository;
import com.yihu.jw.entity.ehr.portal.PortalSetting;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/PortalStandardsService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.PortalStandardsRepository;
import com.yihu.jw.entity.ehr.portal.PortalStandards;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/QuestionnaireService.java

@@ -1,12 +1,11 @@
package com.yihu.jw.basic.portal.service;
import com.alibaba.fastjson.JSON;
import com.yihu.jw.basic.portal.dao.*;
import com.yihu.jw.entity.ehr.portal.SurveyAnswers;
import com.yihu.jw.entity.ehr.portal.SurveyOptionAnswers;
import com.yihu.jw.entity.ehr.portal.SurveyTemplateOptions;
import com.yihu.jw.entity.ehr.portal.SurveyTemplateQuestions;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -18,7 +17,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyLabelInfoService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.SurveyLabelInfoDao;
import com.yihu.jw.entity.ehr.portal.SurveyLabelInfo;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyQuestionOptionService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.SurveyQuestionOptionDao;
import com.yihu.jw.entity.ehr.portal.SurveyQuestionOption;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyQuestionService.java

@@ -7,7 +7,7 @@ import com.yihu.jw.basic.portal.dao.SurveyQuestionOptionDao;
import com.yihu.jw.entity.ehr.portal.SurveyQuestion;
import com.yihu.jw.entity.ehr.portal.SurveyQuestionOption;
import com.yihu.jw.basic.util.MapUtill;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyTemplateOptionService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.SurveyTemplateOptionsDao;
import com.yihu.jw.entity.ehr.portal.SurveyTemplateOptions;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyTemplateQuestionService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.portal.service;
import com.yihu.jw.basic.portal.dao.SurveyTemplateQuestionsDao;
import com.yihu.jw.entity.ehr.portal.SurveyTemplateQuestions;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/portal/service/SurveyTemplateService.java

@@ -13,7 +13,7 @@ import com.yihu.jw.basic.util.ClazzReflect;
import com.yihu.jw.entity.ehr.dict.SystemDict;
import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.jw.restmodel.ehr.portal.MSurveyTemplate;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/controller/TjQuotaEndPoint.java

@@ -3,7 +3,9 @@ package com.yihu.jw.basic.quota.controller;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.service.*;
import com.yihu.jw.basic.resource.service.RsResourceQuotaService;
import com.yihu.jw.entity.ehr.quota.*;
import com.yihu.jw.entity.ehr.resource.RsResourceQuota;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaDataSaveModel;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaDataSourceModel;
import com.yihu.jw.restmodel.ehr.tj.MTjQuotaModel;
@@ -54,6 +56,8 @@ public class TjQuotaEndPoint extends EnvelopRestEndpoint {
    TjQuotaDimensionMainService tjQuotaDimensionMainService;
    @Autowired
    TjQuotaDimensionSlaveService tjQuotaDimensionSlaveService;
    @Autowired
    private RsResourceQuotaService resourceQuotaService;
    @RequestMapping(value = ServiceApi.TJ.GetTjQuotaList, method = RequestMethod.GET)
    @ApiOperation(value = "根据查询条件查询统计指标表")
@@ -135,6 +139,11 @@ public class TjQuotaEndPoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "id", value = "编号", defaultValue = "")
            @RequestParam(value = "id") Long id) throws Exception{
        List<RsResourceQuota> list = resourceQuotaService.search("quotaId=" + id);
        if(list.size()>0){
            return failed("指标在视图中被使用暂时不能删除，若要删除先解除资源视图中指标关系",-1);
        }
        TjQuota tjQuota = tjQuotaService.getById(id);
        tjQuota.setStatus(-1);
        tjQuotaService.save(tjQuota);

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDataSaveService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjDataSaveRepository;
import com.yihu.jw.entity.ehr.quota.TjDataSave;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDataSourceService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjDataSourceRepository;
import com.yihu.jw.entity.ehr.quota.TjDataSource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDimensionMainService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjDimensionMainRepository;
import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjDimensionSlaveService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjDimensionSlaveRepository;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaCategoryService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaCategoryRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaCategory;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaChartService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.quota.dao.XTjQuotaChartRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaChart;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaDataSaveService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaDataSaveRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaDataSourceService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaDataSourceRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaDimensionMainService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaDimensionMainRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaDimensionSlaveService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaDimensionSlaveRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaLogService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.hibernate.HibenateUtils;
import com.yihu.jw.basic.quota.dao.XTjQuotaLogRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaLog;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.Session;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.quota.dao.XTjQuotaRepository;
import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com/yihu/jw/basic/quota/service/TjQuotaWarnService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.quota.service;
import com.yihu.jw.basic.quota.dao.XTjQuotaWarnRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaWarn;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/JsonReportService.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.jw.basic.report.dao.XJsonReportRepository;
import com.yihu.jw.entity.ehr.report.JsonReport;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.common.LogService;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.hibernate.HibernateException;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDatasetService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDataset;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDatasetsService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetsRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDatasets;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.Session;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportDetailService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportDetailRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDetail;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.Session;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportMetadataService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportMetaDataRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportMetadata;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcDailyReportService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcDailyReportRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReport;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.utils.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcQuotaDictService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcQuotaDictRepository;
import com.yihu.jw.entity.ehr.report.QcQuotaDict;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/report/service/QcQuotaResultService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.report.service;
import com.yihu.jw.basic.report.dao.XQcQuotaResultRepository;
import com.yihu.jw.entity.ehr.report.QcQuotaResult;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/PortalMessageTemplateService.java

@@ -1,13 +1,12 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.portal.PortalMessageTemplate;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.PortalMessageTemplateDao;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceCenterService.java

@@ -2,18 +2,16 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
//import com.yihu.jw.es.util.ElasticsearchUtil;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
//import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
import java.sql.ResultSet;
import java.util.*;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceIntegratedService.java

@@ -4,7 +4,7 @@ package com.yihu.jw.basic.resource.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.entity.ehr.quota.TjQuotaCategory;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.*;
import com.yihu.jw.entity.ehr.resource.*;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourcesTransformService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAdapterMetadataDao;
import com.yihu.jw.basic.resource.dao.RsAdapterSchemeDao;
import com.yihu.jw.entity.ehr.resource.RsAdapterMetadata;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAdapterDictionaryService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAdapterDictionaryDao;
import com.yihu.jw.entity.ehr.resource.RsAdapterDictionary;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAdapterMetadataService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAdapterMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsAdapterMetadata;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAdapterSchemeService.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAdapterDictionaryDao;
import com.yihu.jw.basic.resource.dao.RsAdapterMetadataDao;
import com.yihu.jw.basic.resource.dao.RsAdapterSchemeDao;
import com.yihu.jw.entity.ehr.resource.RsAdapterDictionary;
import com.yihu.jw.entity.ehr.resource.RsAdapterMetadata;
import com.yihu.jw.entity.ehr.resource.RsAdapterScheme;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -16,10 +14,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 适配方案服务
 * <p/>

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAppResourceMetadataGrantService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAppResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsAppResourceMetadata;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAppResourceService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.resource.RsAppResource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAppResourceDao;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDictionaryEntryService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsDictionaryEntryDao;
import com.yihu.jw.entity.ehr.resource.RsDictionaryEntry;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDictionaryService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsDictionaryDao;
import com.yihu.jw.entity.ehr.resource.RsDictionary;
import org.hibernate.SQLQuery;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDimensionCategoryService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsDimensionCategoryDao;
import com.yihu.jw.basic.resource.dao.RsDimensionDao;
import com.yihu.jw.entity.ehr.resource.RsDimensionCategory;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsDimensionService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsDimensionDao;
import com.yihu.jw.entity.ehr.resource.RsDimension;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsInterfaceService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsInterfaceDao;
import com.yihu.jw.entity.ehr.resource.RsInterface;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsMetadataService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceMetadataDao;
import com.yihu.jw.basic.resource.dao.RsMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsMetadata;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceGrantService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsOrgResourceDao;
import com.yihu.jw.basic.resource.dao.RsOrgResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsOrgResource;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceMetadataGrantService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsOrgResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsOrgResourceMetadata;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportCategoryAppService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.report.ReportCategoryAppRelation;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsReportCategoryAppDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportCategoryService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsReportCategoryDao;
import com.yihu.jw.entity.ehr.resource.RsReportCategory;
import org.hibernate.FlushMode;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportMonitorTypeService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsReportDao;
import com.yihu.jw.basic.resource.dao.RsReportMonitorTypeDao;
import com.yihu.jw.entity.ehr.resource.RsReportMonitorType;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsReportDao;
import com.yihu.jw.basic.resource.dao.RsReportViewDao;
import com.yihu.jw.entity.ehr.resource.RsReport;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportUsersService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.resource.RsReport;
import com.yihu.jw.entity.ehr.resource.RsReportUsers;
import com.yihu.jw.basic.resource.dao.RsReportUsersDao;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.RowMapper;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsReportViewService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsReportViewDao;
import com.yihu.jw.entity.ehr.resource.RsReportView;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceCategoryService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceCategoryDao;
import com.yihu.jw.basic.resource.dao.RsResourceDao;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceDefaultParamService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceDefaultParamDao;
import com.yihu.jw.entity.ehr.resource.RsResourceDefaultParam;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceDefaultQueryService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceDefaultQueryDao;
import com.yihu.jw.entity.ehr.resource.RsResourceDefaultQuery;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceGrantService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.resource.RsAppResource;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsAppResourceDao;
import com.yihu.jw.basic.resource.dao.RsAppResourceMetadataDao;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceMetadataService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.basic.resource.service;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsResourceMetadata;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceQuotaService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.entity.ehr.quota.TjQuota;
import com.yihu.jw.basic.resource.model.ResourceQuotaJson;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceQuotaDao;
import com.yihu.jw.entity.ehr.resource.RsResourceQuota;
import org.hibernate.Query;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.resource.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.*;
import com.yihu.jw.entity.ehr.resource.RsResource;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;