|
@@ -701,7 +701,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
int daYunCount = 0;
|
|
|
double dayDiff = Math.abs(list.get(1).getDaysDifference());
|
|
|
double qiYunSuiDB = (dayDiff / 3); //计算起运岁数
|
|
|
- int qiYunSui = (int)Math.ceil(qiYunSuiDB);
|
|
|
+ int qiYunSui = (int) Math.ceil(qiYunSuiDB);
|
|
|
System.out.println("大运顺起运岁数:" + qiYunSui);
|
|
|
|
|
|
int year = lunar.getYear() + qiYunSui;
|
|
@@ -738,7 +738,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
int daYunCount = 0;
|
|
|
double dayDiff = Math.abs(list.get(0).getDaysDifference());
|
|
|
double qiYunSuiDB = (dayDiff / 3); //计算起运岁数
|
|
|
- int qiYunSui = (int)Math.ceil(qiYunSuiDB);
|
|
|
+ int qiYunSui = (int) Math.ceil(qiYunSuiDB);
|
|
|
System.out.println("大运顺起运岁数:" + qiYunSui);
|
|
|
|
|
|
int year = lunar.getYear() + qiYunSui;
|
|
@@ -1094,24 +1094,50 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
String monthGan = list.get(2).getShiShen1();
|
|
|
String timeGan = list.get(6).getShiShen1();
|
|
|
|
|
|
+ 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();
|
|
|
+ } else {
|
|
|
+ geju = null;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (geju == null) {
|
|
|
+ if (maxTianGan == 1) {
|
|
|
+ geju = yearGan;
|
|
|
+ } else if (maxTianGan == 2) {
|
|
|
+ geju = monthGan;
|
|
|
+ } else if (maxTianGan == 3) {
|
|
|
+ geju = timeGan;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (qr.contains("强")) {
|
|
|
+
|
|
|
+ } else if (qr.contains("弱")) {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ String sex = list.get(4).getShiShen1();
|
|
|
+ if ("元男".equals(sex)) {
|
|
|
+
|
|
|
+ } else if ("元女".equals(sex)) {
|
|
|
|
|
|
}
|
|
|
|