修复年总需热量初始值不计算问题

@@ -2518,9 +2518,9 @@ public class ProjectServiceImpl implements ProjectService {
                          * 年总需热水总量=   热水定额*人数*供热水天数/1000
                          */
                         String zd_name = "no_" + sort.getId();
-                        Double electricity = hotWaterDataMapper.queryName(zd_name, dict.getId());
+//                        Double electricity = hotWaterDataMapper.queryName(zd_name, dict.getId());
                         Assert.notNull(synthesizeNo21.getWaterDayNum(), "供热水天数为空了");
-                        totalAnnualTotalHotWaterRequirement = electricity * synthesizeNo21.getWaterPersonNum() * synthesizeNo21.getWaterDayNum() / 1000;
+                        totalAnnualTotalHotWaterRequirement = synthesizeNo21.getHotWaterQuota() * synthesizeNo21.getWaterPersonNum() * synthesizeNo21.getWaterDayNum() / 1000;
                     }
                     CalculateLoad service = calculateLoadService.getById(id);
                     if (!StringUtils.isEmpty(id) && !StringUtils.isEmpty(service)) {