Merge branch 'develop' into dev/mapping20210603

src/main/java/com/diagbot/rule/CommonRule.java

@@ -397,7 +397,7 @@ public class CommonRule {
                     String curDateValue = ReflectUtil.getProperty(it, "dateValue");
                     if (StringUtil.isNotBlank(curDateValue)) {
                         Date curDate = CatalogueUtil.parseStringDate(curDateValue);
-                        for (int j = i + 1; j < itemList.size(); j++) {
+                        for (int j = i + 1; j < items.size(); j++) {
                             T itNext = items.get(j);
                             String nextDateValue = ReflectUtil.getProperty(itNext, "dateValue");
                             if (StringUtil.isNotBlank(nextDateValue)) {