|
@@ -433,8 +433,11 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
protected String getReadingFromMeterData(WaterMeter waterMeter, Map<String, MeasuringData> measuringData){
|
|
protected String getReadingFromMeterData(WaterMeter waterMeter, Map<String, MeasuringData> measuringData){
|
|
|
|
+ String readingValue = "" ;
|
|
MeasuringData readingData = measuringData.get(waterMeter.getReadingMeasuringCode());
|
|
MeasuringData readingData = measuringData.get(waterMeter.getReadingMeasuringCode());
|
|
- String readingValue = readingData.getMeasuringVaule();
|
|
|
|
|
|
+ if(readingData != null ){
|
|
|
|
+ readingValue = readingData.getMeasuringVaule();
|
|
|
|
+ }
|
|
return readingValue ;
|
|
return readingValue ;
|
|
}
|
|
}
|
|
protected BigDecimal calculateTodayCost(String currentReading,BigDecimal lastValid,MeterReadRecord record){
|
|
protected BigDecimal calculateTodayCost(String currentReading,BigDecimal lastValid,MeterReadRecord record){
|