diff --git a/mh-system/src/main/java/com/mh/system/service/report/impl/MeterReadingsHisServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/report/impl/MeterReadingsHisServiceImpl.java index ab36229..43c78fa 100644 --- a/mh-system/src/main/java/com/mh/system/service/report/impl/MeterReadingsHisServiceImpl.java +++ b/mh-system/src/main/java/com/mh/system/service/report/impl/MeterReadingsHisServiceImpl.java @@ -54,7 +54,8 @@ public class MeterReadingsHisServiceImpl implements IMeterReadingsHisService { "热水热泵系统用水总合计:", "水、电费用总合计(水/电价预估单价,单价需以实际缴费为准):", "中央空调制冷量(kw)", - "蒸汽流量(吨)" + "蒸汽流量(吨)", + "采暖系统制热量(kw)" ); private final List mtTypeList = List.of( @@ -77,10 +78,14 @@ public class MeterReadingsHisServiceImpl implements IMeterReadingsHisService { "电表", "电表", "电表", + "电表", + "电表", + "水表", "水表", "水表", "总合计", "流量计量表", + "流量计量表", "流量计量表" ); @@ -147,7 +152,7 @@ public class MeterReadingsHisServiceImpl implements IMeterReadingsHisService { reportMeterReadingsHis.setMtType("电表"); } else if (reportMeterReadingsHis.getMtType().contains("水表")) { reportMeterReadingsHis.setMtType("水表"); - } else if (reportMeterReadingsHis.getMtType().contains("冷量计")) { + } else if (reportMeterReadingsHis.getMtType().contains("冷量计") || reportMeterReadingsHis.getMtType().contains("锅炉")) { reportMeterReadingsHis.setMtType("流量计量表"); } }