src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java

@@ -262,13 +262,21 @@ public class PwrGnrSimService {
       for (PwrGnrSimRoofResponse m : moduleGroupList) {
         if (data.getRoofSurfaceId().equals(m.getRoofSurfaceId())) {
           dSpecification += m.getTotSpecification();
-            if (m.getItemId().equals(pwrGnrSimReq.getModule1())) {
+          if (j == 0) {
-                dModuleInput1[i] = Integer.parseInt(m.getAmount());
+              if(pwrGnrSimReq.getModule1().equals(m.getItemId())){
-            } else if (m.getItemId().equals(pwrGnrSimReq.getModule2())) {
+                  dModuleInput1[i] = Integer.parseInt(m.getAmount());
-                dModuleInput2[i] = Integer.parseInt(m.getAmount());
+              }else if(pwrGnrSimReq.getModule2().equals(m.getItemId())){
-            } else if (m.getItemId().equals(pwrGnrSimReq.getModule3())) {
+                  dModuleInput2[i] = Integer.parseInt(m.getAmount());
-                dModuleInput3[i] = Integer.parseInt(m.getAmount());
+              }else if(pwrGnrSimReq.getModule3().equals(m.getItemId())){
-            }
+                  dModuleInput3[i] = Integer.parseInt(m.getAmount());
+              }
+
+          } else if (j == 1) {
+            dModuleInput2[i] = Integer.parseInt(m.getAmount());
+          } else {
+            dModuleInput3[i] = Integer.parseInt(m.getAmount());
+          }
+          j++;
         }
       }
       i++;