Przeglądaj źródła

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

yingjie 9 lat temu
rodzic
commit
86f75ef277

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

@ -402,7 +402,7 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
    public Object get(Class tClass, String tableName, Integer id) {
        SqlCreator sqlCreator = new SqlCreator(tClass);
        sqlCreator.equalCondition("stdDatasetId", id);
        sqlCreator.equalCondition("id", id);
        String sql = sqlCreator.selectData(tableName);
        Query query = getQuery(sqlCreator, sql);
        return query.uniqueResult();

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/datacollect/service/DatacollectManager.java

@ -279,7 +279,7 @@ public class DatacollectManager implements IDatacollectManager {
            obj.setCode(jsonItem.getString("adapterMetadataCode"));
            obj.setText(jsonItem.getString("adapterMetadataName"));
            obj.setType(jsonItem.getString("adapterMetadataType"));
            obj.setDict(jsonItem.getString("adapterDictId"));
            obj.setDict(jsonItem.getString("stdDictId"));
            list.add(obj);
        }

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

@ -394,8 +394,8 @@ public class AdapterMetadataService extends SQLGeneralDAO {
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("stdDatasetId", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        AdapterDatasetModel datasetModel= (AdapterDatasetModel)get(AdapterDatasetModel.class,tableName,  datasetId);
        return datasetModel;
        List<AdapterDatasetModel> datasetModel = getList(AdapterDatasetModel.class,tableName,  net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return datasetModel.get(0);
    }
    public AdapterMetadataModel getAdapterMetadata(String version, Integer adapterMetadataId) {
        try {