1.3版本采集提交

hos-broker/src/main/java/com/yihu/hos/broker/configurations/ApplicationConfiguration.java

@@ -1,9 +1,13 @@
package com.yihu.hos.broker.configurations;
import org.apache.camel.component.quartz.QuartzComponent;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
/**
 * @created Airhead 2016/8/1.
 */
@@ -20,4 +24,14 @@ public class ApplicationConfiguration implements ApplicationListener<EmbeddedSer
    public int getPort() {
        return port;
    }
    @Bean
    public QuartzComponent quartz(){
        QuartzComponent quartzComponent =  new QuartzComponent();
        Properties properties1 = new Properties();
        properties1.setProperty("propertiesFile", "classPath:quartz.properties");
        quartzComponent.setProperties(properties1);
        return quartzComponent;
    }
}

hos-broker/src/main/resources/quartz.properties

@@ -0,0 +1,44 @@
# Default Properties file for use by StdSchedulerFactory
# to create a Quartz Scheduler Instance, if a different
# properties file is not explicitly specified.
#
 
#��Ⱥ����
org.quartz.scheduler.instanceName = DefaultQuartzScheduler
org.quartz.scheduler.instanceId = AUTO
org.quartz.scheduler.rmi.export = false
org.quartz.scheduler.rmi.proxy = false
org.quartz.scheduler.wrapJobExecutionInUserTransaction = false
org.quartz.threadPool.class: org.quartz.simpl.SimpleThreadPool
org.quartz.threadPool.threadCount: 10
org.quartz.threadPool.threadPriority: 5
org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
org.quartz.jobStore.misfireThreshold: 3600000
 
#============================================================================
# Configure JobStore
#============================================================================
 
# RAM
# Configure JobStore Cluster
org.quartz.jobStore.class:org.quartz.impl.jdbcjobstore.JobStoreTX
org.quartz.jobStore.driverDelegateClass:org.quartz.impl.jdbcjobstore.StdJDBCDelegate
#org.quartz.jobStore.useProperties:true
#dataSource׺
org.quartz.jobStore.tablePrefix:QRTZ_
org.quartz.jobStore.dataSource:qzDS
 
#============================================================================
# Configure Datasources
#============================================================================
#dataSource
org.quartz.dataSource.qzDS.driver:com.mysql.jdbc.Driver
org.quartz.dataSource.qzDS.URL:jdbc:mysql://172.19.103.42:8066/hos2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&autoReconnectForPools=true
org.quartz.dataSource.qzDS.user:hos
org.quartz.dataSource.qzDS.password:123456
org.quartz.dataSource.qzDS.maxConnection:10
org.quartz.dataSource.qzDS.validateOnCheckout:true
org.quartz.dataSource.qzDS.validationQuery:select 1

hos-logger/pom.xml

@@ -71,6 +71,7 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>${spring-boot-version}</version>
                <executions>
                    <execution>
                        <goals>

hos-rest/src/main/java/com/yihu/hos/rest/common/format/DataSetTransformer.java

