代码修改

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

@@ -16,7 +16,7 @@ import com.yihu.jw.entity.ehr.user.Roles;
import com.yihu.jw.entity.ehr.oauth2.OauthClientDetails;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -171,7 +171,7 @@ public class AppService extends BaseJpaService<App, AppDao> {
        }
        sql += ") p ORDER BY p.id";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("userId", userId);
        query.setParameter("catalog", catalog);
        if (!StringUtils.isEmpty(manageType)) {
@@ -275,7 +275,7 @@ public class AppService extends BaseJpaService<App, AppDao> {
        }
        sql += ") p ORDER BY p.id";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("userId", userId);
        if (!StringUtils.isEmpty(doctorManageType)) {
            query.setParameter("doctorManageType", doctorManageType);

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

@@ -3,7 +3,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.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.query.NativeQuery;
import org.hibernate.service.spi.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@ public class OrgDeptDetailService extends BaseJpaService<OrgDeptDetail, OrgDeptD
    public String searchByOrgNameAndDeptName(String orgName,String deptName){
        String orgDeptDetailPlace = "";
        String sql = "select odd.* from org_dept_detail odd JOIN org_dept od on odd.dept_id=od.id JOIN organizations o on od.org_id =o.id where o.full_name=:orgName AND  od.name =:deptName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("orgName", orgName);
        query.setParameter("deptName", deptName);
        List<Object> list  = query.list();

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

@@ -5,7 +5,7 @@ import com.yihu.jw.basic.quota.dao.XTjDimensionMainRepository;
import com.yihu.jw.entity.ehr.quota.TjDimensionMain;
import com.yihu.jw.entity.ehr.quota.TjQuotaDimensionMain;
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;
@@ -53,7 +53,7 @@ public class TjDimensionMainService extends BaseJpaService<TjDimensionMain, XTjD
    public List tjDimensionMainIsExist(String[] values)
    {
        String sql =  "SELECT code FROM tj_dimension_main 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/TjQuotaCategoryService.java

@@ -3,7 +3,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.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.Transactional;
@@ -78,7 +78,7 @@ public class TjQuotaCategoryService extends BaseJpaService<TjQuotaCategory, XTjQ
    public List getQuotaCategoryByName(String[] names)
    {
        String sql = "SELECT name, id FROM tj_quota_category WHERE name in(:names)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("names", names);
        return sqlQuery.list();
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsAppResourceMetadataGrantService.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.RsAppResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsAppResourceMetadata;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -131,7 +131,7 @@ public class RsAppResourceMetadataGrantService extends BaseJpaService<RsAppResou
                            " FROM rs_app_resource_metadata b WHERE b.APP_RESOURCE_ID= :appResId" +
                ") p ORDER BY p.resourceMetadataName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("appResId", appResId);
        query.setParameter("appId", appId);
        query.setParameter("resId", resId);
@@ -147,7 +147,7 @@ public class RsAppResourceMetadataGrantService extends BaseJpaService<RsAppResou
                "`rs_app_resource_metadata` meta " +
                "WHERE  " +
                "APP_RESOURCE_ID in(:appResId) GROUP BY APP_ID HAVING count(APP_ID)>0";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameterList("appResId", appResId);
        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
        return query.list();

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

@@ -3,9 +3,9 @@ package com.yihu.jw.basic.resource.service;
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;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.PreparedStatementCreator;
@@ -117,7 +117,7 @@ public class RsDictionaryService extends BaseJpaService<RsDictionary, RsDictiona
    public List codeExist(String[] codes)
    {
        String sql = "SELECT DISTINCT code FROM rs_dictionary WHERE code in(:codes)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("codes", codes);
        return sqlQuery.list();
    }

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

@@ -4,7 +4,7 @@ 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;
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;
@@ -102,7 +102,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
        String header = "INSERT INTO rs_metadata(id, domain, name, std_code, dict_code, column_type, null_able, description, dict_id, valid) VALUES \n";
        StringBuilder sql = new StringBuilder(header) ;
        Map<String, Object> map;
        SQLQuery query;
        NativeQuery query;
        int total = 0;
        for(int i=1; i<=metaLs.size(); i++){
            map = metaLs.get(i-1);
@@ -135,7 +135,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
     */
    public List stdCodeExist(String stdCodes) {
        String sql = "SELECT std_code FROM rs_metadata WHERE std_code in(:stdCodes) AND valid<>0";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("stdCodes", stdCodes.split(","));
        return sqlQuery.list();
    }
@@ -145,7 +145,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
     */
    public List idExist( String[] ids) {
        String sql = "SELECT id FROM rs_metadata WHERE id in(:ids)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("ids", ids);
        return sqlQuery.list();
    }
@@ -153,7 +153,7 @@ public class RsMetadataService extends BaseJpaService<RsMetadata, RsResourceMeta
    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/resource/service/RsOrgResourceGrantService.java

@@ -130,7 +130,7 @@ public class RsOrgResourceGrantService extends BaseJpaService<RsOrgResource, RsO
//        String sql = "SELECT sm.id, m.name FROM rs_resource_metadata sm LEFT JOIN rs_metadata m ON sm.METADATA_ID=m.ID WHERE " +
//                "sm.resources_id=:resourcesId";
//        SQLQuery query = currentSession().createSQLQuery(sql);
//        NativeQuery query = currentSession().createSQLQuery(sql);
//        query.setParameter("resourcesId", resourcesId);
//        List<Object[]> rsResourceMetadatas = query.list();

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsOrgResourceMetadataGrantService.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.RsOrgResourceMetadataDao;
import com.yihu.jw.entity.ehr.resource.RsOrgResourceMetadata;
import org.hibernate.query.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.transform.Transformers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -131,7 +131,7 @@ public class RsOrgResourceMetadataGrantService extends BaseJpaService<RsOrgResou
                            " FROM rs_organization_resource_metadata b WHERE b.ORGANIZATION_RESOURCE_ID= :organizationResId" +
                ") p ORDER BY p.resourceMetadataName";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("organizationResId", organizationResId);
        query.setParameter("organizationId", organizationId);
        query.setParameter("resId", resId);
@@ -147,7 +147,7 @@ public class RsOrgResourceMetadataGrantService extends BaseJpaService<RsOrgResou
                "`rs_organization_resource_metadata` meta " +
                "WHERE  " +
                "ORGANIZATION_RESOURCE_ID in(:organizationResId) GROUP BY ORGANIZATION_ID HAVING count(ORGANIZATION_ID)>0";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameterList("organizationResId", organizationResId);
        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
        return query.list();

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

@@ -120,7 +120,7 @@ public class RsResourceGrantService extends BaseJpaService<RsAppResource, RsAppR
//        String sql = "SELECT sm.id, m.name FROM rs_resource_metadata sm LEFT JOIN rs_metadata m ON sm.METADATA_ID=m.ID WHERE " +
//                "sm.resources_id=:resourcesId";
//        SQLQuery query = currentSession().createSQLQuery(sql);
//        NativeQuery query = currentSession().createSQLQuery(sql);
//        query.setParameter("resourcesId", resourcesId);
//        List<Object[]> rsResourceMetadatas = query.list();

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

@@ -115,7 +115,7 @@ public class RsRolesResourceGrantService extends BaseJpaService<RsRolesResource,
            return rolesRsList;
//        String sql = "SELECT sm.id, m.name FROM rs_resource_metadata sm LEFT JOIN rs_metadata m ON sm.METADATA_ID=m.ID WHERE " +
//                "sm.resources_id=:resourcesId";
//        SQLQuery query = currentSession().createSQLQuery(sql);
//        NativeQuery query = currentSession().createSQLQuery(sql);
//        query.setParameter("resourcesId", resourcesId);
//        List<Object[]> rsResourceMetadatas = query.list();
        rsRolesResourceDao.saveAll(rolesRsList);

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

@@ -4,8 +4,8 @@ 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.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -73,7 +73,7 @@ public class UserTokenService {
        sb.append("    and app_id  = '" + appId + "'  ");
        String sql = sb.toString();
        SQLQuery sqlQuery = session.createSQLQuery(sql);
        NativeQuery sqlQuery = session.createSQLQuery(sql);
        if (sqlQuery.list().size() == 0) {
            return null;

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/controller/RuleController.java

@@ -175,7 +175,7 @@ public class RuleController extends EnvelopRestEndpoint {
    @RequestMapping(value = "bindQcRule", method = RequestMethod.GET)
    public Envelop getBindQcRule(
            @RequestParam(name = "stdVersion") String stdVersion,
            @RequestParam(name = "stdDataSetId") Integer stdDataSetId,
            @RequestParam(name = "stdDataSetId") Long stdDataSetId,
            @RequestParam(name = "dataElement") String dataElement) {
        Envelop envelop = new Envelop();
        try {

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/controller/StdDatasetController.java

@@ -56,7 +56,7 @@ public class StdDatasetController extends EnvelopRestEndpoint {
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
            @RequestParam(value = "datasetId") Integer datasetId) {
            @RequestParam(value = "datasetId") Long datasetId) {
        return stdDatasetService.get(stdVersion, datasetId);
    }
@@ -66,7 +66,7 @@ public class StdDatasetController extends EnvelopRestEndpoint {
            @ApiParam(name = "stdVersion", value = "标准版本号")
            @RequestParam(value = "stdVersion") String stdVersion,
            @ApiParam(name = "datasetId", value = "数据集ID")
            @RequestParam(value = "datasetId") Integer datasetId) {
            @RequestParam(value = "datasetId") Long datasetId) {
        return stdDatasetService.delete(stdVersion, datasetId);
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/controller/StdIndexController.java

@@ -0,0 +1,117 @@
package com.yihu.jw.basic.standard.controller;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.jw.basic.standard.model.standard.StdIndex;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.basic.standard.service.standard.StdIndexService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
@Api(value = "stdIndex", tags = {"标准索引相关"})
@RestController("StdIndexController")
public class StdIndexController extends EnvelopRestEndpoint {
    @Autowired
    private StdIndexService stdIndexService;
    @ApiOperation("获取列表数据(分页)")
    @RequestMapping(value = ServiceApi.StdIndex.List, method = RequestMethod.GET)
    public Envelop getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "rows", value = "分页大小", defaultValue = "15")
            @RequestParam(value = "rows", required = false) int rows,
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) int page,
            @ApiParam(name = "version", value = "版本", defaultValue = "")
            @RequestParam(value = "version") String version) throws IOException {
        List<StdIndex> responseEntity = stdIndexService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, sorts, page, rows,true);
        List<StdIndex> all = stdIndexService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, sorts, null, null,true);
        Long count = Long.valueOf(all.size());
        return PageEnvelop.getSuccessListWithPage("查询成功",responseEntity,page,rows,count);
    }
    @ApiOperation("根据id获取索引")
    @RequestMapping(value = ServiceApi.StdIndex.GetById, method = RequestMethod.GET)
    public Envelop getById(@ApiParam(name = "version", value = "版本", defaultValue = "")
                             @RequestParam(value = "version") String version,
                             @ApiParam(name = "id", value = "id", defaultValue = "")
                             @PathVariable(value = "id") int id) throws IOException {
        String filters = "id="+id;
        List<StdIndex> list = stdIndexService.searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, null, null, null,true);
        if(CollectionUtils.isEmpty(list)){
            return success();
        }
        return ObjEnvelop.getSuccess("查询成功",list.get(0));
    }
    @ApiOperation("保存标准索引")
    @RequestMapping(value = ServiceApi.StdIndex.Create, method = RequestMethod.POST)
    public Envelop save(@ApiParam(name = "indexJson", value = "标准索引json字符串")
                          @RequestParam(value = "indexJson") String indexJson){
        try {
            stdIndexService.save(indexJson);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return failed("保存失败");
        }
    }
    @ApiOperation("保存标准索引")
    @RequestMapping(value = ServiceApi.StdIndex.Update, method = RequestMethod.POST)
    public Envelop update(@ApiParam(name = "indexJson", value = "标准索引json字符串")
                        @RequestParam(value = "indexJson") String indexJson){
        try {
            stdIndexService.update(indexJson);
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return failed("保存失败");
        }
    }
    @ApiOperation("根据传过来的条件判断是否是唯一的,唯一返回true")
    @RequestMapping(value = ServiceApi.StdIndex.IsUnique, method = RequestMethod.POST)
    public Envelop isUniqueName(@ApiParam(name = "filters", value = "数据集id")
                                @RequestParam(value = "filters") String filters,
                                @ApiParam(name = "version", value = "版本号")
                                @RequestParam(value = "version") String version) throws IOException {
        return ObjEnvelop.getSuccess("查询成功",stdIndexService.isUnique(filters,version));
    }
    @ApiOperation("删除索引,多个用,隔开")
    @RequestMapping(value = ServiceApi.StdIndex.DeleteById, method = RequestMethod.DELETE)
    public Envelop delete(@ApiParam(name = "ids", value = "ids")
                           @PathVariable(value = "ids") String ids,
                          @ApiParam(name = "version", value = "version")
                           @RequestParam(value = "version") String version) {
        String sql = "delete from std_index_"+version+" where id in ('"+ ids + "')";
        try {
            stdIndexService.execute(sql);
            return success();
        } catch (Exception e){
            e.getMessage();
            return failed("删除失败");
        }
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/standard/StdIndex.java

@@ -8,7 +8,7 @@ public class StdIndex {
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "id")
    private Integer id;//主键id
    private Long id;//主键id
    @Column(name = "std_dataset_id", nullable = false)
    private Long stdDatasetId;//所属的数据集id
    @Column(name = "std_dataset_code", nullable = true, length = 32)
@@ -25,11 +25,11 @@ public class StdIndex {
    private String version;//版本号
    public Integer getId() {
    public Long getId() {
        return id;
    }
    public void setId(Integer id) {
    public void setId(Long id) {
        this.id = id;
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/standard/model/standard/resultModel/MStdIndex.java

@@ -0,0 +1,80 @@
package com.yihu.jw.basic.standard.model.standard.resultModel;
public class MStdIndex {
    private Long id;
    private Long stdDatasetId;
    private String stdDatasetCode;
    private String indexName;
    private String indexField;
    private String indexType;
    private String indexMethod;
    private String version;
    public MStdIndex() {
    }
    public Long getId() {
        return this.id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Long getStdDatasetId() {
        return this.stdDatasetId;
    }
    public void setStdDatasetId(Long stdDatasetId) {
        this.stdDatasetId = stdDatasetId;
    }
    public String getStdDatasetCode() {
        return this.stdDatasetCode;
    }
    public void setStdDatasetCode(String stdDatasetCode) {
        this.stdDatasetCode = stdDatasetCode;
    }
    public String getIndexName() {
        return this.indexName;
    }
    public void setIndexName(String indexName) {
        this.indexName = indexName;
    }
    public String getIndexField() {
        return this.indexField;
    }
    public void setIndexField(String indexField) {
        this.indexField = indexField;
    }
    public String getIndexType() {
        return this.indexType;
    }
    public void setIndexType(String indexType) {
        this.indexType = indexType;
    }
    public String getIndexMethod() {
        return this.indexMethod;
    }
    public void setIndexMethod(String indexMethod) {
        this.indexMethod = indexMethod;
    }
    public String getVersion() {
        return this.version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
}

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

@@ -152,7 +152,7 @@ public class RuleService {
    /* ******************************************   反射方式绑定质控规则 *************************************** */
    public List<RuleModel> getBindQcRule(String stdVersion,Integer stdDataSetId,String dataElement) throws IOException {
    public List<RuleModel> getBindQcRule(String stdVersion,Long stdDataSetId,String dataElement) throws IOException {
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(stdVersion), stdDataSetId);
        if (stdDataSetModel != null) {
            String qcRuleMethod = getQcRule(stdVersion, stdDataSetModel.getCode(), dataElement);
@@ -204,7 +204,7 @@ public class RuleService {
            return;
        }
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId.intValue());
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId);
        if (stdDataSetModel != null) {
            qcMetaDataKeySchema.setQcMetaDataList(version, stdDataSetModel.getCode(), metadataInnerCode, ruleMethod);
        } else {
@@ -237,7 +237,7 @@ public class RuleService {
        if(CollectionUtils.isNotEmpty(list)){
            for(StdMetaDataModel model:list){
                Long dataSetId = model.getDataSetId();
                StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId.intValue());
                StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), dataSetId);
                if (stdDataSetModel != null) {
                    qcMetaDataKeySchema.setQcMetaDataList(version, stdDataSetModel.getCode(), metadataInnerCode, ruleMethod);
                } else {
@@ -256,7 +256,7 @@ public class RuleService {
    public void bindQcRuleByDataSet(String stdVersion, Long dataSetId) {
        try {
            Map<String, Serializable> map = null;
            StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(stdVersion), dataSetId.intValue());
            StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(stdVersion), dataSetId);
            List<StdMetaDataModel> metadataList = stdMetadataService.searchPageData(StdMetaDataModel.class, StandardVersion.MetaDataTable, stdVersion, "dataSetId=" + dataSetId, null, null, null);
            RuleModel ruleModel = null;

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

@@ -98,7 +98,7 @@ public class StdDatasetService extends SQLGeneralDAO {
        return !CollectionUtils.isEmpty(list);
    }
    public Envelop delete(String stdVersion, Integer datasetId) {
    public Envelop delete(String stdVersion, Long datasetId) {
        if (StringUtil.isEmpty(stdVersion)) {
            return Envelop.getError("并无该标准版本");
        }
@@ -147,7 +147,7 @@ public class StdDatasetService extends SQLGeneralDAO {
    }
    public ObjEnvelop get(String stdVersion, Integer datasetId) {
    public ObjEnvelop get(String stdVersion, Long datasetId) {
        if (StringUtil.isEmpty(stdVersion)) {
            return ObjEnvelop.getError("并无该数据集信息");
        }
@@ -175,7 +175,7 @@ public class StdDatasetService extends SQLGeneralDAO {
//        return (StdDataSetModel) query.uniqueResult();
//    }
    public StdDataSetModel get(StandardVersion standardVersion, Integer datasetId) {
    public StdDataSetModel get(StandardVersion standardVersion, Long datasetId) {
        String dataSetTable = standardVersion.getDataSetTableName();
        SqlCreator sqlCreator = new SqlCreator(StdDataSetModel.class);
        sqlCreator.equalCondition("id", datasetId);
@@ -192,15 +192,15 @@ public class StdDatasetService extends SQLGeneralDAO {
        query.executeUpdate();
    }
    private void delete(StandardVersion standardVersion, Integer datasetId) {
    private void delete(StandardVersion standardVersion, Long datasetId) {
        Session session = getCurrentSession();
        String sql = "delete from " + standardVersion.getDataSetTableName() + " where id = :id";
        Query query = session.createSQLQuery(sql);
        query.setInteger("id", datasetId);
        query.setParameter("id", datasetId);
        query.executeUpdate();
        sql = "delete from " + standardVersion.getMetaDataTableName() + " where dataset_id = :datasetId";
        query = session.createSQLQuery(sql);
        query.setInteger("datasetId", datasetId);
        query.setParameter("datasetId", datasetId);
        query.executeUpdate();
    }

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

@@ -0,0 +1,64 @@
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.StdDataSetModel;
import com.yihu.jw.basic.standard.model.standard.StdIndex;
import com.yihu.jw.basic.standard.model.standard.resultModel.MStdIndex;
import com.yihu.jw.basic.standard.service.bo.StandardVersion;
import com.yihu.jw.util.sql.SqlCreator;
import org.hibernate.query.Query;
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.io.IOException;
import java.util.List;
@Transactional
@Service
public class StdIndexService extends SQLGeneralDAO {
    @Autowired
    private StdDatasetService stdDatasetService;
    public void save(String indexJson) throws Exception {
        MStdIndex mStdIndex = objectMapper.readValue(indexJson, MStdIndex.class);
        String version = mStdIndex.getVersion();
        Long stdDatasetId = mStdIndex.getStdDatasetId();
        //通过id查找stdDatasetCode
        StdDataSetModel stdDataSetModel = stdDatasetService.get(new StandardVersion(version), stdDatasetId);
        if(stdDataSetModel!=null){
            mStdIndex.setStdDatasetCode(stdDataSetModel.getCode());
        }else{
            throw new Exception("未找到数据集");
        }
        JsonNode jsonNode = objectMapper.readTree(objectMapper.writeValueAsString(mStdIndex));
        SqlCreator sqlCreator = new SqlCreator(StdIndex.class);
        String sql = sqlCreator.insertData("std_index_"+version, jsonNode);
        Query query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    }
    public void update(String indexJson) throws IOException {
        MStdIndex mStdIndex = objectMapper.readValue(indexJson, MStdIndex.class);
        String version = mStdIndex.getVersion();
        JsonNode jsonNode = objectMapper.readTree(indexJson);
        SqlCreator sqlCreator = new SqlCreator(StdIndex.class);
        String sql = sqlCreator.updateDataByTableKey("std_index_"+version, jsonNode);
        Query query = getExeuteQuery(sqlCreator, sql);
        query.executeUpdate();
    }
    public boolean isUnique(String filters, String version) throws IOException {
        List<StdIndex> list = searchPage(StdIndex.class, StandardVersion.StdIndexTable,version, filters, null, null, null,true);
        if(CollectionUtils.isEmpty(list)){
            return false;
        }
        return true;
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/statistics/service/ResourceStatisticService.java

@@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.basic.report.dao.XJsonArchivesRepository;
import com.yihu.jw.entity.ehr.report.JsonArchives;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.query.NativeQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ public class ResourceStatisticService extends BaseJpaService<JsonArchives, XJson
        Session session = currentSession();
        String sql = "SELECT count(1), date_format(receive_date, '%Y-%m-%d') AS date FROM json_archives " +
                " WHERE DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(receive_date) GROUP BY date_format(receive_date, '%Y-%m-%d')";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        return query.list();
    }
@@ -33,7 +33,7 @@ public class ResourceStatisticService extends BaseJpaService<JsonArchives, XJson
        Session session = currentSession();
        String sql = "SELECT count(1), date_format(receive_date, '%Y-%m-%d') AS date, event_type FROM json_archives " +
                "WHERE DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(receive_date) AND  event_type=:eventType  GROUP BY date_format(receive_date, '%Y-%m-%d'), event_type;";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        query.setParameter("eventType", eventType);
        return query.list();
    }
@@ -44,7 +44,7 @@ public class ResourceStatisticService extends BaseJpaService<JsonArchives, XJson
        Session session = currentSession();
        String sql = "SELECT count(1), event_type FROM json_archives " +
                "WHERE DATE_SUB(CURDATE(), INTERVAL 1 DAY) < date(event_date) GROUP BY event_type";
        SQLQuery query = session.createSQLQuery(sql);
        NativeQuery query = session.createSQLQuery(sql);
        return query.list();
    }
}

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/controller/DictController.java

@@ -1,213 +1,197 @@
//package com.yihu.jw.basic.system.controller;
//
//import com.yihu.hos.system.model.SystemDict;
//import com.yihu.hos.system.model.SystemDictList;
//import com.yihu.hos.system.service.DictManager;
//import com.yihu.hos.web.framework.model.Result;
//import org.apache.commons.beanutils.BeanUtils;
//import org.springframework.stereotype.Controller;
//import org.springframework.util.StringUtils;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.ResponseBody;
//
//import javax.annotation.Resource;
//import javax.servlet.http.HttpServletRequest;
//import java.util.HashMap;
//import java.util.Map;
//
///**
// * Created by chenweida on 2016/1/20.
// */
//@RestController
//@RequestMapping("/dict")
//public class DictController {
//    @Resource(name = DictManager.BEAN_ID)
//    private DictManager dictManager;
//
//    @RequestMapping("/initial")
//    public String dictInitial(Model model) {
//        model.addAttribute("contentPage", "system/dict/dict");
//        return "partView";
//    }
//
//    @RequestMapping("/dictDialog")
//    public String resourceRestDialog(EnvelopRestEndpointString id, String mode) {
//        SystemDictList sdl;
//        try {
//            if ("view".equals(mode)) {
//                sdl = dictManager.getSystemDictListById(id);
//            } else if ("modify".equals(mode)) {
//                sdl = dictManager.getSystemDictListById(id);
//            } else {
//                sdl = new SystemDictList();
//            }
//            model.addAttribute("resourceId", id);
//            model.addAttribute("mode", mode);
//            model.addAttribute("model", sdl);
//            model.addAttribute("contentPage", "system/dict/dictDialog");
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return "pageView";
//    }
//
//    @RequestMapping("/dictItemDialog")
//    public String resourceRestDetailDialog(EnvelopRestEndpointString id, String mode, String dictName) {
//        SystemDict sd = null;
//        try {
//            if ("view".equals(mode)) {
//                sd = dictManager.getSystemDictById(id);
//            } else if ("modify".equals(mode)) {
//                sd = dictManager.getSystemDictById(id);
//            } else {
//                sd = new SystemDict();
//                // sd.setInnerCode(chineseName);
//                sd.setDictName(dictName);
//
//            }
//            model.addAttribute("resourceId", id);
//            model.addAttribute("mode", mode);
//            model.addAttribute("model", sd);
//            model.addAttribute("contentPage", "system/dict/dictItemDialog");
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return "pageView";
//    }
//
//    /**
//     * 获取字典列表
//     */
//    @RequestMapping("/getDictList")
//    @ResponseBody
//    public Result getDictList(HttpServletRequest request) {
//        try {
//            Map<String, Object> params = new HashMap<>();
//            String name = request.getParameter("name");
//            params.put("name", name);
//            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
//            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
//
//            params.put("page", page);
//            params.put("rows", rows);
//
//            return dictManager.getDictList(params);
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return Result.error(ex.getMessage());
//        }
//    }
//
//
//    @RequestMapping("/deleteDict")
//    @ResponseBody
//    public Result deleteDict(HttpServletRequest request) {
//        try {
//            String id = request.getParameter("id");
//            return dictManager.deleteDict(id);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("删除失败");
//        }
//
//    }
//
//    @RequestMapping("/addDict")
//    @ResponseBody
//    public Result addDict(HttpServletRequest request) {
//        try {
//            SystemDictList rr = new SystemDictList();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.addDict(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("新增失败");
//        }
//
//    }
//
//    @RequestMapping("/updateDict")
//    @ResponseBody
//    public Result updateDict(HttpServletRequest request) {
//        try {
//            SystemDictList rr = new SystemDictList();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.updateDict(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("更新失败");
//        }
//
//    }
//
//
//    //-------------------------字典项----------------------------
//
//    /**
//     * 获取字典列表
//     */
//    @RequestMapping("/getDictItemList")
//    @ResponseBody
//    public Result getDictItemList(HttpServletRequest request) {
//        try {
//            Map<String, Object> params = new HashMap<>();
//            String name = request.getParameter("name");
//            String dictId = request.getParameter("dictId");
//            params.put("name", name);
//            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
//            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
//
//            params.put("dictId", dictId);
//            params.put("page", page);
//            params.put("rows", rows);
//
//            return dictManager.getDictItemList(params);
//        } catch (Exception ex) {
//            ex.printStackTrace();
//            return Result.error(ex.getMessage());
//        }
//    }
//
//
//    @RequestMapping("/deleteDictItem")
//    @ResponseBody
//    public Result deleteDictItem(HttpServletRequest request) {
//        try {
//            String id = request.getParameter("id");
//            return dictManager.deleteDictItem(id);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("删除失败");
//        }
//
//    }
//
//    @RequestMapping("/addDictItem")
//    @ResponseBody
//    public Result addDictItem(HttpServletRequest request) {
//        try {
//            SystemDict rr = new SystemDict();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.addDictItem(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("新增失败");
//        }
//
//    }
//
//    @RequestMapping("/updateDictItem")
//    @ResponseBody
//    public Result updateDictItem(HttpServletRequest request) {
//        try {
//            SystemDict rr = new SystemDict();
//            BeanUtils.populate(rr, request.getParameterMap());
//            return dictManager.updateDictItem(rr);
//        } catch (Exception e) {
//            e.printStackTrace();
//            return Result.error("更新失败");
//        }
//
//    }
//
//}
package com.yihu.jw.basic.system.controller;
import com.yihu.jw.basic.system.model.SystemDict;
import com.yihu.jw.basic.system.model.SystemDictList;
import com.yihu.jw.basic.system.service.DictManager;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
@RestController
@RequestMapping("/dict")
@Api(value = "DictController", tags = "esb字典相关")
public class DictController extends EnvelopRestEndpoint {
    @Resource(name = DictManager.BEAN_ID)
    private DictManager dictManager;
    @GetMapping("/dictDialog")
    public Envelop resourceRestDialog(String id, String mode) {
        SystemDictList sdl;
        try {
            if ("view".equals(mode)) {
                sdl = dictManager.getSystemDictListById(id);
            } else if ("modify".equals(mode)) {
                sdl = dictManager.getSystemDictListById(id);
            } else {
                sdl = new SystemDictList();
            }
            return ObjEnvelop.getSuccess("查询成功",sdl);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("查询失败");
        }
    }
    @GetMapping("/dictItemDialog")
    public Envelop resourceRestDetailDialog(String id, String mode, String dictName) {
        SystemDict sd = null;
        try {
            if ("view".equals(mode)) {
                sd = dictManager.getSystemDictById(id);
            } else if ("modify".equals(mode)) {
                sd = dictManager.getSystemDictById(id);
            } else {
                sd = new SystemDict();
                // sd.setInnerCode(chineseName);
                sd.setDictName(dictName);
            }
            return ObjEnvelop.getSuccess("查询成功",sd);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("查询失败");
        }
    }
    /**
     * 获取字典列表
     */
    @GetMapping("/getDictList")
    public Envelop getDictList(HttpServletRequest request) {
        try {
            Map<String, Object> params = new HashMap<>();
            String name = request.getParameter("name");
            params.put("name", name);
            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
            params.put("page", page);
            params.put("rows", rows);
            return dictManager.getDictList(params);
        } catch (Exception ex) {
            ex.printStackTrace();
            return failed("查询失败");
        }
    }
    @PostMapping("/deleteDict")
    public Envelop deleteDict(HttpServletRequest request) {
        try {
            String id = request.getParameter("id");
            return dictManager.deleteDict(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("删除失败");
        }
    }
    @PostMapping("/addDict")
    public Envelop addDict(HttpServletRequest request) {
        try {
            SystemDictList rr = new SystemDictList();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.addDict(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("新增失败");
        }
    }
    @PostMapping("/updateDict")
    public Envelop updateDict(HttpServletRequest request) {
        try {
            SystemDictList rr = new SystemDictList();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.updateDict(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("更新失败");
        }
    }
    //-------------------------字典项----------------------------
    /**
     * 获取字典列表
     */
    @GetMapping("/getDictItemList")
    public Envelop getDictItemList(HttpServletRequest request) {
        try {
            Map<String, Object> params = new HashMap<>();
            String name = request.getParameter("name");
            String dictId = request.getParameter("dictId");
            params.put("name", name);
            String page = StringUtils.isEmpty(request.getParameter("page")) ? "1" : request.getParameter("page");
            String rows = StringUtils.isEmpty(request.getParameter("rows")) ? "10" : request.getParameter("rows");
            params.put("dictId", dictId);
            params.put("page", page);
            params.put("rows", rows);
            return dictManager.getDictItemList(params);
        } catch (Exception ex) {
            ex.printStackTrace();
            return Envelop.getError(ex.getMessage());
        }
    }
    @PostMapping("/deleteDictItem")
    public Envelop deleteDictItem(HttpServletRequest request) {
        try {
            String id = request.getParameter("id");
            return dictManager.deleteDictItem(id);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("删除失败");
        }
    }
    @PostMapping("/addDictItem")
    public Envelop addDictItem(HttpServletRequest request) {
        try {
            SystemDict rr = new SystemDict();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.addDictItem(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("新增失败");
        }
    }
    @PostMapping("/updateDictItem")
    public Envelop updateDictItem(HttpServletRequest request) {
        try {
            SystemDict rr = new SystemDict();
            BeanUtils.populate(rr, request.getParameterMap());
            return dictManager.updateDictItem(rr);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("更新失败");
        }
    }
}

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

@@ -78,10 +78,6 @@ public class DatasourceDao extends SQLGeneralDAO {
        return getDataGridResult(sb.toString(),page,pageSize);
    }
    public List getData() {
        Query query = getCurrentSession().createQuery("from SystemDatasource t");
        return query.list();
    }
    /**
     * 获取全部数据源列表

svr/svr-basic/src/main/java/com/yihu/jw/basic/system/service/DictManager.java

@@ -1,154 +1,155 @@
//package com.yihu.jw.basic.system.service;
//
//import com.yihu.hos.system.dao.DictDao;
//import com.yihu.hos.system.dao.DictListDao;
//import com.yihu.hos.system.model.SystemDict;
//import com.yihu.hos.system.model.SystemDictList;
//import com.yihu.hos.web.framework.model.Result;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional;
//
//import javax.annotation.Resource;
//import java.util.List;
//import java.util.Map;
//
///**
// * Created by chenweida on 2016/1/20.
// */
//@Service("dictManager")
//public class DictManager  {
//
//    public static final String BEAN_ID = "dictManager";
//
//    @Resource(name =DictDao.BEAN_ID )
//    private DictDao dictItemDao;//字典项
//    @Resource(name = DictListDao.BEAN_ID)
//    private DictListDao dictDao;//字典
//
//
//    /**
//     * 通过字典名字,
//     * 字典项的code查找字典项值
//     * @param dictName
//     * @param code
//     * @return
//     */
//    public String getDictIetmValue(String dictName,String code){
//        SystemDict  dictItem = dictItemDao.getDictIetmValue(dictName, code);
//        if(dictItem!=null){
//            return dictItem.getValue();
//        }
//        return "";
//    }
//
//    @Transactional
//    public Result getDictList(Map<String, Object> params) throws Exception {
//        return dictDao.getDictList(params);
//    }
//
//    @Transactional
//    public Result getDictItemList(Map<String, Object> params) throws Exception {
//        return dictItemDao.getDictList(params);
//    }
//
//
//    public SystemDict getSystemDictById(String id) throws Exception {
//        return dictItemDao.getEntity(SystemDict.class, id);
//    }
//
//
//    public SystemDictList getSystemDictListById(String id) throws Exception {
//        return dictDao.getEntity(SystemDictList.class, id);
//    }
//
//    @Transactional
//    public Result deleteDict(String id) throws Exception {
//        SystemDictList sd = dictDao.getEntity(SystemDictList.class, id);
//        dictItemDao.delDictItemByDictName(sd.getDictName());
//        dictDao.deleteEntity(sd);
//        return Result.success("删除成功");
//    }
//
//    @Transactional
//    public Result addDict(SystemDictList rr) throws Exception {
//        SystemDictList systemDictListTemp = dictDao.getDitcByName(rr.getDictName());
//        if (systemDictListTemp != null) {
//            return Result.error("字典代码重复");
//        }
//        dictDao.saveEntity(rr);
//        return Result.success("保存成功");
//    }
//
//    @Transactional
//    public Result updateDict(SystemDictList rr) throws Exception {
//        SystemDictList systemDictListTemp = dictDao.getDitcByNameWithOutId(rr.getDictName(), rr.getId());
//        if (systemDictListTemp != null) {
//            return Result.error("字典代码重复");
//        }
//        SystemDictList sd = dictDao.getEntity(SystemDictList.class, rr.getId());
//        sd.setPid(rr.getPid());
//        sd.setChineseName(rr.getChineseName());
//        sd.setDictName(rr.getDictName());
//        sd.setPyCode(rr.getPyCode());
//        sd.setRelationColCode(rr.getRelationColCode());
//        sd.setRelationColValue(rr.getRelationColValue());
//        sd.setRelationTable(rr.getRelationTable());
//        sd.setRemark(rr.getRemark());
//        sd.setRelationColExtend(rr.getRelationColExtend());
//        return Result.success("更新成功");
//    }
//
//    @Transactional
//    public Result deleteDictItem(String id) throws Exception {
//        SystemDict sd = dictItemDao.getEntity(SystemDict.class, id);
//        dictItemDao.deleteEntity(sd);
//        return Result.success("删除成功");
//    }
//
//    @Transactional
//    public Result addDictItem(SystemDict rr) throws Exception {
//       // SystemDict rrTemp = dictItemDao.getDictItemByCode(rr.getInnerCode());
//       // if (rrTemp != null) {
//       //     return Result.error("字典项代码已经存在");
//      //  }
//        dictItemDao.saveEntity(rr);
//
//        return Result.success("保存成功");
//    }
//
//    @Transactional
//    public Result updateDictItem(SystemDict rr) throws Exception {
//      //  SystemDict rrTemp = dictItemDao.getDictItemByCodeWithOutId(rr.getInnerCode(),rr.getId());
//       // if (rrTemp != null) {
//       //    return Result.error("字典项代码已经存在");
//      //  }
//        SystemDict sd = dictItemDao.getEntity(SystemDict.class, rr.getId());
//        sd.setPyCode(rr.getPyCode());
//        sd.setDictName(rr.getDictName());
//        sd.setCode(rr.getCode());
//        sd.setSort(rr.getSort());
//        sd.setValue(rr.getValue());
//        return Result.success("更新成功");
//    }
//
//    /**
//     * 通过字典名字,
//     * 字典项的code查找字典项值
//     * @param dictName
//     * @param code
//     * @return
//     */
//    public SystemDict getDictIetm(String dictName,String code){
//        SystemDict dictItem = dictItemDao.getDictIetmValue(dictName, code);
//        return dictItem;
//    }
//
//    /**
//     * @param dictName
//     * @param codes
//     * @return
//     */
//    public List<SystemDict> getDictEntries(String dictName,String[] codes) {
//       return dictItemDao.getDictEntries(dictName,codes);
//    }
//}
package com.yihu.jw.basic.system.service;
import com.yihu.jw.basic.system.dao.DictDao;
import com.yihu.jw.basic.system.dao.DictListDao;
import com.yihu.jw.basic.system.model.SystemDict;
import com.yihu.jw.basic.system.model.SystemDictList;
import com.yihu.jw.restmodel.web.Envelop;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2016/1/20.
 */
@Service("dictManager")
public class DictManager  {
    public static final String BEAN_ID = "dictManager";
    @Resource(name = DictDao.BEAN_ID )
    private DictDao dictItemDao;//字典项
    @Resource(name = DictListDao.BEAN_ID)
    private DictListDao dictDao;//字典
    /**
     * 通过字典名字,
     * 字典项的code查找字典项值
     * @param dictName
     * @param code
     * @return
     */
    public String getDictIetmValue(String dictName,String code){
        SystemDict dictItem = dictItemDao.getDictIetmValue(dictName, code);
        if(dictItem!=null){
            return dictItem.getValue();
        }
        return "";
    }
    @Transactional
    public Envelop getDictList(Map<String, Object> params) throws Exception {
        return dictDao.getDictList(params);
    }
    @Transactional
    public Envelop getDictItemList(Map<String, Object> params) throws Exception {
        return dictItemDao.getDictList(params);
    }
    public SystemDict getSystemDictById(String id) throws Exception {
        return dictItemDao.getEntity(SystemDict.class, id);
    }
    public SystemDictList getSystemDictListById(String id) throws Exception {
        return dictDao.getEntity(SystemDictList.class, id);
    }
    @Transactional
    public Envelop deleteDict(String id) throws Exception {
        SystemDictList sd = dictDao.getEntity(SystemDictList.class, id);
        dictItemDao.delDictItemByDictName(sd.getDictName());
        dictDao.deleteEntity(sd);
        return Envelop.getSuccess("删除成功");
    }
    @Transactional
    public Envelop addDict(SystemDictList rr) throws Exception {
        SystemDictList systemDictListTemp = dictDao.getDitcByName(rr.getDictName());
        if (systemDictListTemp != null) {
            return Envelop.getError("字典代码重复");
        }
        dictDao.saveEntity(rr);
        return Envelop.getSuccess("保存成功");
    }
    @Transactional
    public Envelop updateDict(SystemDictList rr) throws Exception {
        SystemDictList systemDictListTemp = dictDao.getDitcByNameWithOutId(rr.getDictName(), rr.getId());
        if (systemDictListTemp != null) {
            return Envelop.getError("字典代码重复");
        }
        SystemDictList sd = dictDao.getEntity(SystemDictList.class, rr.getId());
        sd.setPid(rr.getPid());
        sd.setChineseName(rr.getChineseName());
        sd.setDictName(rr.getDictName());
        sd.setPyCode(rr.getPyCode());
        sd.setRelationColCode(rr.getRelationColCode());
        sd.setRelationColValue(rr.getRelationColValue());
        sd.setRelationTable(rr.getRelationTable());
        sd.setRemark(rr.getRemark());
        sd.setRelationColExtend(rr.getRelationColExtend());
        return Envelop.getSuccess("更新成功");
    }
    @Transactional
    public Envelop deleteDictItem(String id) throws Exception {
        SystemDict sd = dictItemDao.getEntity(SystemDict.class, id);
        dictItemDao.deleteEntity(sd);
        return Envelop.getSuccess("删除成功");
    }
    @Transactional
    public Envelop addDictItem(SystemDict rr) throws Exception {
       // SystemDict rrTemp = dictItemDao.getDictItemByCode(rr.getInnerCode());
       // if (rrTemp != null) {
       //     return Envelop.getError("字典项代码已经存在");
      //  }
        dictItemDao.saveEntity(rr);
        return Envelop.getSuccess("保存成功");
    }
    @Transactional
    public Envelop updateDictItem(SystemDict rr) throws Exception {
      //  SystemDict rrTemp = dictItemDao.getDictItemByCodeWithOutId(rr.getInnerCode(),rr.getId());
       // if (rrTemp != null) {
       //    return Envelop.getError("字典项代码已经存在");
      //  }
        SystemDict sd = dictItemDao.getEntity(SystemDict.class, rr.getId());
        sd.setPyCode(rr.getPyCode());
        sd.setDictName(rr.getDictName());
        sd.setCode(rr.getCode());
        sd.setSort(rr.getSort());
        sd.setValue(rr.getValue());
        return Envelop.getSuccess("更新成功");
    }
    /**
     * 通过字典名字,
     * 字典项的code查找字典项值
     * @param dictName
     * @param code
     * @return
     */
    public SystemDict getDictIetm(String dictName,String code){
        SystemDict dictItem = dictItemDao.getDictIetmValue(dictName, code);
        return dictItem;
    }
    /**
     * @param dictName
     * @param codes
     * @return
     */
    public List<SystemDict> getDictEntries(String dictName,String[] codes) {
       return dictItemDao.getDictEntries(dictName,codes);
    }
}

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

@@ -15,8 +15,8 @@ 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.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -150,7 +150,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List idExist(String[] phones)
    {
        String sql = "SELECT phone FROM doctors WHERE phone in(:phones)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("phones", phones);
        return sqlQuery.list();
    }
@@ -165,7 +165,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
                "BZQK, SFZCQKYX, QDHGZS, XZSQPZGZ, SFCSTJGZ, TJXXHGZ,insert_time,code) VALUES \n";
        StringBuilder sql = new StringBuilder(header) ;
        Map<String, Object> map;
        SQLQuery query;
        NativeQuery query;
        int total = 0;
        DemographicInfo demographicInfo =null;
        for(int i=1; i<=doctorLs.size(); i++){
@@ -259,7 +259,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List getIdByPhone(String[] phones)
    {
        String sql = "SELECT d.* FROM doctors d WHERE phone in(:phones)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("phones", phones);
        return sqlQuery.list();
    }
@@ -270,7 +270,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List emailsExistence(String[] emails)
    {
        String sql = "SELECT email FROM doctors WHERE email in(:emails)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("emails", emails);
        return sqlQuery.list();
    }
@@ -288,7 +288,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List idCardNosExist(String[] idCardNos)
    {
        String sql = "SELECT id_card_no FROM doctors WHERE id_card_no in(:idCardNos)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("idCardNos", idCardNos);
        return sqlQuery.list();
    }
@@ -317,7 +317,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
                        "WHERE d.role_type=:roleType and omr.org_id is not null and omr.org_name is not null " +
                        " GROUP BY omr.org_id,omr.org_name";
        SQLQuery query = currentSession().createSQLQuery(sql);
        NativeQuery query = currentSession().createSQLQuery(sql);
        query.setParameter("roleType", roleType);
        List<Object> list=query.list();
        return list;
@@ -372,7 +372,7 @@ public class DoctorService extends BaseJpaService<Doctors, XDoctorRepository> {
    public List getIdByIdCardNos(String[] idCardNos)
    {
        String sql = "SELECT d.* FROM doctors d WHERE id_card_no in(:idCardNos)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("idCardNos", idCardNos);
        return sqlQuery.list();
    }

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

@@ -10,8 +10,8 @@ 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.NativeQuery;
import org.hibernate.query.Query;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -211,7 +211,7 @@ public class UserService extends BaseJpaService<User, XUserRepository> {
    public List idExist( String[] phones)
    {
        String sql = "SELECT telephone FROM users WHERE telephone in(:phones)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("phones", phones);
        return sqlQuery.list();
    }
@@ -225,7 +225,7 @@ public class UserService extends BaseJpaService<User, XUserRepository> {
        String header = "INSERT INTO users(id,login_code, real_name,id_card_no,gender, tech_title, email, telephone, password, create_date, activated, user_type, DType, doctor_id, province_id, city_id, area_id) VALUES \n";
        StringBuilder sql = new StringBuilder(header) ;
        Doctors map;
        SQLQuery query;
        NativeQuery query;
        int total = 0;
        for(int i=1; i<=doctorLs.size(); i++){
            map = doctorLs.get(i-1);
@@ -267,7 +267,7 @@ public class UserService extends BaseJpaService<User, XUserRepository> {
    public List emailsExistence(String[] emails)
    {
        String sql = "SELECT email FROM users WHERE email in(:emails)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("emails", emails);
        return sqlQuery.list();
    }
@@ -278,7 +278,7 @@ public class UserService extends BaseJpaService<User, XUserRepository> {
    public List idCardNosExist(String[] idCardNos)
    {
        String sql = "SELECT id_card_no FROM users WHERE id_card_no in(:idCardNos)";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        NativeQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameterList("idCardNos", idCardNos);
        return sqlQuery.list();
    }