Merge branch 'master' of zlf/esb into master

.idea/libraries/Maven__jline_jline_0_9_94.xml

@@ -1,13 +0,0 @@
<component name="libraryTable">
  <library name="Maven: jline:jline:0.9.94">
    <CLASSES>
      <root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94.jar!/" />
    </CLASSES>
    <JAVADOC>
      <root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
      <root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94-sources.jar!/" />
    </SOURCES>
  </library>
</component>

Hos-Resource-Mini-helper/target/classes/config/threadConfig.properties

@@ -1,15 +1,15 @@
soft.versionCode=1
## service address
service.url=https://ehr.yihu.com/api/v1.0/
service.url=https://192.168.131.15:443/api/v1.0/
service.clientId = kHAbVppx44
service.clientKey = Bd2h8rdYhep6NKOO
logThread.sleepTime=30
logThread.sleepTime=1
sqlThread.sleepTime=30
## logThread sleep time  min
logThread.uploadLog=simplified-esb/uploadLog
logThread.uploadLog=esb/uploadLog
logThread.getUploadFlag=simplified-esb/getUploadFlag

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

@@ -8,7 +8,6 @@ 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -43,14 +42,4 @@ public class CrawlerController {
            return Result.error("参数转换病人实体失败");
        }
    }
    @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);
    }
}

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