@@ -191,6 +191,9 @@ public class DataSetTransformer implements IDataTransformer {
    public String transferElem(AdapterDataSet adapterDataSet, String code, String esbData) {
        Map<String, AdapterMetaData> adapterMetaDataMap = adapterDataSet.getAdapterMetaDataMap();
        AdapterMetaData adapterMetaData = adapterMetaDataMap.get(code);
        if (adapterMetaData==null){
            return esbData;
        }
        AdapterDict adapterDict = adapterMetaData.getAdapterDict();
        if (adapterDict == null) {
@@ -220,8 +223,10 @@ public class DataSetTransformer implements IDataTransformer {
        try{
            if ("DATE".equals(columnType) || "DATETIME".equals(columnType)) {
                //时间转换
                String utcDate = DateUtil.getUtcDate(esbData, DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
                return utcDate;
                if (!StringUtil.isEmpty(esbData)){
                    String utcDate = DateUtil.getUtcDate(esbData, DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
                    return utcDate;
                }
            } else {
                return esbData;
            }

hos-rest/src/main/java/com/yihu/hos/rest/controllers/DataCollectController.java

@@ -33,6 +33,7 @@ public class DataCollectController extends BaseController {
            @ApiParam(name = "jobId", value = "任务jobId", required = true)
            @RequestParam(value = "jobId") String jobId) {
        try {
            System.out.println("===========进入 采集医院数据 接口==================");
            if (datacollectService.collectByJobId(jobId)) {
                return Result.success("采集成功");
            } else {

hos-rest/src/main/java/com/yihu/hos/rest/models/crawler/config/SysConfig.java

@@ -149,7 +149,6 @@ public class SysConfig {
                String dataSetCode = element.attributeValue("code");
                orgcode = element.attributeValue("code");
                String version = element.elementTextTrim("version");
                orgcode= element.attributeValue("code");
                String ehrVersion=new String(version);
                versionMap.put(dataSetCode,ehrVersion);
            }

hos-rest/src/main/java/com/yihu/hos/rest/models/crawler/patient/PatientIdentity.java

@@ -13,7 +13,7 @@ import java.util.Set;
 * @created 2015.06.16 16:29
 */
public class PatientIdentity {
    public static final String PATIENT_ID = "PATIENT_ID";
    public static final String PATIENT_ID = "JDSA00_01_001";
    public static final String LOCAL_CARD_NO = "CARD_NO";
    public static final String ID_CARD = "DE02_01_030_00";
    public static Set<String> EVENT_NO_SET = new HashSet<>();

hos-rest/src/main/java/com/yihu/hos/rest/models/crawler/qc/QcDaily.java

@@ -37,9 +37,9 @@ public class QcDaily {
    public void addReal(QcPatientIndex patientIndex, String dataSet) {
        if ("HDSC01_02".equals(dataSet)) {//门诊
        if ("HDSC01_02".equals(dataSet) || "HDSD00_85".equals(dataSet) ) {//门诊
            this.real_outpatient.add(patientIndex);
        } else if ("HDSC02_09".equals(dataSet)) {//住院
        } else if ("HDSC02_09".equals(dataSet) || "HDSD00_13".equals(dataSet) ) {//住院
            this.real_hospital.add(patientIndex);
        } else {
            return;

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/CrawlerManager.java

@@ -308,7 +308,6 @@ public class CrawlerManager {
            qcDataSet.put("real_num",realCount);
            qcDataSet.set("total", objectMapper.convertValue(adapterDataSetMap.keySet().toArray(), JsonNode.class));
            qcDataSet.set("real", objectMapper.convertValue(realList, JsonNode.class));
            boolean b = dispatch.toQcDataSetFile(qcDataSet, patient);//生成数据集质控文件
            logger.info("上传档案流程-获取病人信息成功,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
            //上传档案
            logger.info("上传病人档案及质控数据");
@@ -322,6 +321,7 @@ public class CrawlerManager {
                        }
                    } else {
                        //TODO 规则检验
                        boolean b = dispatch.toQcDataSetFile(qcDataSet, patient);//生成数据集质控文件
                        if (!dispatch.uploadQcData(dataMap, patient, dataSetMap, stdDataSetMap,collectType)) {
                            logger.error("上传质控包失败");
                            return false;

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/DataCollectDispatcher.java

@@ -310,7 +310,7 @@ public class DataCollectDispatcher {
                String orgMetaDataCode = adapterMetadataModel.getAdapterMetadataCode();
                String stdMetaDataCode = adapterMetadataModel.getStdMetadataCode();
                if (!StringUtil.isEmpty(orgMetaDataCode)) {
                    jsonNode.put(orgMetaDataCode, dataNode.path(stdMetaDataCode).asText());
                    jsonNode.put(stdMetaDataCode, dataNode.path(stdMetaDataCode).asText());
                }
            }
            result.add(jsonNode);

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/DatacollectService.java

@@ -615,7 +615,7 @@ public class DatacollectService {
                    } else if (keytype.toUpperCase().equals("VARCHAR")) //字符串类型
                    {
                        maxKey = getToNumberSqlByDBType(dbType, key);
//                        maxKey = getToNumberSqlByDBType(dbType, key);
                        if (keyvalue != null && keyvalue.length() > 0) {
                            strWhere += " and " + maxKey + ">'" + keyvalue + "'";
                        }

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/QCDataUpload.java

@@ -91,6 +91,7 @@ public class QCDataUpload {
                return result;
            }
        } catch (Exception e) {
            logger.error("上传自控数据异常,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo(),e);
            FileUtil.deleteDirectory(new File(zipFile.directory));
            return false;
        }

hos-rest/src/main/resources/config/dbhelper.properties

@@ -4,4 +4,4 @@ defaultUser = esb
defaultPassword = esb
mongodbUri=mongodb://esb:esb@172.19.103.42:27017/?authSource=admin
mongodbName=hos
mongodbName=origin

hos-rest/src/main/resources/config/http.properties

@@ -1,7 +1,11 @@
httpUrl = http://172.19.103.73:10140/api/v1.0
httpCouldUrl = http://172.19.103.73:10400/api/v1.0
httpAdminUrl = http://172.19.103.73:10000/api/v1.0
#httpUrl = http://172.19.103.73:10140/api/v1.0
#httpCouldUrl = http://172.19.103.73:10400/api/v1.0
#httpAdminUrl = http://172.19.103.73:10000/api/v1.0
httpUrl = http://192.168.1.221:10140/api/v1.0
httpCouldUrl = http://192.168.1.221:10400/api/v1.0
httpAdminUrl = http://192.168.1.221:10000/api/v1.0
#  http://172.19.103.73:1443/api/v1.0
#\uFFFD\uFFFDhttps://192.168.131.15:4432/api/v1.0

hos-rest/src/main/resources/config/sys.config.xml

@@ -3,24 +3,24 @@
    <temp_file>/usr/local/esb/rest/temp</temp_file>
    <ehr_version>
        <org_code code="jkzl">
            <version>56395d75b854</version>
            <version>59083976eebd</version>
        </org_code>
    </ehr_version>
    <event_no>
        <item>HDSD03_01_031</item>
        <item>HDSD00_01_579</item>
        <item>HDSD00_02_040</item>
        <item>HDSD00_02_066</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>
        <dataset code="HDSD00_85">
            <patient_id>JDSA00_01_001</patient_id>
            <event_no>HDSD00_02_040</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 code="HDSD00_13">
            <patient_id>JDSA00_01_001</patient_id>
            <event_no>HDSD00_02_066</event_no>
            <ref_time>HDSD00_13_057</ref_time>
        </dataset>
    </patient_queue>
    <register>

hos-rest/src/main/resources/config/sys.config_copy.xml

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
    <temp_file>/usr/local/esb/rest/temp</temp_file>
    <ehr_version>
        <org_code code="jkzl">
            <version>59083976eebd</version>
        </org_code>
    </ehr_version>
    <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>