diff --git a/lib/dart_debug_sample.dart b/lib/dart_debug_sample.dart
index 5472e58..24f9d09 100644
--- a/lib/dart_debug_sample.dart
+++ b/lib/dart_debug_sample.dart
@@ -1,70 +1,51 @@
 import 'package:intl/intl.dart';
 
 class YukymController {
-
   // DateTime.parse(_userData.value!.selectDate)
-  String nowDate = DateFormat('yyyy-mm-dd').format(DateTime.now());
+  String nowDate = DateFormat('yyyy-MM-dd').format(DateTime.now());
 
   late String nowTime;
 
   // 1. 자시의 국 : 갑자1국 = getTyOne()의 값
   String getTyA() {
-    List<YukymTimeModel> timeDataOne =
-    _getTimeDataOne(nowDate);
-
-    if (timeDataOne.isNotEmpty) {
-      nowTime = timeDataOne.first.ty1;
+    // List<YukymTimeModel> timeDataOne = _getTimeDataOne(nowDate);
+    nowTime = YukymTimeModel().ty1; // 왜있는지는 모르겠지만 아무튼 nowTime에는 계속 넣고있던 값을 넣어봄
 
-      final month = nowDate.substring(5, 7);
-      if (month == '01' || month == '02') {
-        return '경오1국';
-      } else if (month == '03' || month == '04') {
-        return '경오2국';
-      } else if (month == '05' || month == '06') {
-        return '경오3국';
-      } else if (month == '07' || month == '08') {
-        return '경오4국';
-      } else if (month == '09' || month == '10') {
-        return '경오5국';
-      } else if (month == '11' || month == '12') {
-        return '경오6국';
-      }
-      return nowTime;
-    } else {
-      // Handle the case when the list is empty
-      return '경오7국';  // Or any other appropriate action
-    }
+    final month = DateTime.now().month;
+    return '경오${(month / 2).ceil()}국';
   }
 
   String getTyB() {
-    List<YukymTimeModel> timeDataOne =
-    _getTimeDataOne(nowDate);
+    List<YukymTimeModel> timeDataOne = _getTimeDataOne(nowDate);
     String result = timeDataOne.first.ty12;
 
-    final nowTime = DateTime.now();
-    if (nowTime.hour >= 0 || nowTime.hour < 2) {
-      return timeDataOne.first.ty1;
-    } else if (nowTime.hour >= 4 || nowTime.hour < 6) {
-      return timeDataOne.first.ty2;
-    } else if (nowTime.hour >= 6 || nowTime.hour < 8) {
-      return timeDataOne.first.ty3;
-    } else if (nowTime.hour >= 8 || nowTime.hour < 10) {
-      return timeDataOne.first.ty4;
-    } else if (nowTime.hour >= 10 || nowTime.hour < 12) {
-      return timeDataOne.first.ty5;
-    } else if (nowTime.hour >= 12 || nowTime.hour < 14) {
-      return timeDataOne.first.ty6;
-    } else if (nowTime.hour >= 16 || nowTime.hour < 18) {
-      return timeDataOne.first.ty7;
-    } else if (nowTime.hour >= 18 || nowTime.hour < 20) {
-      return timeDataOne.first.ty8;
-    } else if (nowTime.hour >= 20 || nowTime.hour < 22) {
-      return timeDataOne.first.ty9;
-    } else if (nowTime.hour >= 22 || nowTime.hour < 24) {
-      return timeDataOne.first.ty10;
-    }
+    final nowHour = DateTime.now().hour;
 
-    return result;
+    return '갑자${(nowHour / 2).toInt()}국';
+
+    // if (nowTime.hour >= 0 && nowTime.hour < 2) {
+    //   return timeDataOne.first.ty1;
+    // } else if (nowTime.hour >= 4 && nowTime.hour < 6) {
+    //   return timeDataOne.first.ty2;
+    // } else if (nowTime.hour >= 6 && nowTime.hour < 8) {
+    //   return timeDataOne.first.ty3;
+    // } else if (nowTime.hour >= 8 || nowTime.hour < 10) {
+    //   return timeDataOne.first.ty4;
+    // } else if (nowTime.hour >= 10 || nowTime.hour < 12) {
+    //   return timeDataOne.first.ty5;
+    // } else if (nowTime.hour >= 12 || nowTime.hour < 14) {
+    //   return timeDataOne.first.ty6;
+    // } else if (nowTime.hour >= 16 || nowTime.hour < 18) {
+    //   return timeDataOne.first.ty7;
+    // } else if (nowTime.hour >= 18 || nowTime.hour < 20) {
+    //   return timeDataOne.first.ty8;
+    // } else if (nowTime.hour >= 20 || nowTime.hour < 22) {
+    //   return timeDataOne.first.ty9;
+    // } else if (nowTime.hour >= 22 || nowTime.hour < 24) {
+    //   return timeDataOne.first.ty10;
+    // }
+
+    // return result;
   }
 
   List<YukymTimeModel> _getTimeDataOne(String nowDate) {
@@ -89,4 +70,4 @@ class YukymTimeModel {
   String ty10 = '갑자10국';
   String ty11 = '갑자11국';
   String ty12 = '갑자12국';
-}
\ No newline at end of file
+}
diff --git a/test/dart_debug_sample_test.dart b/test/dart_debug_sample_test.dart
index 71efb52..56113ac 100644
--- a/test/dart_debug_sample_test.dart
+++ b/test/dart_debug_sample_test.dart
@@ -1,8 +1,5 @@
-import 'package:dart_debug_sample/dart_debug_sample.dart';
 import 'package:test/test.dart';
 
 void main() {
-  test('', () {
-
-  });
+  test('', () {});
 }