代码修改

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

@@ -4,7 +4,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.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@ 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.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -151,7 +151,7 @@ public class SystemDictEntryService extends BaseJpaService<SystemDictEntry, Syst
     */
    public List getDictEntryCodeAndValueByDictId(String dict_id) {
        String sql = "SELECT code,value FROM system_dict_entries where dict_id=:dict_id";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameter("dict_id", dict_id);
        return sqlQuery.list();
    }

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

@@ -5,7 +5,7 @@ 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.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -33,14 +33,14 @@ public class OrgDeptImportService extends BaseJpaService<OrgDept,OrgDeptReposito
    public List codeExistence(String[] code) {
        String sql = "SELECT code FROM Org_Dept WHERE code in(:code)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("code", code);
        return sqlQuery.list();
    }
    public List nameExistence(String[] name) {
        String sql = "SELECT name FROM Org_Dept WHERE name in(:name)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("name", name);
        return sqlQuery.list();
    }

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

@@ -5,7 +5,7 @@ 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.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -10,7 +10,7 @@ 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;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -127,7 +127,7 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
    public List orgCodeExistence(String[] orgCode) {
        String sql = "SELECT org_code FROM organizations WHERE org_code in(:orgCode)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("orgCode", orgCode);
        return sqlQuery.list();
    }
@@ -278,7 +278,7 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
     */
    public List orgExist(String[] org_codes) {
        String sql = "SELECT org_code, full_name FROM organizations WHERE org_code in(:org_codes)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("org_codes", org_codes);
        return sqlQuery.list();
    }
@@ -311,14 +311,14 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
     */
    public List getEhrOrgIdsByUserId(String userId) {
        String sql = "SELECT d.org_id FROM doctors d  JOIN  users u WHERE d.id = u.doctor_id AND u.id = :userId";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameter("userId", userId);
        return sqlQuery.list();
    }
    public List getJkzlOrgIdsByEhrOrgId(String[] orgIds) {
        String sql = "SELECT jkzl_org_id FROM organizations WHERE id in(:orgIds) AND  jkzl_org_id IS NOT NULL";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("orgIds", orgIds);
        return sqlQuery.list();
    }
@@ -346,7 +346,7 @@ public class OrgService extends BaseJpaService<Organization, OrganizationReposit
        } else {
            sql = "SELECT org_code,full_name FROM organizations";
        }
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        return sqlQuery.list();
    }

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

@@ -5,8 +5,6 @@ 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.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
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/CardManager.java

@@ -7,9 +7,8 @@ import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.jw.entity.ehr.patient.AbstractCard;
import com.yihu.jw.entity.ehr.patient.PhysicalCard;
import com.yihu.jw.entity.ehr.patient.VirtualCard;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.jw.exception.ApiException;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -7,8 +7,8 @@ import com.yihu.jw.entity.ehr.patient.DemographicInfo;
import com.yihu.jw.util.date.DateTimeUtil;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -396,7 +396,7 @@ public class DemographicService extends BaseJpaService {
                " '0-1','1-10','11-20','21-30','31-40','41-50','51-60','61-70','71-80','81-90','> 90') as age from ( "+
                " SELECT CASE when length(id)=15  then CONCAT('19',substr(id ,7,6)) ELSE substr(id ,7,8) end  id  from demographics t )t1 "+
                " )tt WHERE tt.age is not null  GROUP BY tt.age";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        return query.list();
    }

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

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.portal.dao.PortalFeedbackRepository;
import com.yihu.jw.entity.ehr.portal.PortalFeedback;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.hibernate.Query;
import org.hibernate.query.Query;
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/SurveyTemplateService.java

