diff --git a/bin/dart_debug_sample.dart b/bin/dart_debug_sample.dart
index f6f44b2..b10f0a7 100644
--- a/bin/dart_debug_sample.dart
+++ b/bin/dart_debug_sample.dart
@@ -1,7 +1,7 @@
 import 'package:dart_debug_sample/dart_debug_sample.dart';
 
 void main() {
-  YukymController yukymController = YukymController();
+  YukymController yukymController = YukymController(dateTime: DateTime.now());
   print(yukymController.getTyA()); // 해당 월에 맞는 자시의 국 표시
   print(yukymController.getTyB()); // 해당 시간에 맞는 자시의 국 표시
 }
diff --git a/lib/dart_debug_sample.dart b/lib/dart_debug_sample.dart
index 5472e58..e0f1408 100644
--- a/lib/dart_debug_sample.dart
+++ b/lib/dart_debug_sample.dart
@@ -1,92 +1,61 @@
-import 'package:intl/intl.dart';
-
 class YukymController {
+  final DateTime dateTime;
 
-  // DateTime.parse(_userData.value!.selectDate)
-  String nowDate = DateFormat('yyyy-mm-dd').format(DateTime.now());
-
-  late String nowTime;
+  YukymController({required this.dateTime});
 
-  // 1. 자시의 국 : 갑자1국 = getTyOne()의 값
   String getTyA() {
-    List<YukymTimeModel> timeDataOne =
-    _getTimeDataOne(nowDate);
-
-    if (timeDataOne.isNotEmpty) {
-      nowTime = timeDataOne.first.ty1;
-
-      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.month;
+    var result = '경오7국';
+
+    switch (month) {
+      case 1 || 2:
+        result = '경오1국';
+      case 3 || 4:
+        result = '경오2국';
+      case 5 || 6:
+        result = '경오3국';
+      case 7 || 8:
+        result = '경오4국';
+      case 9 || 10:
+        result = '경오5국';
+      case 11 || 12:
+        result = '경오6국';
     }
+
+    return result;
   }
 
   String getTyB() {
-    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 hour = dateTime.hour;
+    var result = '갑자1국';
+
+    switch (hour) {
+      case >= 0 && < 2:
+        result = '갑자1국';
+      case >= 2 && < 4:
+        result = '갑자2국';
+      case >= 4 && < 6:
+        result = '갑자3국';
+      case >= 6 && < 8:
+        result = '갑자4국';
+      case >= 8 && < 10:
+        result = '갑자5국';
+      case >= 10 && < 12:
+        result = '갑자6국';
+      case >= 12 && < 14:
+        result = '갑자7국';
+      case >= 14 && < 16:
+        result = '갑자8국';
+      case >= 16 && < 18:
+        result = '갑자9국';
+      case >= 18 && < 20:
+        result = '갑자10국';
+      case >= 20 && < 22:
+        result = '갑자11국';
+      case >= 22 && < 24:
+        result = '갑자12국';
     }
 
     return result;
   }
-
-  List<YukymTimeModel> _getTimeDataOne(String nowDate) {
-    List<YukymTimeModel> timeDataOne = [];
-    for (int i = 0; i < 24; i++) {
-      timeDataOne.add(YukymTimeModel());
-    }
-    return timeDataOne;
-  }
 }
-
-class YukymTimeModel {
-  String ty1 = '갑자1국';
-  String ty2 = '갑자2국';
-  String ty3 = '갑자3국';
-  String ty4 = '갑자4국';
-  String ty5 = '갑자5국';
-  String ty6 = '갑자6국';
-  String ty7 = '갑자7국';
-  String ty8 = '갑자8국';
-  String ty9 = '갑자9국';
-  String ty10 = '갑자10국';
-  String ty11 = '갑자11국';
-  String ty12 = '갑자12국';
-}
\ No newline at end of file