From 61b5ef230d7c09809e4a3b2e36a5843dbd303383 Mon Sep 17 00:00:00 2001
From: kyh <1329522@naver.com>
Date: Fri, 28 Oct 2022 13:25:09 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EC=B4=88=20=EC=8B=9C=EC=A0=90=20?=
 =?UTF-8?q?=EC=9E=A1=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Million/Manager/CalculateManager.cs | 38 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Million/Manager/CalculateManager.cs b/Million/Manager/CalculateManager.cs
index 3541c9f..2af78a5 100644
--- a/Million/Manager/CalculateManager.cs
+++ b/Million/Manager/CalculateManager.cs
@@ -598,7 +598,13 @@ namespace Million.Manager
             foreach (var parent in parentCandleDataList)
             {
                 var dic = parent.CalculateFlag;
-                
+
+                var overlapData = GetOverlapValueData(setUp, parent, key);
+                if (overlapData == 0) continue;
+                var valDic = ResultLogicManager.GetIndicateValue(dic, totalIndicators, parent);
+                var subVal = GetConditionValue(subScript.regularExpressionString, valDic, dic);
+                if (subVal == 0) continue;
+
                 //Sub 조건 만족 여부
                 if (subScript.DicExcuteScript(dic))
                 {
@@ -606,23 +612,23 @@ namespace Million.Manager
                 }
                 else
                 {
-                    subFlag = false;
-                    var str = "";
-
-                    if (recentlyDataFlag)
+                    if (subFlag)
                     {
-                        if (subManagement != null && !subManagement[coinFullName])
-                        {
+                        subFlag = false;
+                        var str = "";
+
+                        if (recentlyDataFlag)
+                        {                            
                             str = "Buyer(Realtime) Mode\r\n";
                             str += coinFullName + " 최초 돌파 Sub조건 초기화 됨\r\n";
                             LogManager.WriteLog(str, coinFullName);
+                            subManagement[coinFullName] = true;
+                        }
+                        else
+                        {
+                            firstFlag = false;
                         }
-                        subManagement[coinFullName] = true;                    
                     }
-                    else
-                    {
-                        firstFlag = false;                        
-                    }                    
                 }
 
                 //sub 조건이 만족할 경우
@@ -631,14 +637,6 @@ namespace Million.Manager
                     if(recentlyDataFlag)
                         if (!subManagement[coinFullName]) continue;
 
-                    var overlapData = GetOverlapValueData(setUp, parent, key);
-
-                    if (overlapData == 0) continue;
-
-                    var valDic = ResultLogicManager.GetIndicateValue(dic, totalIndicators, parent);
-                    var subVal = GetConditionValue(subScript.regularExpressionString, valDic, dic);
-                    if (subVal == 0) continue;
-
                     if (upperMainIndicatorFlag)
                         if (overlapData < subVal) continue;