|
@@ -280,12 +280,13 @@ func (e *Entry) recalculate(neckRingList []*model.NeckRingOriginal) []*model.Nec
|
|
|
}
|
|
|
|
|
|
// 算平均值
|
|
|
- for _, v := range originalMapData {
|
|
|
+ for k, v := range originalMapData {
|
|
|
+ // 过滤掉合并后不满6条数据
|
|
|
if v.RecordCount != 6 {
|
|
|
maxFrameId := e.CurrentMaxXFrameId(v.NeckRingNumber, v.ActiveDate)
|
|
|
- xframeId := util.XFrameId(maxFrameId)
|
|
|
- if xframeId-v.XframeId <= 1 {
|
|
|
- continue
|
|
|
+ currXframeId := util.XFrameId(maxFrameId)
|
|
|
+ if currXframeId-v.XframeId <= 1 {
|
|
|
+ delete(originalMapData, k)
|
|
|
}
|
|
|
}
|
|
|
v.SumAvg()
|