src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java

@@ -279,13 +279,11 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
             .otherwise(0L)
             .sum();
 
-    if (StringUtils.isNotBlank(req.getModelNo())) {
     if (req.getModelNo().equals(ModelType.G2.getId())) {
       selectedCnt = wasteCnt;
-      } else if (req.getModelNo().equals(ModelType.G3.getId())) {
+    } else {
       selectedCnt = elseCnt;
     }
-    }
 
     if (StringUtils.isNotBlank(req.getDataType())) {
       if (!"CURRENT".equals(req.getDataType())) {