调整了ICDCOUNT计数的逻辑,去除了重复性FCDA计数判断
This commit is contained in:
@@ -96,7 +96,7 @@ public class SclGeneratedModelReader {
|
||||
* 从 LN0 或 LN 中读取 DataSet 与 ReportControl 信息。
|
||||
*/
|
||||
private void readReportAndDataSetFromAnyLn(TAnyLN anyLn, IcdDocument document) {
|
||||
List<FcdaNode> allFcdas = new ArrayList<FcdaNode>();
|
||||
//List<FcdaNode> allFcdas = new ArrayList<FcdaNode>();
|
||||
if (anyLn.getDataSet() != null) {
|
||||
for (TDataSet dataSet : anyLn.getDataSet()) {
|
||||
DataSetNode dataSetNode = new DataSetNode();
|
||||
@@ -105,7 +105,7 @@ public class SclGeneratedModelReader {
|
||||
for (TFCDA fcda : dataSet.getFCDA()) {
|
||||
FcdaNode node = toFcdaNode(fcda);
|
||||
dataSetNode.getFcdas().add(node);
|
||||
allFcdas.add(node);
|
||||
//allFcdas.add(node);
|
||||
}
|
||||
}
|
||||
document.getDataSets().put(dataSetNode.getName(), dataSetNode);
|
||||
@@ -113,7 +113,7 @@ public class SclGeneratedModelReader {
|
||||
}
|
||||
for (DataSetNode dataSet : document.getDataSets().values()) {
|
||||
for (FcdaNode fcda : dataSet.getFcdas()) {
|
||||
fcda.setSequenceCount(SclTraversalSupport.calculateSequenceCount(allFcdas, fcda));
|
||||
fcda.setSequenceCount(SclTraversalSupport.calculateSequenceCount(dataSet.getFcdas(), fcda));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user