任务管理-任务跟踪：设置任务筛选条件 但设置的的条件为时间的时候没有弹出时间选择框 当设置筛选调教等于字典的时候不会有字典项选择框

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

@@ -267,21 +267,21 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        List<AdapterMetadataResultDetailModel> detailModelList = new ArrayList<>();
        for (AdapterMetadataModel model : metadataModelList) {
            AdapterMetadataResultDetailModel detailModel = new AdapterMetadataResultDetailModel();
            detailModel.setId(model.getId());
            detailModel.setSchemeId(model.getSchemeId());
            detailModel.setAdapterDatasetId(model.getAdapterDatasetId());
            detailModel.setAdapterDictId(model.getAdapterDictId());
            detailModel.setAdapterDataType(model.getAdapterDataType());
            detailModel.setAdapterMetadataId(model.getAdapterMetadataId());
            detailModel.setAdapterMetadataCode(model.getAdapterMetadataCode());
            detailModel.setAdapterMetadataName(model.getAdapterMetadataName());
            detailModel.setAdapterDictId(model.getAdapterDictId());
            detailModel.setStdDictId(model.getStdDictId());
            detailModel.setStdDatasetId(model.getStdDatasetId());
            detailModel.setStdMetadataCode(model.getStdMetadataCode());
            detailModel.setStdMetadataName(model.getStdMetadataName());
            if (stdMetaDataModelMap.get(model.getAdapterMetadataId()) != null) {
                AdapterMetadataResultDetailModel detailModel = new AdapterMetadataResultDetailModel();
                detailModel.setId(model.getId());
                detailModel.setSchemeId(model.getSchemeId());
                detailModel.setAdapterDatasetId(model.getAdapterDatasetId());
                detailModel.setAdapterDictId(model.getAdapterDictId());
                detailModel.setAdapterDataType(model.getAdapterDataType());
                detailModel.setAdapterMetadataId(model.getAdapterMetadataId());
                detailModel.setAdapterMetadataCode(model.getAdapterMetadataCode());
                detailModel.setAdapterMetadataName(model.getAdapterMetadataName());
                detailModel.setAdapterDictId(model.getAdapterDictId());
                detailModel.setStdDictId(model.getStdDictId());
                detailModel.setStdDatasetId(model.getStdDatasetId());
                detailModel.setStdMetadataCode(model.getStdMetadataCode());
                detailModel.setStdMetadataName(model.getStdMetadataName());
                detailModel.setAdapterMetadataType(stdMetaDataModelMap.get(model.getAdapterMetadataId()).getColumnType());
                detailModelList.add(detailModel);
            }

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

@@ -620,21 +620,25 @@
                    }
                    //判断是否设置轮询字段和字段类型
                    var selected = me.$listDataset.getSelectedRows();
                    for(var i=0;i<selected.length;i++)
                    {
                        if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                    //判断是否设置轮询字段和字段类型   档案上传不校验 @modify by cyj
                    if($('#jobContentClass').ligerComboBox("getValue")!=me.archiveUpload) {
                        var selected = me.$listDataset.getSelectedRows();
                        for(var i=0;i<selected.length;i++)
                        {
                            if(selected[i].jobDatasetKey!= undefined && selected[i].jobDatasetKey.length>0 && selected[i].jobDatasetKeytype!= undefined && selected[i].jobDatasetKeytype.length>0)
                            {
                        }
                        else{
                            $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                            return false;
                            }
                            else{
                                $.ligerDialog.error(selected[i].jobDatasetName+"未设置轮询字段！");
                                return false;
                            }
                        }
                    }
                    return true;
                }
                default :