@@ -16,7 +16,7 @@ import com.yihu.jw.restmodel.ehr.portal.MSurveyTemplate;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;

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

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.quota.dao.XTjDimensionSlaveRepository;
import com.yihu.jw.entity.ehr.quota.TjDimensionSlave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionSlave;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
@@ -48,7 +48,7 @@ public class TjDimensionSlaveService extends BaseJpaService<TjDimensionSlave, XT
     */
    public List tjDimensionSlaveIsExist(String[] values) {
        String sql = "SELECT code FROM tj_dimension_slave WHERE code in(:values)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("values", values);
        return sqlQuery.list();
    }

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

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.quota.dao.XTjQuotaLogRepository;
import com.yihu.jw.entity.ehr.quota.TjQuotaLog;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -6,8 +6,8 @@ import com.yihu.jw.entity.ehr.quota.TjQuotaDataSave;
import com.yihu.jw.entity.ehr.quota.TjQuotaDataSource;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -105,7 +105,7 @@ public class TjQuotaService extends BaseJpaService<TjQuota, XTjQuotaRepository>
        }else{
            sql = "SELECT name FROM tj_quota WHERE name in(:values)";
        }
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("values", values);
        return sqlQuery.list();
    }
@@ -182,7 +182,7 @@ public class TjQuotaService extends BaseJpaService<TjQuota, XTjQuotaRepository>
     */
    public int getMaxIdNumber() {
        String sql = "SELECT MAX(CONVERT(case when ID is not null  then substring(ID,5) else '0' end ,SIGNED)) from rs_metadata";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        List list = sqlQuery.list();
        if(list != null && list.size() > 0){
            return Integer.valueOf(list.get(0).toString());

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

@@ -8,7 +8,7 @@ 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;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

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

@@ -3,7 +3,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.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.report.dao.XQcDailyReportDatasetsRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDatasets;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.report.dao.XQcDailyReportDetailRepository;
import com.yihu.jw.entity.ehr.report.QcDailyReportDetail;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

@@ -3,7 +3,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.jw.mysql.query.BaseJpaService;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.ehr.report.QcDailyReport;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;

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

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.ehr.portal.PortalMessageTemplate;
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.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.EnableFeignClients;

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

@@ -6,8 +6,8 @@ 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.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
@@ -194,7 +194,7 @@ public class ResourceCenterService extends BaseJpaService {
                " '0-1','1-10','11-20','21-30','31-40','41-50','51-60','61-70','71-80','81-90','> 90') as age from ( "+
                " SELECT CASE when length(id)=15  then CONCAT('19',substr(id ,7,6)) ELSE substr(id ,7,8) end  id  from demographics t )t1 "+
                " )tt WHERE tt.age is not null  GROUP BY tt.age";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -206,7 +206,7 @@ public class ResourceCenterService extends BaseJpaService {
                "'0-6','7-17','18-40','41-65','> 65') as age from ( " +
                " SELECT CASE when length(id)=15  then CONCAT('19',substr(id ,7,6)) ELSE substr(id ,7,8) end  id ,gender from demographics t )t1 " +
                " )tt WHERE tt.age is not null AND  gender IN ('1', '2') GROUP BY tt.age, tt.gender";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -268,7 +268,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> findAppFeatureIdAndNameByAppIdAndCode(String code, String appId) {
        Session session = currentSession();
        String sql = "SELECT id, name FROM apps_feature WHERE code = :code AND app_id = :appId";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setString("code", code);
        query.setString("appId", appId);
@@ -283,7 +283,7 @@ public class ResourceCenterService extends BaseJpaService {
        } else {
            sql = "SELECT COUNT(1) FROM  rs_resource";
        }
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        if (dataSource != null) {
            query.setInteger("dataSource", dataSource);
@@ -294,7 +294,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> getResourceCategoryIdAndNameList(){
        Session session = currentSession();
        String sql = "SELECT id, name FROM rs_resource_category";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -302,7 +302,7 @@ public class ResourceCenterService extends BaseJpaService {
    public BigInteger countResourceByResourceCateIdAndDataSource (String cateId, Integer dataSource) {
        Session session = currentSession();
        String sql = "SELECT COUNT(1) FROM rs_resource WHERE category_id = :cateId AND data_source = :dataSource";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setString("cateId", cateId);
        query.setInteger("dataSource", dataSource);
@@ -313,7 +313,7 @@ public class ResourceCenterService extends BaseJpaService {
        Session session = currentSession();
        String sql;
        sql = "SELECT COUNT(1) FROM rs_report";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return (BigInteger)query.uniqueResult();
    }
@@ -321,7 +321,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> getReportCategoryIdAndNameList(){
        Session session = currentSession();
        String sql = "SELECT id, name FROM rs_report_category";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -329,7 +329,7 @@ public class ResourceCenterService extends BaseJpaService {
    public BigInteger countReportByReportCateId (Integer cateId) {
        Session session = currentSession();
        String sql = "SELECT COUNT(1) FROM rs_report WHERE report_category_id = :cateId";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setInteger("cateId", cateId);
        return (BigInteger) query.uniqueResult();
@@ -339,7 +339,7 @@ public class ResourceCenterService extends BaseJpaService {
        Session session = currentSession();
        String sql;
        sql = "SELECT COUNT(1) FROM tj_quota";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return (BigInteger)query.uniqueResult();
    }
@@ -347,7 +347,7 @@ public class ResourceCenterService extends BaseJpaService {
    public List<Object[]> getQuotaCategoryIdAndNameList(){
        Session session = currentSession();
        String sql = "SELECT id, name FROM tj_quota_category";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        return query.list();
    }
@@ -355,7 +355,7 @@ public class ResourceCenterService extends BaseJpaService {
    public BigInteger countQuotaByQuotaCateId (Integer cateId) {
        Session session = currentSession();
        String sql = "SELECT COUNT(1) FROM tj_quota WHERE quota_type = :cateId";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setFlushMode(FlushMode.COMMIT);
        query.setInteger("cateId", cateId);
        return (BigInteger) query.uniqueResult();

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

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.resource.service;
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;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,7 +4,7 @@ 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;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;

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

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.resource.service;
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;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -4,7 +4,7 @@ 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;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -5,7 +5,7 @@ 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;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

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

@@ -4,7 +4,7 @@ import com.yihu.jw.entity.ehr.resource.RsAppResource;
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;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;

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

@@ -3,7 +3,7 @@ package com.yihu.jw.basic.resource.service;
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;
import org.hibernate.query.Query;
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/resource/service/RsResourceQuotaService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.resource.model.ResourceQuotaJson;
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;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -8,7 +8,7 @@ import com.yihu.jw.entity.ehr.resource.RsResource;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;
import com.yihu.jw.entity.ehr.resource.RsRolesResource;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

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

@@ -4,7 +4,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsRolesResourceDao;
import com.yihu.jw.basic.resource.dao.RsRolesResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsRolesResource;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;

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

@@ -3,8 +3,8 @@ package com.yihu.jw.basic.resource.service;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsRolesResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsRolesResourceMetadata;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -120,7 +120,7 @@ public class RsRolesResourceMetadataGrantService extends BaseJpaService<RsRolesR
                            " FROM rs_roles_resource_metadata b WHERE b.ROLES_RESOURCE_ID= :rolesResId" +
                ") p ORDER BY p.resourceMetadataName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("rolesResId", rolesResId);
        query.setParameter("rolesId", rolesId);
        query.setParameter("resId", resId);
@@ -135,7 +135,7 @@ public class RsRolesResourceMetadataGrantService extends BaseJpaService<RsRolesR
                "`rs_roles_resource_metadata` meta " +
                "WHERE  " +
                "ROLES_RESOURCE_ID in(:rolesResId) GROUP BY ROLES_ID HAVING count(ROLES_ID)>0";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameterList("rolesResId", rolesResId);
        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
        return query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/security/service/UserTokenService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.security.dao.UserTokenRepository;
import com.yihu.jw.entity.ehr.security.UserToken;
import com.yihu.jw.util.oauth2.TokenUtil;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdDataSetModelDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdDataSetModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Repository;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdDictionaryEntryModelDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Repository;
import java.util.List;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdDictionaryModelDao.java

@@ -1,11 +1,9 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Repository;
/**

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/StdMetaDataModelDao.java

@@ -1,9 +1,8 @@
package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.basic.standard.model.standard.StdMetaDataModel;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.util.sql.BeanTransformer;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.stereotype.Repository;
import java.util.List;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/dao/XSQLGeneralDAO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.basic.standard.dao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import java.io.IOException;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterDatasetRelationService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.util.sql.ErrorCode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.query.NativeQuery;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterDictEntryService.java

@@ -21,7 +21,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterMetadataService.java

@@ -25,7 +25,7 @@ import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterSchemeService.java

@@ -13,7 +13,7 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.common.StringUtil;
import com.yihu.jw.util.sql.SqlConstants;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/adapter/AdapterSchemeVersionService.java

@@ -1,6 +1,5 @@
package com.yihu.jw.basic.standard.service.adapter;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeModel;
import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeVersionModel;
import com.yihu.jw.basic.standard.model.adapter.resultModel.AdapterSchemeVersionResultDetailModel;
@@ -20,7 +19,7 @@ import com.yihu.jw.basic.standard.model.*;
import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/document/CDADataSetRelationshipManager.java

@@ -16,11 +16,10 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.ehr.standard.MCdaDataSet;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.util.sql.ErrorCode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.w3c.dom.Document;
@@ -28,7 +27,6 @@ import org.w3c.dom.Element;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/document/CDADocumentService.java

@@ -11,7 +11,7 @@ import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.sql.SqlCreator;
import com.yihu.jw.util.date.DateUtil;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/STDVersionService.java

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.standard.STDVersion;
import com.yihu.jw.basic.util.CDAVersionUtil;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StandardService.java

@@ -17,7 +17,7 @@ import com.yihu.jw.basic.standard.model.standard.resultModel.StandardResultDetai
import com.yihu.jw.util.sql.SqlConstants;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -93,10 +93,7 @@ public class StandardService extends SQLGeneralDAO {
        query.put("code", code);
        List<StandardModel> list = getList(query, order, 1, 0);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean standardNameValidate(String name) {
@@ -105,10 +102,7 @@ public class StandardService extends SQLGeneralDAO {
        query.put("name", name);
        List<StandardModel> list = getList(query, order, 1, 0);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    @Transactional
@@ -147,10 +141,7 @@ public class StandardService extends SQLGeneralDAO {
        query.setParameter("standardId", standardId);
        query.setParameter("name", name);
        List<StandardModel> list = query.list();
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Boolean standardCodeValidate(Long standardId, String code) {
@@ -159,10 +150,7 @@ public class StandardService extends SQLGeneralDAO {
        query.setParameter("standardId", standardId);
        query.setParameter("code", code);
        List<StandardModel> list = query.list();
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    @Transactional
@@ -397,10 +385,7 @@ public class StandardService extends SQLGeneralDAO {
        Query query = getCurrentSession().createQuery(hql);
        query.setParameter("standardId", standardId);
        List<StandardVersionModel> standardModelList = query.list();
        if (!CollectionUtils.isEmpty(standardModelList)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(standardModelList);
    }
    private void update(StandardModel standardModel) throws Exception {

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StandardVersionService.java

@@ -16,7 +16,7 @@ import com.yihu.jw.basic.standard.model.adapter.AdapterSchemeModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.util.sql.SqlConstants;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -78,7 +78,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    public ListEnvelop getDetailResultModelList(Long standardId, String condition, String order, Integer rows, Integer page) {
        try {
            List<StandardVersionModel> standardVersionModelList = getVersionList(standardId, condition, order, rows, page);
            List<DictItem> detailModelList = new ArrayList<DictItem>();
            List<DictItem> detailModelList = new ArrayList<>();
            DictItem item = new DictItem();
            item.setCode("");
            item.setValue("-无-");
@@ -145,10 +145,7 @@ public class StandardVersionService extends SQLGeneralDAO {
        query.setParameter("versionName", versionName);
        query.setParameter("versionId", versionId);
        List<StandardVersionModel> list = query.list();
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    @Transactional
@@ -349,8 +346,7 @@ public class StandardVersionService extends SQLGeneralDAO {
                /*version.getCDATableName(),
               /* version.getCDADatasetTableName()*/};
        List<String> deleteSql = new ArrayList<>();
        for (int i = 0; i < tables.length; ++i) {
            String table = tables[i];
        for (String table : tables) {
            deleteSql.add(SqlConstants.DROP_TABLE + table);
        }
        insertBatch(deleteSql);
@@ -411,8 +407,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    @Transactional
    public String saveDatasetExcel(MultipartFile file, String version,Long standardId) throws Exception {
        List<List<String[]>> list = ExcelUtilBigData.readerExcel(file.getInputStream(), 13, 0);//String[] 存放一行,List<String[]> 代表一个excel表格
        for (int i = 0; i < list.size(); i++) {
            List<String[]> l = list.get(i);
        for (List<String[]> l : list) {
            //遍历sheet
            //新增数据集
            StandardVersion standardVersion = new StandardVersion(version);
@@ -440,7 +435,7 @@ public class StandardVersionService extends SQLGeneralDAO {
                stdeMetadata.setType(getNotNull(l.get(row)[5]));
                stdeMetadata.setFormat(getNotNull(l.get(row)[6]));
                String dicId = getNotNull(l.get(row)[7]);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(dicId)){
                if (org.apache.commons.lang3.StringUtils.isNotBlank(dicId)) {
                    stdeMetadata.setDictId(Long.valueOf(dicId));
                }
                stdeMetadata.setColumnName(getNotNull(l.get(row)[8]));
@@ -448,19 +443,19 @@ public class StandardVersionService extends SQLGeneralDAO {
                stdeMetadata.setColumnLength(getNotNull(l.get(row)[10]));
                stdeMetadata.setPrimaryKey(false);
                String isPrimaryKey = getNotNull(l.get(row)[11]);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(isPrimaryKey)){
                    if("1".equals(isPrimaryKey)){
                if (org.apache.commons.lang3.StringUtils.isNotBlank(isPrimaryKey)) {
                    if ("1".equals(isPrimaryKey)) {
                        stdeMetadata.setPrimaryKey(true);
                    }
                }
                String isNullable = getNotNull(l.get(row)[12]);
                stdeMetadata.setNullable(false);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(isNullable)){
                    if("1".equals(isNullable)){
                if (org.apache.commons.lang3.StringUtils.isNotBlank(isNullable)) {
                    if ("1".equals(isNullable)) {
                        stdeMetadata.setNullable(true);
                    }
                }
                if(org.apache.commons.lang3.StringUtils.isBlank(stdeMetadata.getCode())){
                if (org.apache.commons.lang3.StringUtils.isBlank(stdeMetadata.getCode())) {
                    continue;
                }
                stdMetadataService.add(standardVersion, stdeMetadata);

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdCDACatalogService.java

@@ -33,7 +33,7 @@ public class StdCDACatalogService extends SQLGeneralDAO {
    }
    public void finalize() throws Throwable {
    protected void finalize() throws Throwable {
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdCDADatasetService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdCDAService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.BeanTransformer;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDatasetCatalogService.java

@@ -7,7 +7,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlCreator;
import com.yihu.jw.basic.standard.model.standard.StdDatasetCatalogModel;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.BeanPropertyRowMapper;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDatasetService.java

@@ -15,8 +15,8 @@ import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import jxl.Sheet;
import jxl.Workbook;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -359,7 +359,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (!StringUtil.isEmpty(sql)) {
                sql = sql.substring(0, sql.length() - SqlConstants.UNION.length());
                SQLQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                NativeQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                sqlQuery.setResultTransformer(transformer);
                List<StdDataSetModel> modelList = sqlQuery.list();
                List<StdDataSetModel> distinctModelList = new ArrayList<>();
@@ -559,7 +559,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (!StringUtil.isEmpty(sql)) {
                sql = sql.substring(0, sql.length() - SqlConstants.UNION.length());
                SQLQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                NativeQuery sqlQuery = getCurrentSession().createSQLQuery(sql);
                sqlQuery.setResultTransformer(transformer);
                List<StdDataSetModel> modelList = sqlQuery.list();
                List<StdDataSetModel> distinctModelList = new ArrayList<>();

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDictEntryService.java

@@ -3,7 +3,6 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.model.Select2;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryEntryModel;
import com.yihu.jw.basic.standard.model.standard.StdDictionaryModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -15,7 +14,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.util.sql.SqlConstants;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdDictService.java

@@ -15,7 +15,7 @@ import com.yihu.jw.util.sql.*;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.basic.standard.model.DictItem;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -42,7 +42,7 @@ public class StdDictService extends SQLGeneralDAO {
    public StdDictService() {
    }
    public void finalize() throws Throwable {
    protected void finalize() throws Throwable {
    }
@@ -111,10 +111,7 @@ public class StdDictService extends SQLGeneralDAO {
        query.put("code", code);
        List<StdDictionaryModel> list = this.getList(standardVersion, query, order, 1, 0);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Integer dictId) {
@@ -136,10 +133,7 @@ public class StdDictService extends SQLGeneralDAO {
        sqlCreator.neCondition("id", dictId);
        String sql = sqlCreator.selectData(standardVersion.getDictTableName());
        List<StdDictionaryModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdDictionaryModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public ObjEnvelop update(String stdVersion, String dict) {
@@ -184,7 +178,7 @@ public class StdDictService extends SQLGeneralDAO {
        String sql = "select id, std_id, code, name, define, description, parent_id from " + dictTableName + " where id = :id";
        Query query = session.createSQLQuery(sql);
        query.setInteger("id", dictId);
        query.setParameter("id", dictId);
        query.setResultTransformer(new BeanTransformer<>(StdDictionaryModel.class));
        return (StdDictionaryModel) query.uniqueResult();
    }
@@ -294,9 +288,9 @@ public class StdDictService extends SQLGeneralDAO {
        if (limit != null) {
            if (offset != null &&offset>0) {
                sql += " limit "+(offset - 1) * limit+","+limit;
                completeSql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
                completeSql += " limit "+limit;
            }
        }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdMetadataService.java

@@ -2,7 +2,6 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.adapter.AdapterMetadataModel;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -14,8 +13,8 @@ import com.yihu.jw.basic.standard.model.standard.*;
import com.yihu.jw.basic.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,12 +78,12 @@ public class StdMetadataService extends SQLGeneralDAO {
        if (limit != null) {
            if (offset != null &&offset>0) {
                sql += " limit "+(offset - 1) * limit+","+limit;
                completeSql += " limit "+(offset - 1) * limit+","+limit;
            }else {
                sql += " limit "+limit;
                completeSql += " limit "+limit;
            }
        }
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        return jdbcTemplate.query(completeSql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
    }
    public List<StdMetaDataModel> getList(String stdVersion, Long datasetId, String condition, String order, Integer limit, Integer offset) {
@@ -128,10 +127,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        query.put("code", code);
        List<StdMetaDataModel> list = this.getList(standardVersion, datasetId, query, order, 1, 1);
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Long metadataId) {
@@ -154,10 +150,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        sqlCreator.neCondition("id", metadataId);
        String sql = sqlCreator.selectData(standardVersion.getMetaDataTableName());
        List<StdMetaDataModel> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(StdMetaDataModel.class));
        if (!CollectionUtils.isEmpty(list)) {
            return true;
        }
        return false;
        return !CollectionUtils.isEmpty(list);
    }
    public ObjEnvelop update(String stdVersion, String metadata) {
@@ -212,7 +205,7 @@ public class StdMetadataService extends SQLGeneralDAO {
        Session session = getCurrentSession();
        String sql = "delete from " + standardVersion.getMetaDataTableName() + " where id = :id";
        Query query = session.createSQLQuery(sql);
        query.setLong("id", metadataId);
        query.setParameter("id", metadataId);
        query.executeUpdate();
    }
@@ -373,7 +366,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                    StandardVersion version = new StandardVersion(versionModel.getVersion());
                    sqlDatasetCreator.equalCondition("code", code);
                    sql = sqlDatasetCreator.selectData(version.getDataSetTableName());
                    SQLQuery sqlQuery = session.createSQLQuery(sql);
                    NativeQuery sqlQuery = session.createNativeQuery(sql);
                    BeanTransformer datasetTransformer = new BeanTransformer(StdDataSetModel.class);
                    sqlQuery.setResultTransformer(datasetTransformer);
                    sqlQuery.setParameter("code", code);
@@ -405,7 +398,7 @@ public class StdMetadataService extends SQLGeneralDAO {
                List<StdMetaDataModel> distinctModelList = new ArrayList<>();
                if (!StringUtil.isEmpty(sql)) {
                    sql = sql.substring(0, sql.length() - SqlConstants.UNION.length());
                    SQLQuery sqlQuery;
                    NativeQuery sqlQuery;
                    sqlQuery = getCurrentSession().createSQLQuery(sql);
                    sqlQuery.setResultTransformer(metadataTransformer);
                    for (int i = 1; i < count; i++) {

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdPublisherService.java

@@ -11,7 +11,7 @@ import com.yihu.jw.util.sql.RequestParamTransformer;
import com.yihu.jw.basic.standard.model.standard.resultModel.PublisherResultModel;
import com.yihu.jw.util.sql.SqlConstants;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/service/standard/StdRelationService.java

@@ -3,7 +3,6 @@ package com.yihu.jw.basic.standard.service.standard;
import com.fasterxml.jackson.databind.JsonNode;
import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.standard.model.standard.StdDatasetRelation;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.sql.SqlCreator;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/DatasourceDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.basic.standard.dao.SQLGeneralDAO;
import com.yihu.jw.basic.system.model.SystemDatasource;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/FlowTempDao.java

@@ -2,7 +2,7 @@
//
//import com.yihu.hos.system.model.SystemServiceFlowTemp;
//import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
//import org.hibernate.Query;
//import org.hibernate.query.Query;
//import org.hibernate.Session;
//import org.springframework.stereotype.Repository;
//

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/dao/SystemParamDao.java

@@ -3,7 +3,7 @@
//import com.yihu.hos.system.model.SystemParam;
//import com.yihu.hos.web.framework.dao.SQLGeneralDAO;
//import com.yihu.hos.web.framework.model.Result;
//import org.hibernate.Query;
//import org.hibernate.query.Query;
//import org.springframework.stereotype.Repository;
//import org.springframework.util.StringUtils;
//

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/DoctorService.java

@@ -15,7 +15,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.slf4j.Logger;

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/RoleUserService.java

@@ -7,7 +7,7 @@ import com.yihu.jw.basic.user.dao.RoleUserDao;
import com.yihu.jw.basic.user.dao.RolesDao;
import com.yihu.jw.entity.ehr.user.RoleUser;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/service/UserService.java

@@ -10,7 +10,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.entity.ehr.user.Doctors;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.Query;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;