代码合并

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

@@ -24,6 +24,7 @@ import org.springframework.orm.hibernate4.HibernateTemplate;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import javax.transaction.Transactional;
import java.io.Serializable;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -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")

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

@@ -2,14 +2,11 @@ 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.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * 目前版本只需要采集，上传和注册病人档案就可了。