标准管理-版本列表筛选已发布的列表

Hos-Framework/src/main/java/com/yihu/ehr/framework/util/sql/RequestParamTransformer.java

@@ -2,6 +2,7 @@ package com.yihu.ehr.framework.util.sql;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.yihu.ehr.framework.constrant.ErrorCode;
import com.yihu.ehr.framework.exception.ApiException;
import com.yihu.ehr.framework.util.operator.StringUtil;
@@ -87,15 +88,20 @@ public class RequestParamTransformer {
    public static Map parseJsonToMap(String condition) {
        ObjectMapper objectMapper = new ObjectMapper();
        HashMap<String, String> map = new HashMap<String, String>();
        HashMap<String, Object> map = new HashMap<String, Object>();
        if (!StringUtil.isEmpty(condition)) {
            try {
                JsonNode jsonNode = objectMapper.readTree(condition);
                Iterator<String> fileNames = jsonNode.fieldNames();
                while (fileNames.hasNext()) {
                    String fieldName = fileNames.next();
                    String value = jsonNode.get(fieldName).asText();
                    map.put(fieldName, value);
                    JsonNode valueNode = jsonNode.get(fieldName);
                    if (valueNode.getNodeType().equals(JsonNodeType.NUMBER)) {
                        map.put(fieldName, jsonNode.get(fieldName).asInt());
                    } else {
                        map.put(fieldName, jsonNode.get(fieldName).asText());
                    }
                }
            } catch (IOException e) {
                e.printStackTrace();

Hos-resource/src/main/java/com/yihu/ehr/crawler/dao/intf/ICrawlerDao.java

@@ -2,7 +2,6 @@ package com.yihu.ehr.crawler.dao.intf;
import com.yihu.ehr.crawler.model.flow.CrawlerDataSetModel;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import java.util.List;
/**

Hos-resource/src/main/java/com/yihu/ehr/crawler/model/flow/CrawlerFlowHeadModel.java

@@ -15,8 +15,6 @@ public class CrawlerFlowHeadModel extends Result implements Serializable {
    private String datasetCode;
    private String datasetName;
    private String metadataCode;
    private String identityCode;
@@ -37,14 +35,6 @@ public class CrawlerFlowHeadModel extends Result implements Serializable {
        this.datasetCode = datasetCode;
    }
    public String getDatasetName() {
        return datasetName;
    }
    public void setDatasetName(String datasetName) {
        this.datasetName = datasetName;
    }
    public String getMetadataCode() {
        return metadataCode;
    }

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

@@ -26,9 +26,8 @@ public class CrawlerManager {
    private static volatile CrawlerManager instance;
    private static DataCollectDispatcher dispatch;
    private List<AdapterDataSet> adapterDataSetList;
    private Map<String, AdapterDataSet> adapterDataSetMap;
    private Boolean adapterFlg = false;
    private List<Patient> patientList;
    public CrawlerManager() {
        dispatch = DataCollectDispatcher.getInstance();
    }
@@ -59,7 +58,7 @@ public class CrawlerManager {
        Integer totalCount = 0;
        Map<String, Object> condition = new HashMap<>();
        condition.put("orgCode", SysConfig.getInstance().orgCode);
        patientList = dispatch.getPatientList(condition, adapterDataSetList);
        List<Patient> patientList = dispatch.getPatientList(condition, adapterDataSetMap);
        if (!CollectionUtil.isEmpty(patientList)) {
            totalCount = patientList.size();
            for (Patient patient : patientList) {
@@ -71,10 +70,11 @@ public class CrawlerManager {
        return message;
    }
    //单个病人采集上传
    public String collectProcess(Patient patient) {
        SysConfig.getInstance().setOrgCode(patient.getOrgCode());
        String message;
        if (!getAdapterDataSetList()) {
        if (!getDataForPrepare()) {
            message = "适配数据尚未准备";
            LogService.getLogger().error(message);
            return message;
@@ -82,16 +82,17 @@ public class CrawlerManager {
        patient.setReUploadFlg(StringUtil.toString(false));
        LogService.getLogger().trace("采集->注册->打包上传,任务ID：,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
        try {
            Map<String, AdapterDataSet> dataSetMap = new HashMap<>();
            List<JsonNode> dataList = new ArrayList<>();
            //getToken
            if (!dispatch.getToken()) {
                message = "token获取失败";
                LogService.getLogger().error(message);
                return message;
            }
            for (AdapterDataSet adapterDataSet : adapterDataSetList) {
            Map<String, AdapterDataSet> dataSetMap = new HashMap<>();
            Map<String, JsonNode> dataMap = new HashMap<>();
            for (String key : adapterDataSetMap.keySet()) {
                //collectData
                AdapterDataSet adapterDataSet = adapterDataSetMap.get(key);
                String data = dispatch.fecthData(patient, adapterDataSet);
                if (StringUtil.isEmpty(data)) {
                    continue;
@@ -99,7 +100,7 @@ public class CrawlerManager {
                ObjectMapper objectMapper = new ObjectMapper();
                JsonNode jsonObject = objectMapper.readTree(data);
                dataSetMap.put(adapterDataSet.getAdapterDataSetT().getStdDatasetCode(), adapterDataSet);
                dataList.add(jsonObject);
                dataMap.put(key, 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()))) {
@@ -112,8 +113,8 @@ public class CrawlerManager {
            LogService.getLogger().info("采集病人成功,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
            //上传档案
            try {
                if (!CollectionUtil.isEmpty(dataList)) {
                    if (!dispatch.upload(dataList, patient, dataSetMap)) {
                if (!CollectionUtil.isEmpty(dataMap.keySet())) {
                    if (!dispatch.upload(dataMap, patient, dataSetMap)) {
                        message = "上传档案失败";
                        LogService.getLogger().error(message);
                        return message;
@@ -132,9 +133,9 @@ public class CrawlerManager {
        return Constants.EMPTY;
    }
    public Boolean getAdapterDataSetList() {
    public Boolean getDataForPrepare() {
        if (!adapterFlg) {
            adapterDataSetList = new ArrayList<>();
            adapterDataSetMap = new HashMap<>();
            AdapterSchemeVersionService adapterSchemeVersionService = SpringBeanUtil.getService(AdapterSchemeVersionService.BEAN_ID);
            AdapterSchemeVersionModel adapterSchemeVersionModel = adapterSchemeVersionService.getEhrAdapterVersionLasted();
            if (adapterSchemeVersionModel == null) {
@@ -146,9 +147,9 @@ public class CrawlerManager {
            Map<String, String> condition = new HashMap<>();
            condition.put("column", "adapter_dataset_code");
            JSONObject jsonpObject = JSONObject.fromObject(condition);
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(AdapterDatasetModel.class, adapterVersion.getDataSetTableName(), jsonpObject.toString());
            List<AdapterDatasetModel> adapterDataSetModelList = adapterDatasetService.getAdapterDatasetNotNullList(adapterVersion, jsonpObject.toString());
            for (AdapterDatasetModel adapterDatasetModel : adapterDataSetModelList) {
                adapterDataSetList.add(new AdapterDataSet(adapterDatasetModel, adapterVersion));
                adapterDataSetMap.put(adapterDatasetModel.getStdDatasetCode(), new AdapterDataSet(adapterDatasetModel, adapterVersion));
            }
            adapterFlg = true;
        }

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

@@ -58,18 +58,18 @@ public class DataCollectDispatcher {
     * @param condition
     * @return List<PatientT>
     */
    public List<Patient> getPatientList(Map<String, Object> condition, List<AdapterDataSet> adapterDataSetList) {
    public List<Patient> getPatientList(Map<String, Object> condition, Map<String, AdapterDataSet> adapterDataSetMap) {
        ArrayList<Patient> patientList = new ArrayList<>();
        SimpleDateFormat df = new SimpleDateFormat(DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
        for (AdapterDataSet adapterDataSet : adapterDataSetList) {
            PatientIdentity patientIdentity = SysConfig.getInstance().getPatientIdentity(adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
        for (String key : adapterDataSetMap.keySet()) {
            PatientIdentity patientIdentity = SysConfig.getInstance().getPatientIdentity(key);
            if (patientIdentity == null) {
                continue;
            }
            try {
                //获取病人列表字段检验
                Map<String, String> propertyMap = getItemList(adapterDataSet);
                Map<String, String> propertyMap = getItemList(adapterDataSetMap.get(key));
                if (propertyMap == null) {
                    return patientList;
                }
@@ -83,7 +83,7 @@ public class DataCollectDispatcher {
                queryParams.add(new EhrCondition(" < ", patientIdentity.getRefTimeCode(), endTime));
                //Rest 接口请求
                String rootStr = EsbHttp.getPatientList(adapterDataSet, queryParams);
                String rootStr = EsbHttp.getPatientList(adapterDataSetMap.get(key), queryParams);
                if (StringUtil.isEmpty(rootStr)) {
                    return null;
                }
@@ -145,7 +145,89 @@ public class DataCollectDispatcher {
        return propertyMap;
    }
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet, List<EhrCondition> queryParams ) {
        try {
            ObjectMapper mapper = new ObjectMapper();
            ObjectNode paramsNode = mapper.createObjectNode();
            paramsNode.put("tableCode", adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
            paramsNode.put("condition", mapper.writeValueAsString(queryParams));
            List<NameValuePair> formParams = new ArrayList<>();
//            formParams.add(new BasicNameValuePair("secret", secret));
            formParams.add(new BasicNameValuePair("api", "collectionData"));
            formParams.add(new BasicNameValuePair("param", mapper.writeValueAsString(paramsNode)));
            //调用资源服务网关
            String rootStr = EsbHttp.getFecthData(formParams);
            JsonNode resultNode = mapper.readValue(rootStr, JsonNode.class);
            JsonNode result = resultNode.path("detailModelList");
            JsonNode data = matchAdapterData(result, adapterDataSet);
            ObjectNode jsonObject = mapper.createObjectNode();
            if (data != null && data.size() > 0) {
                jsonObject.set("data", data);
                jsonObject.put("code", adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
                jsonObject.put("patient_id", patient.getPatientId());
                jsonObject.put("event_no", patient.getEventNo());
                String agencyCode = patient.getOrgCode();
                jsonObject.put("org_code", agencyCode);
                jsonObject.put("inner_version", "123456");
                jsonObject.put("create_date", DateUtil.toString(new Date(), DateUtil.DEFAULT_YMDHMSDATE_FORMAT));
                jsonObject.put("event_time", patient.getReferenceTime());//DateUtil.toString(patient.getReferenceTime(), DateUtil.DEFAULT_YMDHMSDATE_FORMAT)
                if (StringUtil.isEmpty(patient.getReUploadFlg())) {
                    jsonObject.put("reUploadFlg", LogicValues.LOGIC_FALSE);
                } else {
                    jsonObject.put("reUploadFlg", patient.getReUploadFlg());
                }
                return jsonObject.toString();
            } else {
                return Constants.EMPTY;
            }
        } catch (Exception e) {
            return Constants.EMPTY;
        }
    }
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet, Map<String, String> relationValueMap) {
        List<EhrCondition> queryParams = new ArrayList<>();
        for (String key : relationValueMap.keySet()) {
            queryParams.add(new EhrCondition(" = ", key, relationValueMap.get(key)));
        }
        return fecthData(patient, adapterDataSet, queryParams);
    }
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet) {
        List<EhrCondition> queryParams = new ArrayList<>();
        boolean patientId = true;
        if (adapterDataSet.isHavePatientID()) {
            AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(PatientIdentity.getPatientIDCode());
            queryParams.add(new EhrCondition(" = ", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), patient.getPatientId()));
        } else {
            patientId = false;
        }
        boolean eventNo = true;
        if (adapterDataSet.isHaveEventNo()) {
            AdapterMetaData adapterMetaData = adapterDataSet.getAdapterMetaDataMap().get(adapterDataSet.getEventNoCode());
            queryParams.add(new EhrCondition(" = ", adapterMetaData.getAdapterMetadataModel().getStdMetadataCode(), patient.getEventNo()));
        } else {
            eventNo = false;
        }
        if (!patientId && !eventNo) {
            LogService.getLogger().error("采集病人数据集至少需要一项病人标识.数据集名:" + adapterDataSet.getAdapterDataSetT().getStdDatasetCode());
            return Constants.EMPTY;
        }
        return fecthData(patient, adapterDataSet, queryParams);
    }
    /**
     * 根据编排任务进行采集
     * @param patient
     * @param adapterDataSet
     * @return
     */
    public String fecthData1(Patient patient, AdapterDataSet adapterDataSet) {
        try {
            ObjectMapper mapper = new ObjectMapper();
            List<EhrCondition> queryParams = new ArrayList<>();
@@ -236,12 +318,12 @@ public class DataCollectDispatcher {
        return EsbHttp.register(patient, data, token);
    }
    public Boolean upload(List<JsonNode> dataList, Patient patient, Map<String, AdapterDataSet> dataSetMap) {
    public Boolean upload(Map<String, JsonNode> dataMap, Patient patient, Map<String, AdapterDataSet> dataSetMap) {
        Boolean result = true;
        try {
            DataSetTransformer dataTransformer = new DataSetTransformer();
            for (JsonNode data : dataList) {
                dataTransformer.setData(data);
            for (String key : dataMap.keySet()) {
                dataTransformer.setData(dataMap.get(key));
                if (!toFile(dataTransformer, patient, "origin")) {
                    LogService.getLogger().info("存储原始文件失败:patient_id=" + patient.getPatientId()
                            + "event_no=" + patient.getEventNo());

Hos-resource/src/main/java/com/yihu/ehr/datacollect/controller/DataCollectController.java

@@ -8,11 +8,14 @@ import com.yihu.ehr.datacollect.service.intf.IDatacollectManager;
import com.yihu.ehr.datacollect.service.intf.IDatacollectService;
import com.yihu.ehr.framework.constrant.DateConvert;
import com.yihu.ehr.framework.model.ActionResult;
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.framework.util.operator.CollectionUtil;
import com.yihu.ehr.resource.service.IStdService;
import com.yihu.ehr.standard.model.adapter.resultModel.SchemeResultDetailModel;
import com.yihu.ehr.standard.model.standard.StandardModel;
import com.yihu.ehr.standard.service.adapter.AdapterSchemeService;
import com.yihu.ehr.system.service.intf.IDatasourceManager;
import net.sf.json.JSONArray;
@@ -53,13 +56,15 @@ public class DataCollectController extends BaseController {
    private AdapterSchemeService adapterSchemeService;
    /**************************** 任务管理 ************************************************/
    /****************************
     * 任务管理
     ************************************************/
    /*
    任务配置
     */
    @RequestMapping("configJob")
    public String configJob(Model model) {
        model.addAttribute("contentPage","/datacollect/configJob");
        model.addAttribute("contentPage", "/datacollect/configJob");
        return "partView";
    }
@@ -67,7 +72,7 @@ public class DataCollectController extends BaseController {
    任务新增/编辑
     */
    @RequestMapping("editorJob")
    public String editorJob(Model model,String jobId) {
    public String editorJob(Model model, String jobId) {
        try {
            //是否编辑
            if (jobId != null && jobId.length() > 0) {
@@ -81,13 +86,11 @@ public class DataCollectController extends BaseController {
            //获取方案列表
            List data = stdService.getSchemeVersion();
            JSONArray jsonArray = JSONArray.fromObject(data);
            model.addAttribute("schemeList", "{\"detailModelList\":"+(CollectionUtil.isEmpty(data)?"[]":jsonArray)+"}");
            model.addAttribute("schemeList", "{\"detailModelList\":" + (CollectionUtil.isEmpty(data) ? "[]" : jsonArray) + "}");
            model.addAttribute("contentPage", "/datacollect/editorJob");
            return "pageView";
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            model.addAttribute("contentPage", "/datacollect/editorJob");
            return "pageView";
        }
@@ -98,14 +101,12 @@ public class DataCollectController extends BaseController {
    */
    @RequestMapping("getJob")
    @ResponseBody
    public Result getJob(String name,int page, int rows){
    public Result getJob(String name, int page, int rows) {
        try {
            Map<String, Object> map = new HashMap<>();
            map.put("name", name);
            return datacollect.getJobList(map, page, rows);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -115,12 +116,10 @@ public class DataCollectController extends BaseController {
     */
    @RequestMapping("getSchemeDataset")
    @ResponseBody
    public Result getSchemeDataset(String schemeId,String schemeVersion,String jobId){
        try{
            return datacollect.getSchemeDataset(schemeId,schemeVersion, jobId);
        }
        catch (Exception ex)
        {
    public Result getSchemeDataset(String schemeId, String schemeVersion, String jobId) {
        try {
            return datacollect.getSchemeDataset(schemeId, schemeVersion, jobId);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -130,12 +129,10 @@ public class DataCollectController extends BaseController {
     */
    @RequestMapping("getSchemeDatasetCol")
    @ResponseBody
    public Result getSchemeDatasetCol(String schemeId,String schemeVersion,String datasetId){
        try{
    public Result getSchemeDatasetCol(String schemeId, String schemeVersion, String datasetId) {
        try {
            return datacollect.getSchemeDatasetCol(schemeId, schemeVersion, datasetId);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -153,10 +150,8 @@ public class DataCollectController extends BaseController {
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            return datacollect.addJob(obj,cron,jobDataset);
        }
        catch (Exception ex)
        {
            return datacollect.addJob(obj, cron, jobDataset);
        } catch (Exception ex) {
            return Result.error("新增任务失败！");
        }
    }
@@ -174,10 +169,8 @@ public class DataCollectController extends BaseController {
            String cron = request.getParameter("cronExpression");
            String jobDataset = request.getParameter("jobDataset");
            return datacollect.updateJob(obj, cron,jobDataset);
        }
        catch (Exception ex)
        {
            return datacollect.updateJob(obj, cron, jobDataset);
        } catch (Exception ex) {
            return Result.error("修改任务失败！");
        }
    }
@@ -187,12 +180,10 @@ public class DataCollectController extends BaseController {
   */
    @RequestMapping("validJob")
    @ResponseBody
    public Result validJob(String jobId,String valid) {
    public Result validJob(String jobId, String valid) {
        try {
            return datacollect.validJob(jobId, valid);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -205,57 +196,51 @@ public class DataCollectController extends BaseController {
    public Result deleteJob(String jobId) {
        try {
            return datacollect.deleteJob(jobId);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 获取任务信息
     *
     * @return
     */
    @RequestMapping("getJobInfo")
    @ResponseBody
    public Result getJobInfo(String jobId)
    {
    public Result getJobInfo(String jobId) {
        try {
            RsJobConfig job = datacollect.getJobById(jobId);
            if(job!=null)
            {
                ActionResult re = new ActionResult(true,"");
            if (job != null) {
                ActionResult re = new ActionResult(true, "");
                re.setData(job.getValid());
                return re;
            } else {
                return new ActionResult(false, "非法操作！");
            }
            else{
                return new ActionResult(false,"非法操作！");
            }
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 根据任务Id获取相关数据集下拉数据
     *
     * @return
     */
    @RequestMapping("getJobDatasetByJobId")
    @ResponseBody
    public Result getJobDatasetByJobId(String jobId)
    {
    public Result getJobDatasetByJobId(String jobId) {
        try {
            return datacollect.getJobDatasetByJobId(jobId);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /************************* 数据集--数据源管理 ******************************************/
    /*************************
     * 数据集--数据源管理
     ******************************************/
    /*
    数据集配置
     */
@@ -270,9 +255,7 @@ public class DataCollectController extends BaseController {
            model.addAttribute("contentPage", "/datacollect/configDataset");
            return "partView";
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            model.addAttribute("contentPage", "error");
            return "partView";
        }
@@ -280,6 +263,7 @@ public class DataCollectController extends BaseController {
    /**
     * 数据集数据源管理列表（包含全部数据集）
     *
     * @return
     */
    @RequestMapping("getDatasetSource")
@@ -287,26 +271,23 @@ public class DataCollectController extends BaseController {
    public Result getDatasetSource(String stdVersion) {
        try {
            return datacollect.getDatasetSource(stdVersion);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 更新数据集数据源
     *
     * @return
     */
    @RequestMapping("saveDatasetSource")
    @ResponseBody
    public Result saveDatasetSource(String stdVersion,String json){
    public Result saveDatasetSource(String stdVersion, String json) {
        try {
            return datacollect.saveDatasetSource(json);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -315,19 +296,18 @@ public class DataCollectController extends BaseController {
    /*************************** 任务执行 ************************************************/
    /**
     * 执行任务
     *
     * @return
     */
    @RequestMapping("executeJob")
    @ResponseBody
    public Result executeJob(String jobId){
    public Result executeJob(String jobId) {
        try {
            datacollectService.executeJob(jobId);
            return Result.success("处理完成！");
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
    }
        }
    }
@@ -335,36 +315,30 @@ public class DataCollectController extends BaseController {
    任务补采界面
     */
    @RequestMapping("repeatDatacollect")
    public String repeatDatacollect(Model model,String jobId,String jobDatasetId,String jobStatus,String jobTimeFrom,String jobTimeTo) {
    public String repeatDatacollect(Model model, String jobId, String jobDatasetId, String jobStatus, String jobTimeFrom, String jobTimeTo) {
        try {
            model.addAttribute("jobId", jobId==null?"":jobId);
            model.addAttribute("jobDatasetId", jobDatasetId==null?"":jobDatasetId);
            model.addAttribute("jobStatus", jobStatus==null?"":jobStatus);
            if(jobTimeFrom!=null&&jobTimeFrom.length()>0)
            {
            model.addAttribute("jobId", jobId == null ? "" : jobId);
            model.addAttribute("jobDatasetId", jobDatasetId == null ? "" : jobDatasetId);
            model.addAttribute("jobStatus", jobStatus == null ? "" : jobStatus);
            if (jobTimeFrom != null && jobTimeFrom.length() > 0) {
                Date timeFrom = DateConvert.toDate(jobTimeFrom);
                model.addAttribute("jobTimeFrom", DateConvert.toString(timeFrom));
            }
            else{
                GregorianCalendar gc=new GregorianCalendar();
            } else {
                GregorianCalendar gc = new GregorianCalendar();
                gc.setTime(new Date());
                gc.add(5, -7);
                model.addAttribute("jobTimeFrom", DateConvert.toString(gc.getTime()));
            }
            if(jobTimeTo!=null&&jobTimeTo.length()>0)
            {
            if (jobTimeTo != null && jobTimeTo.length() > 0) {
                Date timeTo = DateConvert.toDate(jobTimeTo);
                model.addAttribute("jobTimeTo", DateConvert.toString(timeTo));
            }
            else{
            } else {
                model.addAttribute("jobTimeTo", DateConvert.toString(new Date()));
            }
            model.addAttribute("contentPage", "/datacollect/repeatDatacollect");
            return "partView";
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            model.addAttribute("contentPage", "error");
            return "partView";
        }
@@ -372,64 +346,55 @@ public class DataCollectController extends BaseController {
    /**
     * 任务详细日志列表
     *
     * @return
     */
    @RequestMapping("getJobLogDetail")
    @ResponseBody
    public Result getJobLogDetail(String jobId,String jobDatasetId,String jobStatus,String jobTimeFrom,String jobTimeTo,int page, int rows){
    public Result getJobLogDetail(String jobId, String jobDatasetId, String jobStatus, String jobTimeFrom, String jobTimeTo, int page, int rows) {
        try {
            Map<String, Object> conditionMap = new HashMap<String, Object>();
            conditionMap.put("jobId",jobId);
            conditionMap.put("jobDatasetId",jobDatasetId);
            conditionMap.put("jobStatus",jobStatus);
            conditionMap.put("jobTimeFrom",jobTimeFrom);
            conditionMap.put("jobId", jobId);
            conditionMap.put("jobDatasetId", jobDatasetId);
            conditionMap.put("jobStatus", jobStatus);
            conditionMap.put("jobTimeFrom", jobTimeFrom);
            conditionMap.put("jobTimeTo", jobTimeTo);
            return datacollect.getJobLogDetail(conditionMap,page,rows);
        }
        catch (Exception ex)
        {
            return datacollect.getJobLogDetail(conditionMap, page, rows);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 补采数据
     *
     * @return
     */
    @RequestMapping("repeat")
    @ResponseBody
    public Result repeat(String ids){
    public Result repeat(String ids) {
        try {
            if(ids.length()>0)
            {
            if (ids.length() > 0) {
                String[] logId = ids.split(",");
                if(logId.length==1)
                {
                if (logId.length == 1) {
                    return datacollectService.repeatJob(ids);
                }
                else {
                } else {
                    StringBuilder str = new StringBuilder();
                    for(String id:logId)
                    {
                    for (String id : logId) {
                        ActionResult re = datacollectService.repeatJob(id);
                        if(re.isSuccessFlg())
                        {
                            str.append(id+"补采成功！\n");
                        }
                        else{
                            str.append(id+"补采失败！\n");
                        if (re.isSuccessFlg()) {
                            str.append(id + "补采成功！\n");
                        } else {
                            str.append(id + "补采失败！\n");
                        }
                    }
                    return Result.success(str.toString());
                }
            }
            else{
            } else {
                return Result.error("非法操作！");
            }
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -437,16 +402,15 @@ public class DataCollectController extends BaseController {
    /*************************** 任务跟踪 ***********************************/
    /**
     * 任务跟踪界面
     *
     * @return
     */
    @RequestMapping("trackJob")
    public String trackJob(Model model,String jobId) {
        try{
    public String trackJob(Model model, String jobId) {
        try {
            model.addAttribute("contentPage", "/datacollect/trackJob");
            return "pageView";
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            model.addAttribute("contentPage", "error");
            return "partView";
        }
@@ -454,34 +418,32 @@ public class DataCollectController extends BaseController {
    /**
     * 任务日志列表
     *
     * @return
     */
    @RequestMapping("getJobLog")
    @ResponseBody
    public Result getJobLog(String jobId,int page, int rows){
    public Result getJobLog(String jobId, int page, int rows) {
        try {
            Map<String, Object> conditionMap = new HashMap<String, Object>();
            conditionMap.put("jobId",jobId);
            return datacollect.getJobLog(conditionMap,page,rows);
        }
        catch (Exception ex)
        {
            conditionMap.put("jobId", jobId);
            return datacollect.getJobLog(conditionMap, page, rows);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
    /**
     * 任务详细根据数据集分组
     *
     * @return
     */
    @RequestMapping("getJobLogDataset")
    @ResponseBody
    public Result getJobLogDataset(String logId){
    public Result getJobLogDataset(String logId) {
        try {
            return datacollect.getJobLogDataset(logId);
        }
        catch (Exception ex)
        {
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
@@ -491,27 +453,10 @@ public class DataCollectController extends BaseController {
     */
    @RequestMapping("jobLayout")
    public String jobLayout(Model model) {
        model.addAttribute("contentPage","/datacollect/jobLayout");
        model.addAttribute("contentPage", "/datacollect/jobLayout");
        return "partView";
    }
    /*
   任务编排数据映射
    */
    @RequestMapping("jobDataMapping")
    public String jobDataMapping(Model model,String jobId) {
        try {
            model.addAttribute("contentPage", "/datacollect/dataMapping");
            return "pageView";
        }
        catch (Exception ex)
        {
            model.addAttribute("contentPage", "/datacollect/dataMapping");
            return "pageView";
        }
    }
    @RequestMapping("getJobLayout")
    @ResponseBody
    public List<SchemeResultDetailModel> getJobLayout() {
@@ -563,7 +508,7 @@ public class DataCollectController extends BaseController {
    public List getSchemeDataSets(
            @RequestParam(value = "schemeId", required = true) Integer schemeId,
            @RequestParam(value = "version", required = true) String version
    ) {
            ) {
        try {
            return adapterSchemeService.getAdapterDataSets(schemeId,version);
        } catch (Exception ex) {
@@ -613,4 +558,19 @@ public class DataCollectController extends BaseController {
        }
    }
    /*
   任务编排数据映射
    */
    @RequestMapping("jobDataMapping")
    public String jobDataMapping(Model model, String jobId) {
        try {
            model.addAttribute("contentPage", "/datacollect/dataMapping");
            return "pageView";
        } catch (Exception ex) {
            model.addAttribute("contentPage", "/datacollect/dataMapping");
            return "pageView";
        }
    }
}

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

@@ -52,4 +52,31 @@ public class AdapterPlanController extends BaseController {
        return "partView";
    }
    @RequestMapping("updateDataset")
    public String updateDataset(Model model) {
        model.addAttribute("contentPage", "standard/adapterplan/dataset/updateDataset");
        return "pageView";
    }
    @RequestMapping("updateMetadata")
    public String updateMetadata(Model model) {
        model.addAttribute("contentPage", "standard/adapterplan/dataset/updateMetadata");
        return "pageView";
    }
    @RequestMapping("updateDict")
    public String updatedict(Model model) {
        model.addAttribute("contentPage", "standard/adapterplan/dict/updateDict");
        return "pageView";
    }
    @RequestMapping("updateDictItem")
    public String updatedictitem(Model model) {
        model.addAttribute("contentPage", "standard/adapterplan/dict/updateDictItem");
        return "pageView";
    }
}

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

@@ -30,7 +30,7 @@ public class StandardController extends BaseController {
     * @throws Exception
     */
    @RequestMapping("/searchStandard")
    @ApiOperation(value = "获取标准列表", response = DetailModelResult.class, responseContainer = "List", notes = "获取标准列表")
    @ApiOperation(value = "获取标准树列表", response = DetailModelResult.class, responseContainer = "List", notes = "获取标准列表")
    public DetailModelResult searchStandard(
            @ApiParam(name = "condition", value = "查询条件name：厂商、标准、标准版本名称，标准类别type：0为集成标准，1为应用标准")
            @RequestParam(value = "condition", required = false) String condition) {

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

@@ -20,17 +20,8 @@ public class SchemeResultDetailModel implements Serializable {
    String version;
    Integer type;
    String date;
    List<AdapterSchemeVersionModel> versionList;
    public List<AdapterSchemeVersionModel> getVersionList() {
        return versionList;
    }
    public void setVersionList(List<AdapterSchemeVersionModel> versionList) {
        this.versionList = versionList;
    }
    public String getId() {
        return id;
    }
@@ -142,4 +133,12 @@ public class SchemeResultDetailModel implements Serializable {
    public void setAdapterStdVersion(String adapterStdVersion) {
        this.adapterStdVersion = adapterStdVersion;
    }
    public List<AdapterSchemeVersionModel> getVersionList() {
        return versionList;
    }
    public void setVersionList(List<AdapterSchemeVersionModel> versionList) {
        this.versionList = versionList;
    }
}

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

@@ -428,10 +428,10 @@ public class AdapterDatasetService extends SQLGeneralDAO {
        return sql.toString();
    }
    public List getAdapterDatasetNotNullList(Class tClass, String tableName, String condition) {
    public List getAdapterDatasetNotNullList(AdapterVersion adapterVersion, String condition) {
        try {
            StringBuffer sql = new StringBuffer();
            sql.append("SELECT * FROM ").append(tableName);
            sql.append("SELECT * FROM ").append(adapterVersion.getDataSetTableName());
            ObjectMapper objectMapper = new ObjectMapper();
            if (!StringUtil.isEmpty(condition)) {
                JsonNode jsonNode = objectMapper.readTree(condition);
@@ -439,7 +439,23 @@ public class AdapterDatasetService extends SQLGeneralDAO {
                sql.append(" WHERE ").append(column).append(" IS NOT NULL");
            }
            Query query = getCurrentSession().createSQLQuery(sql.toString());
            query.setResultTransformer(new BeanTransformer(tClass));
            query.setResultTransformer(new BeanTransformer(AdapterDatasetModel.class));
            return query.list();
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }
    public List getListByAdapterDatasetIdList(AdapterVersion adapterVersion, List<Integer> datasetIdList) {
        try {
            if (CollectionUtil.isEmpty(datasetIdList)) {
                return null;
            }
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
            sqlCreator.inCondition("adapterDatasetId", datasetIdList);
            String sql = sqlCreator.selectData(adapterVersion.getDataSetTableName());
            Query query = getQuery(sqlCreator, sql);
            return query.list();
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -2,11 +2,13 @@ package com.yihu.ehr.standard.service.adapter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.crawler.model.flow.CrawlerDataSetModel;
import com.yihu.ehr.crawler.model.flow.CrawlerFlowHeadModel;
import com.yihu.ehr.crawler.model.flow.CrawlerFlowModel;
import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.constrant.Constants;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.DataGridResult;
import com.yihu.ehr.framework.model.DetailModelResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.operator.CollectionUtil;
@@ -309,6 +311,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
    /**
     * 新增或修改
     *
     * @param json
     * @return
     * @throws Exception
@@ -334,34 +337,36 @@ public class AdapterSchemeService extends SQLGeneralDAO {
    /**
     * 根据适配版本 获取数据集列表
     *
     * @param schemeId
     * @param version
     * @return
     */
    public List<AdapterDatasetModel> getAdapterDataSets(Integer schemeId,String version){
        List<AdapterDatasetModel> list=new ArrayList<>();
    public List<AdapterDatasetModel> getAdapterDataSets(Integer schemeId, String version) {
        List<AdapterDatasetModel> list = new ArrayList<>();
        String adapterVersionHql = "FROM AdapterSchemeVersionModel WHERE schemeId = :schemeId and version = :version";
        Query query = getCurrentSession().createQuery(adapterVersionHql);
        query.setParameter("schemeId", schemeId);
        query.setParameter("version", version);
        AdapterSchemeVersionModel versionModel =(AdapterSchemeVersionModel) query.uniqueResult();
        String tableName="adapter_dataset_"+versionModel.getVersion();
        String adapterDataSetSql = "select * FROM "+tableName+" WHERE scheme_id = :schemeId";
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) query.uniqueResult();
        String tableName = "adapter_dataset_" + versionModel.getVersion();
        String adapterDataSetSql = "select * FROM " + tableName + " WHERE scheme_id = :schemeId";
        Query dataSetQuery = getCurrentSession().createSQLQuery(adapterDataSetSql).addEntity(AdapterDatasetModel.class);
        dataSetQuery.setParameter("schemeId", schemeId);
        List<AdapterDatasetModel> adapterDataSet=dataSetQuery.list();
        List<AdapterDatasetModel> adapterDataSet = dataSetQuery.list();
        return adapterDataSet;
    }
    /**
     * 保存编排映射关系
     *
     * @param schemeId 适配方案ID
     * @param version 适配方案版本
     * @param json  映射数据
     * @param version  适配方案版本
     * @param json     映射数据
     * @return
     * @throws Exception
     */
    public ActionResult saveDataSetRelation(Integer schemeId,String version,String json) throws Exception {
    public ActionResult saveDataSetRelation(Integer schemeId, String version, String json) throws Exception {
        JSONObject root = JSONObject.fromObject(json);
        JSONArray jsonList = root.getJSONArray("lines");
        JSONArray entrances = root.getJSONArray("entrances");
@@ -369,7 +374,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
        Query query = getCurrentSession().createQuery(adapterVersionHql);
        query.setParameter("schemeId", schemeId);
        query.setParameter("version", version);
        AdapterSchemeVersionModel versionModel =(AdapterSchemeVersionModel) query.uniqueResult();
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) query.uniqueResult();
        for (Object item : jsonList) {
            JSONObject obj = JSONObject.fromObject(item);
            String from = obj.getString("from");
@@ -377,7 +382,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
            String fromPort = obj.getString("fromPort");
            String toPort = obj.getString("toPort");
            //TODO 保存编排关系
            CrawlerFlowModel crawlerFlow=new CrawlerFlowModel();
            CrawlerFlowModel crawlerFlow = new CrawlerFlowModel();
            crawlerFlow.setDatasetCode(to);
            crawlerFlow.setInputDatasetCode(from);
            crawlerFlow.setMetadataCode(toPort);
@@ -391,7 +396,7 @@ public class AdapterSchemeService extends SQLGeneralDAO {
            String dataSet = obj.getString("dataSet");
            String meta = obj.getString("meta");
            //TODO  保存入口数据集
            CrawlerFlowHeadModel headModel=new CrawlerFlowHeadModel();
            CrawlerFlowHeadModel headModel = new CrawlerFlowHeadModel();
            headModel.setSchemeVersionId(versionModel.getId());
            headModel.setDatasetCode(dataSet);
            headModel.setMetadataCode(meta);

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

@@ -95,7 +95,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    public Boolean standardCodeValidate(String code) {
        Map<String, String> query = new HashMap<>();
        Map<String, Object> query = new HashMap<>();
        Map<String, String> order = new HashMap<>();
        query.put("code", code);
@@ -107,7 +107,7 @@ public class StandardService extends SQLGeneralDAO {
    }
    public Boolean standardNameValidate(String name) {
        Map<String, String> query = new HashMap<>();
        Map<String, Object> query = new HashMap<>();
        Map<String, String> order = new HashMap<>();
        query.put("name", name);
@@ -362,15 +362,14 @@ public class StandardService extends SQLGeneralDAO {
        for (StandardModel standardModel : standardModelList) {
            idList.add(standardModel.getId());
        }
        if (CollectionUtil.isEmpty(idList)) {
            idList.add(null);
        List<StandardVersionModel> versionModelList = new ArrayList<>();
        if (!CollectionUtil.isEmpty(idList)) {
            String versionHql = "FROM StandardVersionModel WHERE standardId IN :idList";
            Query query = getCurrentSession().createQuery(versionHql);
            query.setParameterList("idList", idList);
            versionModelList = query.list();
        }
        String versionHql = "FROM StandardVersionModel WHERE standardId IN :idList";
        Query query = getCurrentSession().createQuery(versionHql);
        query.setParameterList("idList", idList);
        List<StandardVersionModel> versionModelList = query.list();
        List<StandardResultDetailModel> resultDetailModelList = getStandardListFormat(publisherModelList,
                                                                                        standardModelList,
                                                                                        versionModelList,
@@ -408,13 +407,13 @@ public class StandardService extends SQLGeneralDAO {
        saveEntity(standardModel);
    }
    private List<StandardModel> getList(Map<String, String> query, Map<String, String> order, Integer limit, Integer offset) {
    private List<StandardModel> getList(Map<String, Object> query, Map<String, String> order, Integer limit, Integer offset) {
        Session session = getCurrentSession();
        Criteria criteria = session.createCriteria(StandardModel.class);
        for (String key : query.keySet()) {
            if (key.equals("type")) {
                Integer type = Integer.parseInt(query.get(key));
                Integer type = (Integer) query.get(key);
                String code = getStandardParam(Constants.STANDARD).getCode();
                if (type == 0) {
                    criteria.add(Restrictions.eq("code", code));

Hos-resource/src/main/resources/config/http.properties

@@ -9,5 +9,5 @@ sslPassword = 123456
clientId = 1FtXTrSL8D
clientKey = MUZ0WFRyU0w4RDp1c3ZOeWxWc0ZvdFVlQ2tE
httpGateway=http://localhost:8890/gateway/transfer
httpGateway=http://192.168.131.6:8081/gateway/transfer

Hos-resource/src/main/resources/config/sys.config.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
    <!--<temp_file>D:\temp</temp_file>-->
    <temp_file>D:\temp</temp_file>
    <event_no>
        <item>HDSD03_01_031</item>
        <item>HDSD00_01_579</item>

Hos-resource/src/main/resources/hbm/resource/CrawlerFlowHead.hbm.xml

@@ -6,13 +6,8 @@
        <composite-id>
            <key-property name="schemeVersionId" column="scheme_version_id"/>
            <key-property name="datasetCode" column="dataset_code"/>
            <key-property name="metadataCode" column="metadata_code"/>
        </composite-id>
        <property name="datasetName">
            <column name="dataset_name"/>
        </property>
        <property name="metadataCode">
            <column name="metadata_code"/>
        </property>
        <property name="identityCode">
            <column name="identity_code"/>
        </property>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/dataMapping.jsp

@@ -1,13 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script src="${contextRoot}/develop/lib/jobMapping/jquery-1.9.1.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/draggabilly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/fabric.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/sly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/underscore.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/data.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/tableViewer.js"></script>
<style id="style-1-cropbar-clipper">
    .table { width: 100%; max-width: 100%; margin-bottom: 20px; }
@@ -34,7 +27,7 @@
<!--footer start-->
<div class="m-form-bottom" style="z-index: 30">
    <div id="btn_cancel" class="l-button l-button-no">
    <div id="btn_close" class="l-button l-button-no">
        <span>关闭</span>
    </div>
    <div id="btn_save" class="l-button">
@@ -44,5 +37,5 @@
<!--end footer-->
<script>
    $('#main').tableViewer(remoteData);
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/dataMappingJs.jsp

@@ -1,5 +1,24 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script src="${contextRoot}/develop/lib/jobMapping/jquery-1.9.1.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/draggabilly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/fabric.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/sly.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/underscore.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/data.js"></script>
<script src="${contextRoot}/develop/lib/jobMapping/tableViewer.js"></script>
<script>
    (function(win,$) {
        $('#main').tableViewer(remoteData);
        $("#btn_close").click(function () {
           // JSON.stringify($.TableView.curTV.getResult())
            parent.jobLayout.dialog.close();
        });
        $("#btn_save").click(function () {
        });
    })(window, jQuery);
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/jobLayoutJs.jsp

@@ -3,6 +3,12 @@
<script>
    /* ************************** 全局变量定义 **************************** */
    var Util = $.Util;
    var schemeVersionList = [];
    /* *************************** 自定义模块 ***************************** */
    var jobLayout = {
        dialog:null,
@@ -12,11 +18,56 @@
            $('.m-retrieve-area').show();
            $.ajax({
                url: '${contextRoot}/datacollect/getJobLayout',
                type: "get",
                dataType: "json",
                success: function (data) {
                    debugger
                    if(!Util.isStrEmpty(data)){
                        schemeVersionList = data || [];
                    }else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error: function (jqXHR, textStatus, errorThrown) {
                    $.ligerDialog.error("获取适配方案版本列表失败！")
                }
            });
            me.grid = $("#div_grid").ligerGrid({
                url: '${contextRoot}/datacollect/getJob',
//                usePager: false,
                columns: [
                    {display:'适配方案',name:'schemeAndVersion', width: '20%'},
                    {display:'版本',name:'jobPlan',width: '20%'},
                    {display:'适配方案',name:'schemeAndVersion', width: '20%',render: function (row, rowindex, value, column) {
                        debugger
                        var select= '<select class="sel-scheme-id form-control"  id="schemeId'+rowindex+'" style="margin-top:3px;font-size:12px;"><option value="">请选择</option>';
                        for(var i=0;i<schemeVersionList.length;i++){
                            select+='<option value="'+schemeVersionList[i].id+'">'+schemeVersionList[i].name+'</option>';
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'版本',name:'jobPlan',width: '20%',render: function (row, rowindex, value, column) {
                        debugger
                        var select= '<select class="sel-version-id form-control"  id="versionId'+rowindex+'" style="margin-top:3px;font-size:12px;"><option value="">请选择</option>';
                        var versionList = [];
                        for(var i=0;i<schemeVersionList.length;i++){
                            versionList = schemeVersionList[i].versionList;
                            for(var j=0;j<versionList.length;j++){
                                select+='<option value="'+versionList[j].id+'">'+versionList[j].name+'</option>';
                            }
                        }
                        select = $(select+"</select>");
                        $('option[value="'+row.schemeId+'"]',select).attr('selected',true);
                        return  select.prop("outerHTML");
                    }},
                    {display:'数据集名称',name:'jobDataset', width: '40%'},
                    {display:'操作', name: 'operator', width: '20%', render: function (row) {
                        var html = '<div class="m-inline-buttons" style="width:55px;">';
@@ -25,8 +76,22 @@
                        return html;
                    }}
                ],
                onDblClickRow : function (row){
                    me.editor(row.id);
                onAfterShowData: function (gridData) {//显示完数据事件
                    //【应用数据元编码】change事件
                    $(".sel-scheme-id").on("change", function(event,msg) {
                        var rowIndex = $(this).attr("id").replace("orgId","");
                        var option = '<option value="">请选择</option>';
                        for(var i=0;i<datasourceList.length;i++){
                            if(datasourceList[i].orgId==$(this).val()){
                                option+='<option value="'+datasourceList[i].id+'">'+datasourceList[i].name+'</option>';
                            }
                        }
                        $("#datasourceId"+rowIndex).html("");
                        $("#datasourceId"+rowIndex).append(option);
                    });
                }
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetail.jsp

@@ -12,45 +12,45 @@
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control ">
      <input type="text" class="required f-w240 " id="txt_name" name="name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" name="name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>适配方案说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_description" name="txb_description" style="width: 240px;height: 60px;" name="description"  data-attr-scan="description"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_description" name="txb_description" style="width: 240px;height: 60px;" name="description"  data-attr-scan="description"  class="useTitle f-pl5"></textarea>
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_stdId">
    <label><span class="red">*&nbsp;</span>平台标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
      <input type="text" class="required f-w240 f-pl5" id="sel_stdId" data-type="select" name="stdId" data-attr-scan="stdId">
    </div>
  </div>
  <div class="m-form-group" id="div_stdVersion">
    <label><span class="red">*&nbsp;</span>平台标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
      <input type="text" class="required f-w240 f-pl5" id="sel_stdVersion" data-type="select" name="stdVersion" data-attr-scan="stdVersion" >
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>发布机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
      <input type="text" class="required f-w240 f-pl5" id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdId">
    <label><span class="red">*&nbsp;</span>应用标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdId" data-type="select" name="adapterStdId" data-attr-scan="adapterStdId">
    </div>
  </div>
  <div class="m-form-group" id="div_adapterStdVersion">
    <label><span class="red">*&nbsp;</span>应用标准版本：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 " id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
      <input type="text" class="required f-w240 f-pl5" id="sel_adapterStdVersion" data-type="select" name="adapterStdVersion" data-attr-scan="adapterStdVersion">
    </div>
  </div>
  <div class="m-form-bottom">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetailJs.jsp

@@ -141,7 +141,7 @@
            var standardId = $("#sel_stdId").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(standardId)){
              //平台标准版本
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId ,
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId+"&condition="+JSON.stringify({"publishStatus":1}) ,
                cancelable:false,
                onSuccess:function(data){
@@ -194,10 +194,10 @@
            var standardId = $("#sel_adapterStdId").ligerGetComboBoxManager().getValue();
            //应用标准版本
            if(!Util.isStrEmpty(standardId)){
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId ,
              $("#sel_adapterStdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions?standardId="+standardId +"&condition="+JSON.stringify({"publishStatus":1}) ,
                cancelable:false,
                onSuccess:function(data){
                  
                  if( $("#sel_adapterStdVersion").val()=="" &&data!=null&&data.length>0)
                  {
                    this.selectValue(data[0].code);

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/versionDetail.jsp

@@ -11,19 +11,19 @@
  <div class="m-form-group">
    <label>适配方案名称：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="txt_schemeNm" style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5" id="txt_schemeNm" style="text-align: left"/>
    </div>
  </div>
  <div class="m-form-group">
    <label><span class="red">*&nbsp;</span>适配版本名称：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="required f-w240 " id="txt_versionNm" name="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_versionNm" name="name">
    </div>
  </div>
  <div class="m-form-group" id="div_add_baseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <input type="text" class="f-w240 " id="sel_baseVersion" data-type="select" name="baseVersion" style="text-align: left"/>
      <input type="text" class="f-w240 f-pl5" id="sel_baseVersion" data-type="select" name="baseVersion" style="text-align: left"/>
    </div>
  </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/dataset/updateDataset.jsp

@@ -18,37 +18,37 @@
  <div class="m-form-group">
    <label>数据集编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_code" data-attr-scan="code">
      <input type="text" class="required f-w240 f-pl5" id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>数据源名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group">
    <label>语言：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_language" data-attr-scan="language">
      <input type="text" class="f-w240 f-pl5" id="txt_language" data-attr-scan="language">
    </div>
  </div>
  <div class="m-form-group" style="display: none;">
    <label>类别/业务领域：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_catalog" ><!--data-attr-scan="catalog"-->
      <input type="text" class="f-w240 f-pl5" id="txt_catalog" ><!--data-attr-scan="catalog"-->
    </div>
  </div>
  <div class="m-form-group">
    <label>分类模式：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_classModel" data-attr-scan="classModel">
      <input type="text" class="f-w240 f-pl5" id="txt_classModel" data-attr-scan="classModel">
    </div>
  </div>
  <div class="m-form-group">
    <label>摘要：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_summary" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_summary" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="useTitle f-pl5"></textarea>
    </div>
  </div>
  <div class="m-form-bottom">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/dataset/updateMetadata.jsp

@@ -18,7 +18,7 @@
          <label>数据元名称:</label>
        </td>
        <td class="btn-isnull td-left">
          <input id="inp_name" class="required useTitle ajax max-length-128 validate-special-char" style="width: 240px;" required-title=
          <input id="inp_name" class="required useTitle ajax max-length-128 validate-special-char f-pl5" style="width: 240px;" required-title=
          <spring:message code="lbl.must.input"/>
                  data-attr-scan="name"/>
        </td>
@@ -26,7 +26,7 @@
          <label>数据类型:</label>
        </td>
        <td class="td-left">
          <input id="inp_type" class="max-length-255 validate-special-char" style="width: 240px;" data-attr-scan="type"/>
          <input id="inp_type" class="max-length-255 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="type"/>
        </td>
      </tr>
      <tr>
@@ -34,7 +34,7 @@
          <label>数据元编码:</label>
        </td>
        <td class="btn-isnull td-left">
          <input id="inp_code" class="required useTitle max-length-128 validate-special-char" style="width: 240px;" required-title=
          <input id="inp_code" class="required useTitle max-length-128 validate-special-char f-pl5" style="width: 240px;" required-title=
          <spring:message code="lbl.must.input"/> data-attr-scan="code"/>
        </td>
@@ -42,7 +42,7 @@
          <label>数据格式:</label>
        </td>
        <td class="td-left">
          <input id="inp_format" class="max-length-10 validate-special-char" style="width: 240px;" data-attr-scan="format"/>
          <input id="inp_format" class="max-length-10 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="format"/>
        </td>
      </tr>
      <tr>
@@ -50,13 +50,13 @@
          <label>内部编码:</label>
        </td>
        <td class="btn-isnull td-left">
          <input type="text" id="inp_deCode" class="required validate-special-char" style="width: 240px;" data-attr-scan="deCode"/>
          <input type="text" id="inp_deCode" class="required validate-special-char f-pl5" style="width: 240px;" data-attr-scan="deCode"/>
        </td>
        <td>
          <label>对应字典:</label>
        </td>
        <td class="td-left">
          <input id="sel_dict" type="hidden" class="max-length-50 validate-special-char" style="width: 240px;" data-attr-scan="dictId" data-type="select"/>
          <input id="sel_dict" type="hidden" class="max-length-50 validate-special-char f-pl5" style="width: 240px;" data-attr-scan="dictId" data-type="select"/>
        </td>
      </tr>
      <tr>
@@ -64,7 +64,7 @@
          <label>定义:</label>
        </td>
        <td colspan="3" class="td-left">
                        <textarea id="tea_definition" class="metaDataExplain max-length-255 validate-special-char" style=" width: 583px;"
                        <textarea id="tea_definition" class="metaDataExplain max-length-255 validate-special-char f-pl5" style=" width: 595px;  max-width: 595px; max-height: 120px; height: 120px;"
                                  data-attr-scan="definition"></textarea>
        </td>
      </tr>
@@ -73,13 +73,13 @@
          <label>字段名:</label>
        </td>
        <td class="btn-isnull td-left">
          <input id="inp_columnName" class="required max-length-64 validate-special-char" data-attr-scan="columnName" style="width: 240px;"/>
          <input id="inp_columnName" class="required max-length-64 validate-special-char f-pl5" data-attr-scan="columnName" style="width: 240px;"/>
        </td>
        <td>
          <label>字段长度:</label>
        </td>
        <td class="td-left">
          <input id="inp_columnLength" class="max-length-15 validate-positive-integer useTitle" data-attr-scan="columnLength" style="width: 240px;"  validate-positive-integer-title="请输入正整数" />
          <input id="inp_columnLength" class="max-length-15 validate-positive-integer useTitle f-pl5" data-attr-scan="columnLength" style="width: 240px;"  validate-positive-integer-title="请输入正整数" />
        </td>
      </tr>
      <tr>
@@ -186,7 +186,7 @@
            <label>定义:</label>
          </td>
          <td colspan="3" class="td-left">
            <textarea id="see_definition"  class="metaDataExplain" style=" width: 583px;border: 0;padding-left:30px;"></textarea>
            <textarea id="see_definition"  class="metaDataExplain" readonly="readonly" style="width: 595px; border: 0px;outline: none;resize: none; padding-left: 30px; max-width: 595px; max-height: 120px; margin: 0px; height: 120px;"></textarea>
          </td>
        </tr>
        <tr style="border-top: 1px solid #ccc;">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/dataset/updateMetadataJs.jsp

@@ -44,6 +44,7 @@
                data: {datasetId: datasetId,stdVersion:version,metadataId:metadataId},
                success: function (data) {
                  if(data.successFlg){
                    debugger
                    if(type=="modify"){//修改数据元信息
                      u.$type_form.attrScan();
                      u.$type_form.Fields.fillValues({

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/indexJs.jsp

@@ -44,7 +44,7 @@
          display: '操作', isSort: false, width: '20%', align: 'center', render: function (rowdata, rowindex, value) {
          var html = '<div class="m-inline-buttons" style="width:200px;">';
          if(rowdata.type=="0"){//行数据为机构数据
              html += '<a href="#" style=\"width: 80px;\"id="btn_add_std" onclick="standard.list.add(\'\',\'\',\'\',\'\')">新增标准</a>';
              html += '<a href="#" style="width: 80px;"onclick="standard.list.add(\'\',\'\',\'\', \'\')">新增标准</a>';
          }
          else if(rowdata.type=="1"){//行数据为标准数据
              html += '<a href="#" style="width: 80px;" onclick="standard.list.addVersion(\''+rowdata.id+'\',\''+rowdata.name+'\',\''+rowdata.code+'\',\''+rowindex+'\',\'0\')">新增版本</a>';
@@ -130,9 +130,7 @@
          onError: function (a, b) {
          },
          onAfterShowData: function (data) {
             if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0){//机构下已有标准数据，则”新增标准“按钮隐藏
                  $("#btn_add_std").hide();
             }
          }
        });
@@ -155,7 +153,10 @@
      });
    },
    add: function (id,name,description, type) {
      
        if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0){//机构下已有标准数据，则”新增标准“按钮隐藏
          $.ligerDialog.error("当前已有集成标准，无法新增！");
          return false;
       }
      var _tital = type=="modify"?"修改标准":"新增标准";
      var _url = type=="modify"?standard.list._url + "/integration/standardUpdate?type=modify&typeFlg=0&standardId="+id:standard.list._url + "/integration/standardUpdate?typeFlg=0";
      var callback = function () {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/standardDetail.jsp

@@ -12,43 +12,43 @@
  <div class="m-form-group">
    <label>发布机构：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 " id="lbl_publisher" data-align="left" style="text-align: left"></label>
      <label type="text" class="f-w240" id="lbl_publisher" data-align="left" style="text-align: left"></label>
    </div>
  </div>
  <div class="m-form-group">
    <label>发布机构代码：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240" id="lbl_publisherOrgCode" style="text-align: left"></label>
      <label type="text" class="f-w240 f-pl5" id="lbl_publisherOrgCode" style="text-align: left"></label>
    </div>
  </div>
  <div class="m-form-group">
    <label>标准名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group" id="div_code">
    <label>标准编码：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_code" data-attr-scan="code">
      <input type="text" class="required f-w240 f-pl5" id="txt_code" data-attr-scan="code">
    </div>
  </div>
  <div class="m-form-group">
    <label>参考标准：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_refStandard" data-attr-scan="refStandard">
      <input type="text" class="f-w240 f-pl5" id="txt_refStandard" data-attr-scan="refStandard">
    </div>
  </div>
  <div class="m-form-group">
    <label>参考标准版本：</label>
    <div class="l-text-wrapper m-form-control">
      <input type="text" class="f-w240 " id="txt_refStandardVersion" data-attr-scan="refStandardVersion">
      <input type="text" class="f-w240 f-pl5" id="txt_refStandardVersion" data-attr-scan="refStandardVersion">
    </div>
  </div>
  <div class="m-form-group">
    <label>标准说明：</label>
    <div class="m-form-control">
      <textarea rows="3" id="txt_summary" name="txb_desc" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="useTitle"></textarea>
      <textarea rows="3" id="txt_summary" name="txb_desc" style="width: 240px;height: 60px;" data-attr-scan="summary"  class="f-pl5 useTitle"></textarea>
    </div>
  </div>
  <div class="m-form-bottom">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/standardDetailJs.jsp

@@ -64,7 +64,7 @@
                  type: "get",
                  dataType: "json",
                  success: function (data) {
                      $("#txt_code").val(data);
                      $("#txt_code").val(data.code);
                      $("#div_code").addClass("m-form-readonly");
                  },
                  error: function (jqXHR, textStatus, errorThrown) {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/versionDetail.jsp

@@ -17,31 +17,31 @@
  <div class="m-form-group">
    <label>标准编码：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240 lbl-version" style="text-align: left" id="txt_stdcode"/>
      <label type="text" class="f-w240 lbl-version f-pl5" style="text-align: left" id="txt_stdcode"/>
    </div>
  </div>
  <div class="m-form-group">
    <label>标准版本名称：</label>
    <div class="l-text-wrapper m-form-control essential">
      <input type="text" class="required f-w240 " id="txt_name" data-attr-scan="name">
      <input type="text" class="required f-w240 f-pl5" id="txt_name" data-attr-scan="name">
    </div>
  </div>
  <div class="m-form-group" id="div_abaseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <input type="text" id="baseVersion" data-attr-scan="baseVersion">
      <input type="text" id="baseVersion" data-attr-scan="baseVersion" class="f-pl5">
    </div>
  </div>
  <div class="m-form-group" style="display: none;" id="div_baseVersion">
    <label>基础版本名称：</label>
    <div class="m-form-control">
      <label type="text" class="f-w240 " id="lbl_baseVersion" style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5" id="lbl_baseVersion" style="text-align: left"/>
    </div>
  </div>
  <div class="m-form-group" style="display: none;" id="div_publisher">
    <label>发布状态：</label>
    <div class="m-form-control">
      <label type="text" class="f-w240 lbl_publishStatus"  style="text-align: left"/>
      <label type="text" class="f-w240 f-pl5 lbl_publishStatus"  style="text-align: left"/>
    </div>
  </div>

Hos-resource/src/main/webapp/develop/lib/ligerui/plugins/customTree.js

@@ -127,7 +127,7 @@
        var toTarget = options.toTarget; //目标节点id
        var checked = options.checked;
        var fromFlagReg = new RegExp(fromFlag,"g");
        
        debugger;
        //来源树到目标树节点生成
        for (var i = 0; i < from.length; i++) {
            data = from[i].data;
@@ -251,7 +251,7 @@
     * @param options
     */
    treePrototype.f_onToTreeCheck = function (options) {
        
        debugger;
        var fromTree = options.fromTree; //来源树对象（ligerTree对象）
        var toTree = options.toTree; //目标树对象toTree
        var fromFlag = options.fromFlag; //来源树特殊标志 如：（id="std987",fromFlag="std"）

Hos-resource/src/main/webapp/develop/lib/ligerui/skins/custom/css/all.css

@@ -197,4 +197,6 @@ td.l-filter-rowlastcell{vertical-align:top;line-height:27px;}
/********* tip重写 *************/
.l-verify-tip-corner{top:12px;}
.l-verify-tip-content{line-height:30px;padding-top:0px;padding-bottom:0px;}
.l-verify-tip-content{line-height:30px;padding-top:0px;padding-bottom:0px;}
.f-pl5{padding-left: 5px;}