ningshuxia
2022-10-31 09f3cdf4eec25526c4e5b924b67f8cfd4a089fec
Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs
@@ -124,11 +124,16 @@
                double qa_total = 0;
                double qh_total = 0;
                foreach (var item in child_ana_records)
                {
                    if (item.Ea.HasValue && item.Qa.HasValue && item.Ea.Value > 10 && item.Qa.Value > 10)
                    {
                        qa_total += item.Qa.Value;
                        if (item.Ha.HasValue)
                        {
                            qh_total += item.Qa.Value * item.Ha.Value;
                        }
                    }
                }
@@ -139,7 +144,11 @@
                    {
                        if (item.Ea.HasValue && item.Qa.HasValue && item.Ea.Value > 10 && item.Qa.Value > 10)
                        {
                            eta += item.Ea.Value * item.Qa.Value / qa_total;
                            if (item.Ha.HasValue && item.Ha.Value != 0)
                            {
                                eta += item.Ea.Value * (item.Qa.Value * item.Ha.Value / qh_total);//叠加扬程换算
                            }
                            // eta += item.Ea.Value * item.Qa.Value / qa_total; 旧算法
                        }
                    }