@@ -11,6 +11,7 @@ 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.AdapterSchemeVersionModel;
import com.yihu.ehr.standard.service.adapter.AdapterDatasetService;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
@@ -26,7 +27,7 @@ public class CrawlerManager {
    private static volatile CrawlerManager instance;
    private static DataCollectDispatcher dispatch;
    private List<AdapterDataSet> adapterDataSetList;
    private String version;
    private Boolean adapterFlg = false;
    private List<Patient> patientList;
    public CrawlerManager() {
        dispatch = DataCollectDispatcher.getInstance();
@@ -132,13 +133,14 @@ public class CrawlerManager {
    }
    public Boolean getAdapterDataSetList() {
        if (StringUtil.isEmpty(version)) {
        if (!adapterFlg) {
            adapterDataSetList = new ArrayList<>();
            AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
            version = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (StringUtil.isEmpty(version)) {
            AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (adapterSchemeVersionModel == null) {
                return false;
            }
            String version = adapterSchemeVersionModel.getVersion();
            AdapterVersion adapterVersion = new AdapterVersion(version);
            AdapterDatasetService adapterDatasetService = SpringBeanUtil.getService(AdapterDatasetService.BEAN_ID);
            Map<String, String> condition = new HashMap<>();
@@ -148,8 +150,9 @@ public class CrawlerManager {
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }
            adapterFlg = true;
        }
        return true;
        return adapterFlg;
    }
    /**
@@ -169,7 +172,7 @@ public class CrawlerManager {
        }
    }
    public void setVersion(String version) {
        this.version = version;
    public void setAdapterFlg(Boolean adapterFlg) {
        this.adapterFlg = adapterFlg;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/AdapterController.java

@@ -1,177 +0,0 @@
package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.DictItem;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeService;
import com.yihu.ehr.standard.service.standard.StandardService;
import com.yihu.ehr.standard.service.standard.StandardVersionService;
import com.yihu.ehr.standard.service.standard.StdPublisherService;
import com.yihu.ehr.system.model.SystemOrganization;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController("AdapterController")
@RequestMapping("/adapter")
@Api(protocols = "https", value = "AdapterController", description = "适配管理", tags = {"适配"})
public class AdapterController extends BaseController {
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;
    @Resource(name = StandardService.BEAN_ID)
    private StandardService standardService;
    @Resource(name = StandardVersionService.BEAN_ID)
    private StandardVersionService standardVersionService;
    @Resource(name = StdPublisherService.BEAN_ID)
    private StdPublisherService stdPublisherService;
    /**
     * 查询适配方案首页信息（get）
     * @param condition
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/searchSchemesList")
    @ApiOperation(value = "获取适配方案列表", response = DetailModelResult.class, responseContainer = "List", produces = "application/json", notes = "获取适配方案列表")
    public DetailModelResult getList(
            @ApiParam(name = "condition", value = "Search param,Must be json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
       return adapterSchemeService.getEntityList(condition, order, rows, page);
    }
    /**
     * 根据适配ID获取适配方案信息（get）
     * @param schemeId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getForSchemeId")
    @ApiOperation(value = "获取适配方案", response = Result.class, produces = "application/json", notes = "获取适配方案")
    public Result get(
            @ApiParam(name = "schemeId", value = "标准版本ID")
            @RequestParam(value = "schemeId") Integer schemeId) {
        return adapterSchemeService.get(schemeId);
    }
    /**
     * 修改适配（PUT）
     * @param scheme
     * @return
     * @throws Exception
     */
    @RequestMapping("/updateScheme")
    @ApiOperation(value = "修改适配方案", response = Result.class, produces = "application/json", notes = "修改适配方案")
    public Result modify(
            @ApiParam(name = "scheme", value = "适配方案")
            @RequestParam(value = "scheme") String scheme) {
        return adapterSchemeService.update(scheme);
    }
    /**
     * 新增适配（POST）
     * @param scheme
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/addScheme")
    @ApiOperation(value = "保存适配方案", response = Result.class, produces = "application/json", notes = "保存适配方案")
    public Result add(
            @ApiParam(name = "scheme", value = "适配方案信息")
            @RequestParam(value = "scheme") String scheme) {
        return adapterSchemeService.add(scheme);
    }
    /**
     * 删除适配（DELETE）
     * @param  schemeId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/deleteScheme")
    @ApiOperation(value = "删除适配方案", response = Result.class, produces = "application/json", notes = "删除适配方案")
    public Result delete(
            @ApiParam(name = "schemeId", value = "适配方案ID")
            @RequestParam(value = "schemeId") Integer schemeId) {
        return adapterSchemeService.delete(schemeId);
    }
    /**
     * 获取平台标准名称/应用标准名称列表
     * @param condition
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getStandards")
    @ApiOperation(value = "获取标准列表", response = DictionaryResult.class, produces = "application/json", notes = "获取标准列表")
    public DictionaryResult getStandardList(
            @ApiParam(name = "condition", value = "Must be Json,其中type为区分集成与应用标准")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        DictionaryResult dictionaryResult = standardService.getDictionaryResult(condition, order, rows, page);
        return dictionaryResult;
    }
    /**
     * 获取平台标准版本/应用标准版本列表
     * @param standardId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getVersions")
    @ApiOperation(value = "获取标准版本列表", response = DictionaryResult.class, produces = "application/json", notes = "获取标准版本列表")
    public DictionaryResult getVersionList(
            @ApiParam(name = "standardId", value = "标准ID")
            @RequestParam(value = "standardId") Integer standardId,
            @ApiParam(name = "condition", value = "Must be Json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return standardService.getDictionaryResult(condition, order, rows, page);
    }
    /**
     * 获取发布机构名称列表
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getPublishers")
    @ApiOperation(value = "获取发布机构列表", response = DictionaryResult.class, produces = "application/json", notes = "获取发布机构列表")
    public DictionaryResult getPublishers(
            @ApiParam(name = "condition", value = "Must be Json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return stdPublisherService.getDictionaryResult(condition, order, rows, page);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeDatasetController.java

@@ -18,10 +18,10 @@ import java.io.UnsupportedEncodingException;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeDatasetController")
@RestController("AdapterDatasetController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
public class SchemeDatasetController extends BaseController {
@Api(protocols = "https", value = "AdapterDatasetController", description = "适配数据集管理", tags = {"适配数据集"})
public class AdapterDatasetController extends BaseController {
    @Resource(name = AdapterDatasetService.BEAN_ID)
    private AdapterDatasetService datasetService;

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeDictController.java

@@ -16,10 +16,10 @@ import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeDictController")
@RestController("AdapterDictController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeDictController", description = "适配字典管理", tags = {"适配字典"})
public class SchemeDictController extends BaseController {
@Api(protocols = "https", value = "AdapterDictController", description = "适配字典管理", tags = {"适配字典"})
public class AdapterDictController extends BaseController {
    @Resource(name = AdapterDictService.BEAN_ID)
    private AdapterDictService dictService;

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeDictEntryController.java

@@ -16,10 +16,10 @@ import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeDictEntryController")
@RestController("AdapterDictEntryController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
public class SchemeDictEntryController extends BaseController {
@Api(protocols = "https", value = "AdapterDictEntryController", description = "适配字典项管理", tags = {"适配字典项"})
public class AdapterDictEntryController extends BaseController {
    @Resource(name = AdapterDictEntryService.BEAN_ID)
    private AdapterDictEntryService dictentryService;

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeMetadataController.java

@@ -17,10 +17,10 @@ import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("SchemeMetadataController")
@RestController("AdapterMetadataController")
@RequestMapping("/adapterCenter")
@Api(protocols = "https", value = "SchemeMetadataController", description = "适配字典管理", tags = {"适配字典"})
public class SchemeMetadataController extends BaseController {
@Api(protocols = "https", value = "AdapterMetadataController", description = "适配字典管理", tags = {"适配字典"})
public class AdapterMetadataController extends BaseController {
    @Resource(name = AdapterMetadataService.BEAN_ID)
    private AdapterMetadataService metadataService;
    /**

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/AdapterVersionController.java

@@ -1,117 +0,0 @@
package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
 * Created by LLH on 2016/1/6.
 */
@RestController("AdapterVersionController")
@RequestMapping("/adapterversion")
@Api(protocols = "https", value = "AdapterVersionController", description = "适配版本管理", tags = {"适配"})
public class AdapterVersionController extends BaseController {
    @Resource(name = AdapterSchemeVersionService.BEAN_ID)
    private AdapterSchemeVersionService adapterSchemeVersion;
    /**
     * 根据版本id获取适配方案信息（get）
     * @param versionId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getForVersionId")
    @ApiOperation(value = "获取适配版本", response = Result.class, produces = "application/json", notes = "获取适配版本")
    public Result getForVersionId(
            @ApiParam(name = "versionId", value = "适配版本ID")
            @RequestParam(value = "versionId") Integer versionId) {
        return adapterSchemeVersion.get(versionId);
    }
    /**
     * 新增版本（post）
     * @param version
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/addVersion")
    @ApiOperation(value = "保存适配版本", response = Result.class, produces = "application/json", notes = "保存适配版本")
    public Result add(
            @ApiParam(name = "version", value = "适配版本信息")
            @RequestParam(value = "version") String version) {
        return adapterSchemeVersion.add(version);
    }
    /**
     * 修改版本（put）
     * @param version
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/updateVersion")
    @ApiOperation(value = "修改适配版本", response = Result.class, produces = "application/json", notes = "修改适配版本")
    public Result updateVersion(
            @ApiParam(name = "version", value = "标准版本")
            @RequestParam(value = "version") String version) {
        return adapterSchemeVersion.update(version);
    }
    /**
     * 发布版本（put）
     * @param version
     * @return
     * @throws Exception
     */
    @RequestMapping("/publishVersion")
    @ApiOperation(value = "发布适配版本", response = Result.class, produces = "application/json", notes = "修改适配版本")
    public Result publishVersion(
            @ApiParam(name = "version", value = "标准版本")
            @RequestParam(value = "version") String version) {
        return adapterSchemeVersion.publish(version);
    }
    /**
     * 删除版本（put）
     * @param versionId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/deleteVersion")
    @ApiOperation(value = "删除版本", response = Result.class, produces = "application/json", notes = "删除版本")
    public Result delete(
            @ApiParam(name = "versionId", value = "标准版本ID")
            @RequestParam(value = "versionId") Integer versionId) {
        return adapterSchemeVersion.delete(versionId);
    }
    /**
     * 获取基础版本列表
     * @param schemeId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getVersions")
    @ApiOperation(value = "获取适配方案版本列表", response = DictionaryResult.class, produces = "application/json", notes = "获取标准版本列表")
    public DictionaryResult getList(
            @ApiParam(name = "schemeId", value = "适配方案ID")
            @RequestParam(value = "schemeId") Integer schemeId,
            @ApiParam(name = "condition", value = "Search param,Must be json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return adapterSchemeVersion.getDictionaryResult(schemeId, condition, order, rows, page);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/PublisherController.java

@@ -1,5 +1,6 @@
package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.service.standard.StdPublisherService;
@@ -36,4 +37,29 @@ public class PublisherController extends BaseController {
            @RequestParam(value = "publisherId") String publisherId) {
        return stdPublisherService.get(publisherId);
    }
    @RequestMapping(value = "/getStandardPublisher")
    @ApiOperation(value = "获取发布机构", response = Result.class, produces = "application/json", notes = "获取发布机构")
    public Result getStandardPublisher(){
        return stdPublisherService.getStandardPublisher();
    }
    /**
     * 获取发布机构名称列表
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getPublishers")
    @ApiOperation(value = "获取发布机构列表", response = DictionaryResult.class, produces = "application/json", notes = "获取发布机构列表")
    public DictionaryResult getPublishers(
            @ApiParam(name = "condition", value = "Must be Json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return stdPublisherService.getDictionaryResult(condition, order, rows, page);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeController.java

@@ -41,7 +41,7 @@ public class SchemeController extends BaseController {
     */
    @RequestMapping(value = "/getForSchemeId")
    @ApiOperation(value = "获取适配方案", response = Result.class, produces = "application/json", notes = "获取适配方案")
    public Result getForSchemeId(
    public Result get(
            @ApiParam(name = "schemeId", value = "标准版本ID")
            @RequestParam(value = "schemeId") Integer schemeId) {
        return adapterSchemeService.get(schemeId);
@@ -53,9 +53,9 @@ public class SchemeController extends BaseController {
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/updateScheme")
    @RequestMapping("/updateScheme")
    @ApiOperation(value = "修改适配方案", response = Result.class, produces = "application/json", notes = "修改适配方案")
    public Result updateScheme(
    public Result modify(
            @ApiParam(name = "scheme", value = "适配方案")
            @RequestParam(value = "scheme") String scheme) {
        return adapterSchemeService.update(scheme);
@@ -69,7 +69,7 @@ public class SchemeController extends BaseController {
     */
    @RequestMapping(value = "/addScheme")
    @ApiOperation(value = "保存适配方案", response = Result.class, produces = "application/json", notes = "保存适配方案")
    public Result addScheme(
    public Result add(
            @ApiParam(name = "scheme", value = "适配方案信息")
            @RequestParam(value = "scheme") String scheme) {
        return adapterSchemeService.add(scheme);
@@ -83,7 +83,7 @@ public class SchemeController extends BaseController {
     */
    @RequestMapping(value = "/deleteScheme")
    @ApiOperation(value = "删除适配方案", response = Result.class, produces = "application/json", notes = "删除适配方案")
    public Result deleteScheme(
    public Result delete(
            @ApiParam(name = "schemeId", value = "适配方案ID")
            @RequestParam(value = "schemeId") Integer schemeId) {
        return adapterSchemeService.delete(schemeId);

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/SchemeVersionController.java

@@ -1,6 +1,7 @@
package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
@@ -101,4 +102,26 @@ public class SchemeVersionController extends BaseController {
            return null;
        }
    }
    /**
     * 获取基础版本列表
     * @param schemeId
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getVersions")
    @ApiOperation(value = "获取适配方案版本列表", response = DictionaryResult.class, produces = "application/json", notes = "获取标准版本列表")
    public DictionaryResult getList(
            @ApiParam(name = "schemeId", value = "适配方案ID")
            @RequestParam(value = "schemeId") Integer schemeId,
            @ApiParam(name = "condition", value = "Search param,Must be json")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Order param,Must be json.ascending:asc,descending:desc")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        return adapterSchemeVersion.getDictionaryResult(schemeId, condition, order, rows, page);
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/controller/StandardController.java

@@ -1,8 +1,11 @@
package com.yihu.ehr.standard.controller;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.DictionaryResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.controller.BaseController;
import com.yihu.ehr.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.ehr.standard.service.standard.StandardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,10 +43,10 @@ public class StandardController extends BaseController {
     * @throws Exception
     */
    @RequestMapping("/getSysParamList")
    @ApiOperation(value = "获取集成标准系统参数", response = String.class, notes = "获取集成标准系统参数")
    public String getSysParamList() {
        String code = standardService.getSysParamList();
        return code;
    @ApiOperation(value = "获取集成标准系统参数", response = StandardParamResultModel.class, notes = "获取集成标准系统参数")
    public StandardParamResultModel getSysParamList() {
        StandardParamResultModel standardParamResultModel = standardService.getStandardParam(Constants.STANDARD);
        return standardParamResultModel;
    }
@@ -102,4 +105,25 @@ public class StandardController extends BaseController {
            @RequestParam(value = "standardId") Integer standardId) {
        return standardService.delete(standardId);
    }
    /**
     * 获取平台标准名称/应用标准名称列表
     * @param condition
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/getStandards")
    @ApiOperation(value = "获取标准列表", response = DictionaryResult.class, produces = "application/json", notes = "获取标准列表")
    public DictionaryResult getStandardList(
            @ApiParam(name = "condition", value = "Must be Json,其中type为区分集成与应用标准")
            @RequestParam(value = "condition", required = false) String condition,
            @ApiParam(name = "order", value = "Must be Json")
            @RequestParam(value = "order", required = false) String order,
            @ApiParam(name = "rows", value = "Limit the size of result set. Must be an integer")
            @RequestParam(value = "rows", required = false) Integer rows,
            @ApiParam(name = "page", value = "Start position of result set. Must be an integer")
            @RequestParam(value = "page", required = false) Integer page) {
        DictionaryResult dictionaryResult = standardService.getDictionaryResult(condition, order, rows, page);
        return dictionaryResult;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/model/standard/resultModel/StandardParamResultModel.java

@@ -0,0 +1,27 @@
package com.yihu.ehr.standard.model.standard.resultModel;
import com.yihu.ehr.framework.model.Result;
/**
 * Created by lingfeng on 2016/4/22.
 */
public class StandardParamResultModel extends Result {
    String code;
    String orgCode;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterSchemeVersionService.java

@@ -114,7 +114,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
            AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
            if (adapterSchemeModel != null) {
                if (versionModel.getSchemeId() == adapterSchemeModel.getId()) {
                    CrawlerManager.getInstance().setVersion(Constants.EMPTY);
                    CrawlerManager.getInstance().setAdapterFlg(false);
                }
            }
        } catch (Exception e) {
@@ -230,7 +230,7 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
            AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
            if (adapterSchemeModel != null) {
                if (adapterSchemeVersionModel.getSchemeId() == adapterSchemeModel.getId()) {
                    CrawlerManager.getInstance().setVersion(Constants.EMPTY);
                    CrawlerManager.getInstance().setAdapterFlg(false);
                }
            }
            adapterSchemeVersionModel.setPublishTime(new Date());
@@ -413,15 +413,15 @@ public class AdapterSchemeVersionService extends SQLGeneralDAO {
        return sql.toString();
    }
    public String getEhrAdapterVersionLasted() {
    public AdapterSchemeVersionModel getEhrAdapterVersionLasted() {
        AdapterSchemeModel adapterSchemeModel = getEhrAdapter();
        if (adapterSchemeModel == null) {
            return Constants.EMPTY;
            return null;
        }
        String adapterSchemeVersionHql = "SELECT VERSION FROM ADAPTER_SCHEME_VERSION WHERE PUBLISH_TIME=(select max(PUBLISH_TIME) from ADAPTER_SCHEME_VERSION WHERE SCHEME_ID = :schemeId)";
        String adapterSchemeVersionHql = "SELECT ID AS id,VERSION AS version,SCHEME_ID AS schemeId,NAME AS name FROM ADAPTER_SCHEME_VERSION WHERE PUBLISH_TIME=(select max(PUBLISH_TIME) from ADAPTER_SCHEME_VERSION WHERE SCHEME_ID = :schemeId)";
        Query adapterSchemeVersionQuery = getCurrentSession().createSQLQuery(adapterSchemeVersionHql);
        adapterSchemeVersionQuery.setParameter("schemeId", adapterSchemeModel.getId());
        String version = (String) adapterSchemeVersionQuery.uniqueResult();
        AdapterSchemeVersionModel version = (AdapterSchemeVersionModel) adapterSchemeVersionQuery.uniqueResult();
        return version;
    }

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardService.java

@@ -15,8 +15,10 @@ import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.model.standard.resultModel.StandardParamResultModel;
import com.yihu.ehr.standard.model.standard.resultModel.StandardResultDetailModel;
import com.yihu.ehr.system.model.SystemOrganization;
import com.yihu.ehr.system.model.SystemParam;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
@@ -130,9 +132,8 @@ public class StandardService extends SQLGeneralDAO {
            existFlg = existStandardVersionValid(standardModel.getId());
            if (!publishedFlg && !existFlg) {
                deleteEntity(StandardModel.class, standardId);
                return Result.error("删除标准失败");
                return Result.success("删除标准成功");
            }
            return Result.error("删除标准成功");
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -209,11 +210,23 @@ public class StandardService extends SQLGeneralDAO {
       return Result.error("获取标准失败");
    }
    public String getSysParamList() {
        String paramSql = "select s.param_value from system_param s where s.param_key = '"+ Constants.STANDARD +"'";
        Query paramQuery = getCurrentSession().createSQLQuery(paramSql);
        String code = (String) paramQuery.uniqueResult();
        return code;
    public StandardParamResultModel getStandardParam(String paramKey) {
        Criteria criteria = getCurrentSession().createCriteria(SystemParam.class);
        criteria.add(Restrictions.eq("paramKey", paramKey));
        SystemParam systemParam = (SystemParam) criteria.uniqueResult();
        if (systemParam != null) {
            StandardParamResultModel standardParamResultModel = new StandardParamResultModel();
            standardParamResultModel.setSuccessFlg(true);
            standardParamResultModel.setMessage("获取参数成功");
            standardParamResultModel.setCode(systemParam.getParamValue());
            standardParamResultModel.setOrgCode(systemParam.getOrgId());
            return standardParamResultModel;
        } else {
            StandardParamResultModel standardParamResultModel = new StandardParamResultModel();
            standardParamResultModel.setSuccessFlg(false);
            standardParamResultModel.setMessage("获取参数失败");
            return standardParamResultModel;
        }
    }
    public List<StandardResultDetailModel> getStandardListFormat(List<SystemOrganization> publisherModelList,
@@ -325,21 +338,25 @@ public class StandardService extends SQLGeneralDAO {
                e.printStackTrace();
            }
        }
        String code = getStandardParam(Constants.STANDARD).getCode();
        String orgCode = getStandardParam(Constants.STANDARD).getOrgCode();
        List<SystemOrganization> publisherModelList = new ArrayList<>();
        String code = getSysParamList();
        String publisherHql = "FROM SystemOrganization";
        Query query = getCurrentSession().createQuery(publisherHql);
        List<SystemOrganization> publisherModelList = query.list();
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        Criteria criteria = getCurrentSession().createCriteria(StandardModel.class);
        if (type == 0) {
            criteria.add(Restrictions.eq("code", code));
            String publisherHql = "FROM SystemOrganization WHERE code =:orgCode";
            Query query = getCurrentSession().createQuery(publisherHql);
            query.setParameter("orgCode", orgCode);
            publisherModelList = query.list();
        } else if (type == 1) {
            criteria.add(Restrictions.ne("code", code));
            String publisherHql = "FROM SystemOrganization";
            Query query = getCurrentSession().createQuery(publisherHql);
            publisherModelList = query.list();
        }
        List<StandardModel> standardModelList = criteria.list();
        List<StandardModel> standardModelList = criteria.list();
        Map<String, String> codeToIdMap = new HashMap<>();
        List<Integer> idList = new ArrayList<>();
        for (StandardModel standardModel : standardModelList) {
@@ -350,7 +367,7 @@ public class StandardService extends SQLGeneralDAO {
        }
        String versionHql = "FROM StandardVersionModel WHERE standardId IN :idList";
        query = getCurrentSession().createQuery(versionHql);
        Query query = getCurrentSession().createQuery(versionHql);
        query.setParameterList("idList", idList);
        List<StandardVersionModel> versionModelList = query.list();
@@ -398,7 +415,7 @@ public class StandardService extends SQLGeneralDAO {
        for (String key : query.keySet()) {
            if (key.equals("type")) {
                Integer type = Integer.parseInt(query.get(key));
                String code = getSysParamList();
                String code = getStandardParam(Constants.STANDARD).getCode();
                if (type == 0) {
                    criteria.add(Restrictions.eq("code", code));
                } else if (type == 1) {

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StandardVersionService.java

@@ -11,9 +11,7 @@ import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.framework.util.sql.SqlCreator;
import com.yihu.ehr.standard.model.adapter.AdapterSchemeModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.model.standard.StandardVersionModel;
import com.yihu.ehr.standard.service.bo.StandardVersion;
import org.hibernate.Criteria;
@@ -119,10 +117,9 @@ public class StandardVersionService extends SQLGeneralDAO {
    }
    public Boolean versionNameValidate(Integer standardId, String versionName) {
            Map<String, String> query = new HashMap<>();
            Map<String, Object> query = new HashMap<>();
            Map<String, String> order = new HashMap<>();
            query.put("name", versionName);
            List<StandardVersionModel> list = getList(standardId, query, order, 1, 0);
            if (!CollectionUtil.isEmpty(list)) {
                return true;
@@ -230,7 +227,7 @@ public class StandardVersionService extends SQLGeneralDAO {
    }
    public StandardVersionModel getLastestVersion(Integer standardId) {
        Map<String, String> query = new HashMap<>();
        Map<String, Object> query = new HashMap<>();
        Map<String, String> order = new HashMap<>();
        order.put("publisher", Constants.DESC);
@@ -306,12 +303,15 @@ public class StandardVersionService extends SQLGeneralDAO {
        buildVersionTables(baseVersion, newVersion, standardVersionModel.getStandardId());
    }
    private List<StandardVersionModel> getList(Integer standardId, Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
    private List<StandardVersionModel> getList(Integer standardId, Map<String, Object> query, Map<String, String> order, Integer limit, Integer offset) {
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardVersionModel.class);
        criteria.add(Restrictions.eq("standardId", standardId));
        criteria.add(Restrictions.eq("publishStatus", 1));
        if (query != null) {
            for (String key : query.keySet()) {
                criteria.add(Restrictions.eq(key, query.get(key)));
            }
        }
        if (limit != null) {
            criteria.setMaxResults(limit);
            if (offset != null) {

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdDatasetService.java

@@ -78,7 +78,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (!existFlg) {
                this.add(standardVersion.getDataSetTableName(), stdDataSetModel);
                stdDataSetModel.setSuccessFlg(true);
                stdDataSetModel.success("保存数据集成功");
                stdDataSetModel.setMessage("保存数据集成功");
                return stdDataSetModel;
            }
        } catch (Exception e) {
@@ -144,7 +144,7 @@ public class StdDatasetService extends SQLGeneralDAO {
            if (!existFlg) {
                this.update(standardVersion, stdDataSetModel);
                stdDataSetModel.setSuccessFlg(true);
                stdDataSetModel.success("修改数据集成功");
                stdDataSetModel.setMessage("修改数据集成功");
                return stdDataSetModel;
            }
        } catch (Exception e) {

Hos-resource/src/main/java/com/yihu/ehr/standard/service/standard/StdPublisherService.java

@@ -11,6 +11,7 @@ import com.yihu.ehr.framework.util.sql.RequestParamTransformer;
import com.yihu.ehr.standard.model.standard.resultModel.PublisherResultModel;
import com.yihu.ehr.system.model.SystemOrganization;
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
@@ -106,4 +107,23 @@ public class StdPublisherService extends SQLGeneralDAO {
            return Result.error("获取机构信息失败");
        }
    }
    public Result getStandardPublisher() {
        try {
            String paramSql = "select s.org_id from system_param s where s.param_key = '"+ Constants.STANDARD+"'";
            Query paramQuery = getCurrentSession().createSQLQuery(paramSql);
            String publisherCode = (String) paramQuery.uniqueResult();
            Criteria criteria = getCurrentSession().createCriteria(SystemOrganization.class);
            criteria.add(Restrictions.eq("code", publisherCode));
            SystemOrganization systemOrganization = (SystemOrganization) criteria.uniqueResult();
            PublisherResultModel publisherResultModel = new PublisherResultModel();
            publisherResultModel.setCode(systemOrganization.getCode());
            publisherResultModel.setName(systemOrganization.getFullName());
            publisherResultModel.setSuccessFlg(true);
            publisherResultModel.setMessage("获取机构信息成功");
            return publisherResultModel;
        } catch (Exception e) {
            throw new ApiException(ErrorCode.GetPublisherFailed);
        }
    }
}