|
@ -22,6 +22,7 @@ import com.yihu.ehr.standard.model.standard.StdDataSetModel;
|
|
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
|
|
import com.yihu.ehr.standard.model.standard.StdMetaDataModel;
|
|
import com.yihu.ehr.standard.service.bo.AdapterVersion;
|
|
import com.yihu.ehr.standard.service.bo.AdapterVersion;
|
|
import com.yihu.ehr.standard.service.bo.StandardVersion;
|
|
import com.yihu.ehr.standard.service.bo.StandardVersion;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.hibernate.Query;
|
|
import org.hibernate.Query;
|
|
import org.hibernate.Session;
|
|
import org.hibernate.Session;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@ -269,6 +270,9 @@ public class AdapterMetadataService extends SQLGeneralDAO {
|
|
|
|
|
|
List<AdapterMetadataResultDetailModel> detailModelList = new ArrayList<>();
|
|
List<AdapterMetadataResultDetailModel> detailModelList = new ArrayList<>();
|
|
for (AdapterMetadataModel model : metadataModelList) {
|
|
for (AdapterMetadataModel model : metadataModelList) {
|
|
|
|
if (StringUtils.isBlank(model.getAdapterMetadataCode()) || StringUtils.isBlank(model.getAdapterMetadataName())) {
|
|
|
|
continue;
|
|
|
|
}
|
|
AdapterMetadataResultDetailModel detailModel = new AdapterMetadataResultDetailModel();
|
|
AdapterMetadataResultDetailModel detailModel = new AdapterMetadataResultDetailModel();
|
|
detailModel.setId(model.getId());
|
|
detailModel.setId(model.getId());
|
|
detailModel.setSchemeId(model.getSchemeId());
|
|
detailModel.setSchemeId(model.getSchemeId());
|
|
@ -285,8 +289,8 @@ public class AdapterMetadataService extends SQLGeneralDAO {
|
|
detailModel.setStdMetadataName(model.getStdMetadataName());
|
|
detailModel.setStdMetadataName(model.getStdMetadataName());
|
|
if (stdMetaDataModelMap.get(model.getAdapterMetadataId()) != null) {
|
|
if (stdMetaDataModelMap.get(model.getAdapterMetadataId()) != null) {
|
|
detailModel.setAdapterMetadataType(stdMetaDataModelMap.get(model.getAdapterMetadataId()).getColumnType());
|
|
detailModel.setAdapterMetadataType(stdMetaDataModelMap.get(model.getAdapterMetadataId()).getColumnType());
|
|
detailModelList.add(detailModel);
|
|
|
|
}
|
|
}
|
|
|
|
detailModelList.add(detailModel);
|
|
}
|
|
}
|
|
return detailModelList;
|
|
return detailModelList;
|
|
}
|
|
}
|