浏览代码

Merge branch 'master' of zlf/esb into master

esb 9 年之前
父节点
当前提交
9f0b82f98e

+ 2 - 0
Hos-Framework/src/main/java/com/yihu/ehr/framework/common/dao/SQLGeneralDAO.java

@ -22,6 +22,7 @@ import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.simple.ParameterizedBeanPropertyRowMapper;
import org.springframework.orm.hibernate4.HibernateTemplate;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.Serializable;
@ -44,6 +45,7 @@ import java.util.Map;
 * @version 1.0
 * @created 2015.07.09 17:08
 */
@Transactional
@Repository("sqlGeneralDAO")
public class SQLGeneralDAO implements XSQLGeneralDAO {
    @Resource(name = "jdbcTemplate")

+ 1 - 1
Hos-Framework/src/main/java/com/yihu/ehr/framework/util/httpclient/HttpClientUtil.java

@ -275,7 +275,7 @@ public class HttpClientUtil {
        } catch (IOException e) {
            e.printStackTrace();
        } finally {
            close(httpClient, (CloseableHttpResponse) entity);
            close(httpClient, response);
        }
        return null;

+ 16 - 3
Hos-resource/src/main/java/com/yihu/ehr/crawler/controller/CrawlerController.java

@ -2,11 +2,16 @@ package com.yihu.ehr.crawler.controller;
import com.yihu.ehr.crawler.model.patient.Patient;
import com.yihu.ehr.crawler.service.CrawlerManager;
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONObject;
import org.junit.Test;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 目前版本只需要采集,上传和注册病人档案就可了。
 * <p>
@ -17,11 +22,9 @@ import org.springframework.web.bind.annotation.*;
@Api(protocols = "http", value = "CrawlerController", description = "档案采集接口", tags = {"采集"})
public class CrawlerController {
    @RequestMapping(value = "/patient/crawler", method = RequestMethod.POST)
    @RequestMapping(value = "patient", method = RequestMethod.GET)
    @ApiOperation(value = "采集病人健康档案", produces = "application/json", notes = "采集病人健康档案")
    public Boolean crawler(
            @ApiParam(name = "apiVersion", value = "API版本号", defaultValue = "v1.0")
            @PathVariable(value = "apiVersion") String apiVersion,
            @ApiParam(name = "patient", value = "病人索引信息", required = true)
            @RequestParam(value = "patient", required = true) String patientInfo) {
@ -31,4 +34,14 @@ public class CrawlerController {
        }
        return false;
    }
    @Test
    public void crawlerTest() {
        Patient patient = new Patient();
        patient.setPatientId("1004192");
        patient.setEventNo("999999");
        patient.setOrgCode("1");
        JSONObject jsonObject = JSONObject.fromObject(patient);
        CrawlerManager.getInstance().collectProcess(patient);
    }
}

+ 8 - 23
Hos-resource/src/main/java/com/yihu/ehr/crawler/model/adapter/AdapterDataSet.java

@ -1,8 +1,10 @@
package com.yihu.ehr.crawler.model.adapter;
import com.yihu.ehr.crawler.model.patient.PatientIdentity;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.standard.model.adapter.AdapterDatasetModel;
import com.yihu.ehr.standard.model.adapter.AdapterMetadataModel;
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
@ -19,14 +21,10 @@ import java.util.*;
 * @created 2015.08.11 11:29
 */
public class AdapterDataSet {
    @Resource(name = AdapterMetadataService.BEAN_ID)
    private AdapterMetadataService metadataService;
    private List<AdapterMetaData> adapterMetaDataList;
    private AdapterDatasetModel adapterDatasetModel;
    private Map<String, AdapterMetaData> adapterMetaDataMap;
    private List<StdMetaDataModel> stdMetaDataModelList;
    private Map<String, StdMetaDataModel> stdMetaDataModelMap;
    private String eventNoCode;
    private AdapterVersion adapterVersion;
@ -47,7 +45,8 @@ public class AdapterDataSet {
            Map<String,String> condition = new HashMap<String,String>();
            condition.put("stdDatasetId", StringUtil.toString(adapterDatasetModel.getStdDatasetId()));
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            List<AdapterMetadataModel> adapterMetaDataModelList = metadataService.getMetadataList(AdapterMetadataModel.class, adapterVersion.getVersion(), jsonpObject.toString(), null, null, null);
            AdapterMetadataService metadataService = SpringBeanUtil.getService(AdapterMetadataService.BEAN_ID);
            List<AdapterMetadataModel> adapterMetaDataModelList = metadataService.getList(AdapterMetadataModel.class, adapterVersion.getMetaDataTableName(), jsonpObject.toString(), null, null, null, ErrorCode.GetMetaDataListFaield);
            if (!CollectionUtil.isEmpty(adapterMetaDataModelList)) {
                for (AdapterMetadataModel adapterMetadataModel : adapterMetaDataModelList) {
                    adapterMetaDataList.add(new AdapterMetaData(adapterMetadataModel, adapterVersion));
@ -59,26 +58,12 @@ public class AdapterDataSet {
        return adapterMetaDataList;
    }
//    public List<StdMetaDataModel> getStdMetaDataModelList() {
//        Map<String,String> condition = new HashMap<String,String>();
//        condition.put("stdDatasetId", StringUtil.toString(adapterDatasetModel.getStdDatasetId()));
//        JSONObject jsonpObject = JSONObject.fromObject(condition);
//        stdMetaDataModelList = metadataService.getMetadataList(AdapterMetadataModel.class, adapterVersion, jsonpObject.toString(), null, null, null);
//
//
//        return stdMetaDataList;
//    }
    public Map<String, AdapterMetaData> getAdapterMetaDataMap() {
        if (CollectionUtil.isEmpty(adapterMetaDataList)) {
            getAdapterMetaDataList();
        }
        if (!CollectionUtil.isEmpty(adapterMetaDataList)) {
            if (adapterMetaDataMap == null) {
                adapterMetaDataMap = new HashMap<>();
        if (adapterMetaDataMap == null) {
            adapterMetaDataMap = new HashMap<>();
            if (!CollectionUtil.isEmpty(adapterMetaDataList)) {
                for (AdapterMetaData adapterMetaData : adapterMetaDataList) {
                    adapterMetaDataMap.put(adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), adapterMetaData);
                    adapterMetaDataMap.put(adapterMetaData.getAdapterMetadataModel().getStdMetadataCode().toUpperCase(), adapterMetaData);
                }
            }
        }

+ 4 - 2
Hos-resource/src/main/java/com/yihu/ehr/crawler/model/adapter/AdapterDict.java

@ -2,10 +2,12 @@ package com.yihu.ehr.crawler.model.adapter;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.standard.model.adapter.AdapterDictEntryModel;
import com.yihu.ehr.standard.model.adapter.AdapterDictModel;
import com.yihu.ehr.standard.service.adapter.AdapterDictEntryService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import com.yihu.ehr.standard.service.standard.StdMetadataService;
import net.sf.json.JSONObject;
import javax.annotation.Resource;
@ -19,8 +21,6 @@ import java.util.Map;
 * @created 2015.08.11 11:31
 */
public class AdapterDict {
    @Resource(name = AdapterDictEntryService.BEAN_ID)
    private AdapterDictEntryService adapterDictEntryService;
    public static final String INVALID_ADAPTER_DICT = "";   //"Invalid Adapter";
    private AdapterDictModel adapterDictModel;
@ -39,6 +39,7 @@ public class AdapterDict {
        condition.put("adapterDictId", StringUtil.toString(adapterDictModel.getId()));
        condition.put("adapterEntryValue", adapterEntryValue);
        JSONObject jsonpObject = JSONObject.fromObject(condition);
        AdapterDictEntryService adapterDictEntryService = SpringBeanUtil.getService(AdapterDictEntryService.BEAN_ID);
        List<AdapterDictEntryModel> adapterDictEntryModelList = adapterDictEntryService.getList(AdapterDictEntryModel.class, adapterVersion.getDictEntryTableName(), jsonpObject.toString(), null, null, null, null);
        if (!CollectionUtil.isEmpty(adapterDictEntryModelList)) {
            String stdDictEntryCode = adapterDictEntryModelList.get(0).getStdEntryCode();
@ -54,6 +55,7 @@ public class AdapterDict {
        condition.put("adapterDictId", StringUtil.toString(adapterDictModel.getId()));
        condition.put("adapterEntryCode", adapterEntryCode);
        JSONObject jsonpObject = JSONObject.fromObject(condition);
        AdapterDictEntryService adapterDictEntryService = SpringBeanUtil.getService(AdapterDictEntryService.BEAN_ID);
        List<AdapterDictEntryModel> adapterDictEntryModelList = adapterDictEntryService.getList(AdapterDictEntryModel.class, adapterVersion.getDictEntryTableName(), jsonpObject.toString(), null, null, null, null);
        if (!CollectionUtil.isEmpty(adapterDictEntryModelList)) {
            String stdDictEntryCode = adapterDictEntryModelList.get(0).getStdEntryCode();

+ 4 - 32
Hos-resource/src/main/java/com/yihu/ehr/crawler/model/adapter/AdapterMetaData.java

@ -4,6 +4,7 @@ import com.yihu.ehr.crawler.model.transform.DictDataType;
import com.yihu.ehr.crawler.model.transform.MetaDataType;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.util.operator.NumberUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.standard.model.adapter.AdapterDictModel;
import com.yihu.ehr.standard.model.adapter.AdapterMetadataModel;
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
@ -19,14 +20,9 @@ import javax.annotation.Resource;
 * @created 2015.08.11 11:31
 */
public class AdapterMetaData {
    @Resource(name = StdMetadataService.BEAN_ID)
    StdMetadataService stdMetadataService;
    @Resource(name = AdapterDictService.BEAN_ID)
    private AdapterDictService adapterDictService;
    private AdapterMetadataModel adapterMetadataModel;
    private AdapterDict adapterDict;
    private StdMetaDataModel stdMetaDataModel;
    private AdapterVersion adapterVersion;
    public AdapterMetaData(AdapterMetadataModel adapterMetadataModel, AdapterVersion adapterVersion) {
        this.adapterMetadataModel = adapterMetadataModel;
@ -39,9 +35,9 @@ public class AdapterMetaData {
    public AdapterDict getAdapterDict() {
        if (adapterDict == null) {
            StdMetaDataModel stdMetaDataModel = getStdMetaDataModel();
            if (!NumberUtil.isZero(stdMetaDataModel.getDictId())) {
                AdapterDictModel adapterDictModel = (AdapterDictModel) adapterDictService.get(AdapterDictModel.class, adapterVersion.getDictTableName(), stdMetaDataModel.getDictId(), ErrorCode.GetDictFaild);
            if (!NumberUtil.isZero(adapterMetadataModel.getStdDictId())) {
                AdapterDictService adapterDictService = SpringBeanUtil.getService(AdapterDictService.BEAN_ID);
                AdapterDictModel adapterDictModel = (AdapterDictModel) adapterDictService.get(AdapterDictModel.class, adapterVersion.getDictTableName(), adapterMetadataModel.getStdDictId(), ErrorCode.GetDictFaild);
                if (adapterDictModel != null) {
                    adapterDict = new AdapterDict(adapterDictModel, adapterVersion);
                }
@ -51,14 +47,6 @@ public class AdapterMetaData {
        return adapterDict;
    }
    public StdMetaDataModel getStdMetaDataModel() {
        if (stdMetaDataModel == null) {
            stdMetaDataModel = (StdMetaDataModel) stdMetadataService.get(StdMetaDataModel.class, adapterVersion.getMetaDataTableName(), adapterMetadataModel.getStdMetadataId(), ErrorCode.GetMetaDataFailed);
        }
        return stdMetaDataModel;
    }
    public DictDataType getAdapterDictDataType() {
        Integer orgDictDataType = adapterMetadataModel.getAdapterDataType();
        if (orgDictDataType == null){
@ -67,20 +55,4 @@ public class AdapterMetaData {
        return DictDataType.values()[orgDictDataType];
    }
    public DictDataType getStdDictDataType() {
        if (stdMetaDataModel == null) {
            getAdapterMetadataModel();
        }
        Integer dictId = stdMetaDataModel.getDictId();
        String type = stdMetaDataModel.getType();
        int dictValueType;
        if (!NumberUtil.isZero(dictId) && (type.equals(MetaDataType.S2.name()) || type.equals(MetaDataType.S3.name()))) {
            dictValueType = DictDataType.CODE.ordinal();
        } else {
            dictValueType = DictDataType.VALUE.ordinal();
        }
        return DictDataType.values()[dictValueType];
    }
}

+ 21 - 18
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java

@ -9,9 +9,12 @@ import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.util.log.LogService;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.springutil.SpringBeanUtil;
import com.yihu.ehr.standard.model.adapter.AdapterDatasetModel;
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import net.sf.json.JSONObject;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
@ -19,16 +22,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 标准管理,负责版本的升级,解包及相关安全
 *
 * @created Created by Air on 2015/6/3.
 */
public class CrawlerManager {
    @Resource(name = AdapterDatasetService.BEAN_ID)
    private AdapterDatasetService adapterDatasetService;
    private static volatile CrawlerManager instance;
    private static DataCollectDispatcher dispatch;
    private List<AdapterDataSet> adapterDataSetList;
@ -61,7 +56,6 @@ public class CrawlerManager {
    public String dataCrawler() {
        Integer count = 0;
        Integer totalCount = 0;
        getAdapterDataSetList();
        Map<String, Object> condition = new HashMap<>();
        condition.put("orgCode", SysConfig.getInstance().orgCode);
        patientList = dispatch.getPatientList(condition, adapterDataSetList);
@ -80,6 +74,7 @@ public class CrawlerManager {
        if (!dispatch.getToken()) {
            return false;
        }
        getAdapterDataSetList();
        patient.setReUploadFlg(StringUtil.toString(false));
        LogService.getLogger().trace("采集->注册->打包上传,任务ID:,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
        try {
@ -88,12 +83,13 @@ public class CrawlerManager {
            //采集、注册
            for (AdapterDataSet adapterDataSet : adapterDataSetList) {
                String data = dispatch.fecthData(patient, adapterDataSet);
                if (StringUtil.isEmpty(data)) {
                    continue;
                }
                ObjectMapper objectMapper = new ObjectMapper();
                JsonNode jsonObject = objectMapper.readTree(data);
                if (!StringUtil.isEmpty(data)) {
                    dataSetMap.put(adapterDataSet.getAdapterDataSetT().getStdDatasetCode(), adapterDataSet);
                    dataList.add(jsonObject);
                }
                dataSetMap.put(adapterDataSet.getAdapterDataSetT().getStdDatasetCode(), adapterDataSet);
                dataList.add(jsonObject);
                if (SysConfig.getInstance().getRegisterDataSet().equals(adapterDataSet.getAdapterDataSetT().getStdDatasetCode())) {
                    if (!StringUtil.isEmpty(jsonObject.get("data")) && !StringUtil.isEmpty(jsonObject.get("data").get(0))) {
                        if (!StringUtil.isEmpty(jsonObject.get("data").get(0).get(SysConfig.getInstance().getRegisterIdCardNo()))) {
@ -122,11 +118,18 @@ public class CrawlerManager {
    }
    public void getAdapterDataSetList() {
        String version = "569f253c1cb3";
        AdapterVersion adapterVersion = new AdapterVersion(version);
        List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getList(AdapterDatasetModel.class, adapterVersion.getDataSetTableName(), null, null, null, null, ErrorCode.GetDataSetFailed);
        for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
            adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
        if (CollectionUtil.isEmpty(adapterDataSetList)) {
            adapterDataSetList = new ArrayList<>();
            String version = "569f253c1cb3";
            AdapterVersion adapterVersion = new AdapterVersion(version);
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            Map<String, String> condition = new HashMap<>();
            condition.put("column", "adapter_dataset_code");
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetList(AdapterDatasetModel.class, adapterVersion.getDataSetTableName(), jsonpObject.toString(), ErrorCode.GetDataSetListFailed);
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }
        }
    }

+ 6 - 8
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/DataCollectDispatcher.java

@ -13,8 +13,6 @@ import com.yihu.ehr.crawler.model.transform.EhrCondition;
import com.yihu.ehr.crawler.model.transform.LogicValues;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.util.file.FileUtil;
import com.yihu.ehr.framework.util.httpclient.HttpClientUtil;
import com.yihu.ehr.framework.util.httpclient.HttpResponse;
import com.yihu.ehr.framework.util.log.LogService;
import com.yihu.ehr.framework.util.operator.DateUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
@ -119,7 +117,7 @@ public class DataCollectDispatcher {
        if (adapterDataSet.isHavePatientID()) {
            AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(PatientIdentity.getPatientIDCode());
            propertyMap.put("patient_id", adapterMetaData.getStdMetaDataModel().getCode().toUpperCase());
            propertyMap.put("patient_id", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode().toUpperCase());
        } else {
            LogService.getLogger().error("", new Exception("采集病人列表数据集必须有patient_id."));
@ -128,7 +126,7 @@ public class DataCollectDispatcher {
        if (adapterDataSet.isHaveEventNo()) {
            AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(patientIdentity.getEventNoCode());
            propertyMap.put("event_no",  adapterMetaData.getStdMetaDataModel().getCode().toUpperCase());
            propertyMap.put("event_no",  adapterMetaData.getAdapterMetadataModel().getStdMetadataCode().toUpperCase());
        } else {
            LogService.getLogger().error("采集病人列表数据集必须有event_no.");
            return null;
@ -140,7 +138,7 @@ public class DataCollectDispatcher {
            return null;
        }
        propertyMap.put("event_time", adapterRefMetaData.getStdMetaDataModel().getCode().toUpperCase());
        propertyMap.put("event_time", adapterRefMetaData.getAdapterMetadataModel().getStdMetadataCode().toUpperCase());
        return propertyMap;
    }
@ -151,7 +149,7 @@ public class DataCollectDispatcher {
            boolean patientId = true;
            if (adapterDataSet.isHavePatientID()) {
                AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(PatientIdentity.getPatientIDCode());
                queryParams.add(new EhrCondition(" = ", adapterMetaData.getStdMetaDataModel().getCode(), patient.getPatientId()));
                queryParams.add(new EhrCondition(" = ", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), patient.getPatientId()));
            } else {
                patientId = false;
            }
@ -159,14 +157,14 @@ public class DataCollectDispatcher {
            boolean eventNo = true;
            if (adapterDataSet.isHaveEventNo()) {
                AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(adapterDataSet.getEventNoCode());
                queryParams.add(new EhrCondition(" = ", adapterMetaData.getStdMetaDataModel().getCode(), patient.getEventNo()));
                queryParams.add(new EhrCondition(" = ", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), patient.getEventNo()));
            } else {
                eventNo = false;
            }
            if (!patientId && !eventNo) {
                LogService.getLogger().error("采集病人数据集至少需要一项病人标识.数据集名:" + adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
                throw new Exception("采集病人数据集至少需要一项病人标识.数据集名:" + adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
                return Constants.EMPTY;
            }
            ObjectNode paramsNode = mapper.createObjectNode();

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/EsbHttp.java

@ -62,7 +62,7 @@ public class EsbHttp {
     */
    private static String GetFingerprint(){
        try {
            return "";
            return "123456";
        }
        catch (Exception e)
        {

+ 20 - 0
Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterDatasetService.java

@ -10,6 +10,7 @@ import com.yihu.ehr.framework.constrant.TreeView;
import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.BeanTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterDatasetModel;
import com.yihu.ehr.standard.model.adapter.AdapterMetadataModel;
@ -397,4 +398,23 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        sql.append(schemeId + Constants.FROM + stdTableName + Constants.WHERE + item + Constants.IN + idStr + Constants.RIGHT_BRACKET);
        return sql.toString();
    }
    public List getAdapterDatasetList(Class tClass, String tableName, String condition, ErrorCode errorCode) {
        try {
            StringBuffer sql = new StringBuffer();
            sql.append("SELECT * FROM ").append(tableName);
            ObjectMapper objectMapper = new ObjectMapper();
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
                String column = jsonNode.get("column").asText();
                sql.append(" WHERE ").append(column).append(" IS NOT NULL");
            }
            Query query = getCurrentSession().createSQLQuery(sql.toString());
            query.setResultTransformer(new BeanTransformer(tClass));
            return query.list();
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterDictentryService.java → Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterDictEntryService.java


+ 4 - 2
Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterMetadataService.java

@ -102,9 +102,11 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        if (!StringUtil.isEmpty(condition)) {
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
                String name = jsonNode.get("name").asText();
                sqlCreator.equalCondition("stdDatasetId", jsonNode.get("stdDatasetId").asInt());
                sqlCreator.likeOrCondition("stdMetadataCode", "stdMetadataName", name);
                if (jsonNode.get("name") != null) {
                    String name = jsonNode.get("name").asText();
                    sqlCreator.likeOrCondition("stdMetadataCode", "stdMetadataName", name);
                }
            } catch (IOException e) {
                e.printStackTrace();
            }

+ 26 - 0
Hos-resource/src/main/resources/config/sys.config.xml

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
    <debug>true</debug>
    <event_no>
        <item>HDSD03_01_031</item>
        <item>HDSD00_01_579</item>
        <item>EVENT_NO</item>
    </event_no>
    <patient_queue>
        <dataset code="HDSC01_02">
            <patient_id>PATIENT_ID</patient_id>
            <event_no>HDSD03_01_031</event_no>
            <ref_time>HDSD00_01_457</ref_time>
        </dataset>
        <dataset code="HDSC02_09">
            <patient_id>PATIENT_ID</patient_id>
            <event_no>HDSD00_01_579</event_no>
            <ref_time>HDSD00_01_185</ref_time>
        </dataset>
    </patient_queue>
    <register>
        <dataset code="HDSA00_01">
            <id_card>HDSA00_01_017</id_card>
        </dataset>
    </register>
</config>