财运

xpgx-service/src/main/java/com/miaxis/gan/service/impl/GanZhiServiceImpl.java

@@ -1321,24 +1321,24 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         String geju = null;
 
-        if (list.get(3).getShiShen1() != null && yearGan.contains(list.get(3).getShiShen1())) { //月令十神1在 年干透出
-            geju = list.get(3).getShiShen1();
-        } else if (list.get(3).getShiShen1() != null && monthGan.contains(list.get(3).getShiShen1())) { //月令十神1在 月干透出
-            geju = list.get(3).getShiShen1();
-        } else if (list.get(3).getShiShen1() != null && timeGan.contains(list.get(3).getShiShen1())) { //月令十神1在 时干透出
-            geju = list.get(3).getShiShen1();
-        } else if (list.get(3).getShiShen2() != null && yearGan.contains(list.get(3).getShiShen2())) { //月令十神2在 年干透出
-            geju = list.get(3).getShiShen2();
-        } else if (list.get(3).getShiShen2() != null && monthGan.contains(list.get(3).getShiShen2())) { //月令十神2在 月干透出
-            geju = list.get(3).getShiShen2();
-        } else if (list.get(3).getShiShen2() != null && timeGan.contains(list.get(3).getShiShen2())) { //月令十神2在 时干透出
-            geju = list.get(3).getShiShen2();
-        } else if (list.get(3).getShiShen3() != null && yearGan.contains(list.get(3).getShiShen3())) { //月令十神3在 年干透出
-            geju = list.get(3).getShiShen3();
-        } else if (list.get(3).getShiShen3() != null && monthGan.contains(list.get(3).getShiShen3())) { //月令十神3在 月干透出
-            geju = list.get(3).getShiShen3();
-        } else if (list.get(3).getShiShen3() != null && timeGan.contains(list.get(3).getShiShen3())) { //月令十神3在 时干透出
-            geju = list.get(3).getShiShen3();
+        if (list.get(3).getShiShen1() != null && list.get(3).getShiShen1().contains(yearGan)) { //月令十神1在 年干透出
+            geju = yearGan;
+        } else if (list.get(3).getShiShen1() != null && list.get(3).getShiShen1().contains(monthGan)) { //月令十神1在 月干透出
+            geju = monthGan;
+        } else if (list.get(3).getShiShen1() != null && list.get(3).getShiShen1().contains(timeGan)) { //月令十神1在 时干透出
+            geju = timeGan;
+        } else if (list.get(3).getShiShen2() != null && list.get(3).getShiShen2().contains(yearGan)) { //月令十神2在 年干透出
+            geju = yearGan;
+        } else if (list.get(3).getShiShen2() != null && list.get(3).getShiShen2().contains(monthGan)) { //月令十神2在 月干透出
+            geju = monthGan;
+        } else if (list.get(3).getShiShen2() != null && list.get(3).getShiShen2().contains(timeGan)) { //月令十神2在 时干透出
+            geju = timeGan;
+        } else if (list.get(3).getShiShen3() != null && list.get(3).getShiShen3().contains(yearGan)) { //月令十神3在 年干透出
+            geju = yearGan;
+        } else if (list.get(3).getShiShen3() != null && list.get(3).getShiShen3().contains(monthGan)) { //月令十神3在 月干透出
+            geju = monthGan;
+        } else if (list.get(3).getShiShen3() != null && list.get(3).getShiShen3().contains(timeGan)) { //月令十神3在 时干透出
+            geju = timeGan;
         } else {
             geju = null;
         }