BUG处理。

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

@@ -1967,9 +1967,9 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             } else if (qr.contains("弱") && xiYong.contains(five)) {  //弱喜
                 qiangGanContent.append("不过是能够得到老公家族的帮助。");
             } else if (qr.contains("强") && !xiYong.contains(five)) {  //强忌
-                qiangGanContent.append("但能不太能够得到老公家族的帮助。");
+                qiangGanContent.append("但不太能够得到老公家族的帮助。");
             } else if (qr.contains("弱") && !xiYong.contains(five)) {   //弱忌
-                qiangGanContent.append("也能不太能够得到老公家族的帮助。");
+                qiangGanContent.append("也不太能够得到老公家族的帮助。");
             }
 
             String dayGanShiShen1 = ganZhiRowVoList.get(5).getShiShen1();
@@ -2114,4 +2114,211 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
     }
 
 
+    public String getZiNvYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap, Map<String, Integer> fiveCountMap) {
+        String qr = (String) riYuanQrMap.get("qr");
+        List<String> xiYong = (List<String>) riYuanQrMap.get("xiYong");
+        List<String> xiYongOld = (List<String>) riYuanQrMap.get("xiYongOld");
+        List<String> xiYongShiShen = (List<String>) riYuanQrMap.get("xiYongShiShen");
+
+        StringBuffer ziNvContent = new StringBuffer();
+
+        String sex = ganZhiRowVoList.get(4).getShiShen1();
+        String onefive = ganZhiRowVoList.get(6).getFive();
+        String twofive = ganZhiRowVoList.get(7).getFive();
+        if ("元男".equals(sex)) {
+            //正官、七杀为男人的子女
+            int zhengGuanCount = shiShenCountMap.get("正官");
+            int qiShaCount = shiShenCountMap.get("七杀");
+            int total = zhengGuanCount + qiShaCount;
+            if (total == 0) {
+                ziNvContent.append("男人四柱官杀，与子女缘薄。");
+            }
+
+            if (qr.contains("强")) {
+                ziNvContent.append("子女星为喜用，代表跟子女关系好；");
+            } else if (qr.contains("弱")) {
+                ziNvContent.append("子女星为忌凶，代表跟子女关系一般；");
+            }
+            if (qr.contains("强") && xiYongOld.contains(onefive)) {  //强喜
+                ziNvContent.append("而且能享受到长子或长女的福气。");
+            } else if (qr.contains("弱") && xiYongOld.contains(onefive)) {  //弱喜
+                ziNvContent.append("不过是能享受到长子或长女的福气。");
+            } else if (qr.contains("强") && !xiYongOld.contains(onefive)) {  //强忌
+                ziNvContent.append("但不太能享受到长子或长女的福气。");
+            } else if (qr.contains("弱") && !xiYongOld.contains(onefive)) {   //弱忌
+                ziNvContent.append("也不太能享受到长子或长女的福气。");
+            }
+
+            if (qr.contains("强") && xiYongOld.contains(twofive)) {  //强喜
+                ziNvContent.append("能享受到次子或次女的福气。");
+            } else if (qr.contains("弱") && xiYongOld.contains(twofive)) {  //弱喜
+                ziNvContent.append("能享受到次子或次女的福气。");
+            } else if (qr.contains("强") && !xiYongOld.contains(twofive)) {  //强忌
+                ziNvContent.append("不太能享受到次子或次女的福气。");
+            } else if (qr.contains("弱") && !xiYongOld.contains(twofive)) {   //弱忌
+                ziNvContent.append("不太能享受到次子或次女的福气。");
+            }
+
+
+            String dayGanShiShen1 = ganZhiRowVoList.get(5).getShiShen1();
+            String dayGanShiShen2 = ganZhiRowVoList.get(5).getShiShen2();
+            String dayGanShiShen3 = ganZhiRowVoList.get(5).getShiShen3();
+
+            if (dayGanShiShen1 != null && dayGanShiShen1.contains("劫财")) {
+                ziNvContent.append("在夫妻宫本气坐落劫财，有克妻之相，会影响到夫妻感情。");
+            }
+            if (dayGanShiShen2 != null && dayGanShiShen2.contains("劫财")) {
+                ziNvContent.append("在夫妻宫中气坐落劫财，有中度克妻之相，会影响到夫妻感情。");
+            }
+            if (dayGanShiShen3 != null && dayGanShiShen3.contains("劫财")) {
+                ziNvContent.append("在夫妻宫余气坐落劫财，有轻微克妻之相，会影响到夫妻感情。");
+            }
+
+            if (dayGanShiShen1 != null && dayGanShiShen1.contains("伤官")) {
+                ziNvContent.append("在夫妻宫本气坐落劫财，夫妻不和睦之相。");
+            }
+            if (dayGanShiShen2 != null && dayGanShiShen2.contains("伤官")) {
+                ziNvContent.append("在夫妻宫中气坐落劫财，夫妻不和睦之相。");
+            }
+            if (dayGanShiShen3 != null && dayGanShiShen3.contains("伤官")) {
+                ziNvContent.append("在夫妻宫余气坐落劫财，夫妻不和睦之相。");
+            }
+
+            if (dayGanShiShen1 != null && dayGanShiShen1.contains("偏印")) {
+                ziNvContent.append("在夫妻宫本气坐落偏印，夫妻不和睦之相。");
+            }
+            if (dayGanShiShen2 != null && dayGanShiShen2.contains("偏印")) {
+                ziNvContent.append("在夫妻宫中气坐落偏印，夫妻不和睦之相。");
+            }
+            if (dayGanShiShen3 != null && dayGanShiShen3.contains("偏印")) {
+                ziNvContent.append("在夫妻宫余气坐落偏印，夫妻不和睦之相。");
+            }
+
+            String yearGan = ganZhiRowVoList.get(0).getName();
+            String monthGan = ganZhiRowVoList.get(2).getName();
+            String dayGan = ganZhiRowVoList.get(4).getName();
+            String timeGan = ganZhiRowVoList.get(6).getName();
+
+            String yearGanYY = shiShenConfig.getTianGanYY().get(yearGan);
+            String monthGanYY = shiShenConfig.getTianGanYY().get(monthGan);
+            String dayGanYY = shiShenConfig.getTianGanYY().get(dayGan);
+            String timeGanYY = shiShenConfig.getTianGanYY().get(timeGan);
+
+            if ("阴".equals(yearGanYY) && "阴".equals(monthGanYY) && "阴".equals(dayGanYY) && "阴".equals(timeGanYY)) {
+                ziNvContent.append("男性四柱全阴，体现出较女性化，可能有同性取向的趋向。");
+            }
+
+            int fuqiGongBiCount = 0;  //夫妻宫比肩 劫财的数量
+            for (int i = 2; i < ganZhiRowVoList.size(); i++) {
+                String shiShen1 = ganZhiRowVoList.get(i).getShiShen1();
+                String shiShen2 = ganZhiRowVoList.get(i).getShiShen2();
+                String shiShen3 = ganZhiRowVoList.get(i).getShiShen3();
+                if (shiShen1 != null && (shiShen1.contains("比肩") || shiShen1.contains("劫财"))) {
+                    fuqiGongBiCount++;
+                }
+                if (shiShen2 != null && (shiShen2.contains("比肩") || shiShen2.contains("劫财"))) {
+                    fuqiGongBiCount++;
+                }
+                if (shiShen3 != null && (shiShen3.contains("比肩") || shiShen3.contains("劫财"))) {
+                    fuqiGongBiCount++;
+                }
+            }
+
+            if(fuqiGongBiCount>=3) {
+                ziNvContent.append("男命夫妻宫周围过多的比劫，可能出现夫妻感情不和睦的情况。");
+            }
+
+
+        } else if ("元女".equals(sex)) {
+            //正官、七杀为女人的老公
+            int zhengCaiCount = shiShenCountMap.get("正官");
+            int pianCaiCount = shiShenCountMap.get("七杀");
+            int total = zhengCaiCount + pianCaiCount;
+            if (total == 0) {
+                ziNvContent.append("女人四柱无官杀，找老公会比较困难，自己也不太愿意结婚。");
+            }
+            if (qr.contains("强")) {
+                ziNvContent.append("夫妻星为喜用，婚后夫妻关系还不错；");
+            } else if (qr.contains("弱")) {
+                ziNvContent.append("夫妻星为忌凶，婚后夫妻关系不是很幸福；");
+            }
+
+//            if (qr.contains("强") && xiYong.contains(five)) {  //强喜
+//                ziNvContent.append("而且能够得到老公家族的帮助。");
+//            } else if (qr.contains("弱") && xiYong.contains(five)) {  //弱喜
+//                ziNvContent.append("不过是能够得到老公家族的帮助。");
+//            } else if (qr.contains("强") && !xiYong.contains(five)) {  //强忌
+//                ziNvContent.append("但能不太能够得到老公家族的帮助。");
+//            } else if (qr.contains("弱") && !xiYong.contains(five)) {   //弱忌
+//                ziNvContent.append("也能不太能够得到老公家族的帮助。");
+//            }
+
+            String dayGanShiShen1 = ganZhiRowVoList.get(5).getShiShen1();
+            String dayGanShiShen2 = ganZhiRowVoList.get(5).getShiShen2();
+            String dayGanShiShen3 = ganZhiRowVoList.get(5).getShiShen3();
+
+            if (dayGanShiShen1 != null && dayGanShiShen1.contains("伤官")) {
+                ziNvContent.append("在夫妻宫本气坐落伤官，有克夫之相，会影响到夫妻感情。");
+            }
+            if (dayGanShiShen2 != null && dayGanShiShen2.contains("伤官")) {
+                ziNvContent.append("在夫妻宫中气坐落伤官，有中度克夫之相，会影响到夫妻感情。");
+            }
+            if (dayGanShiShen3 != null && dayGanShiShen3.contains("伤官")) {
+                ziNvContent.append("在夫妻宫余气坐落伤官，有轻微克夫之相，会影响到夫妻感情。");
+            }
+
+            if (dayGanShiShen1 != null && dayGanShiShen1.contains("偏印")) {
+                ziNvContent.append("在夫妻宫本气坐落偏印，夫妻不和睦之相。");
+            }
+            if (dayGanShiShen2 != null && dayGanShiShen2.contains("偏印")) {
+                ziNvContent.append("在夫妻宫中气坐落偏印，夫妻不和睦之相。");
+            }
+            if (dayGanShiShen3 != null && dayGanShiShen3.contains("偏印")) {
+                ziNvContent.append("在夫妻宫余气坐落偏印，夫妻不和睦之相。");
+            }
+
+            String yearGan = ganZhiRowVoList.get(0).getName();
+            String monthGan = ganZhiRowVoList.get(2).getName();
+            String dayGan = ganZhiRowVoList.get(4).getName();
+            String timeGan = ganZhiRowVoList.get(6).getName();
+
+            String yearGanYY = shiShenConfig.getTianGanYY().get(yearGan);
+            String monthGanYY = shiShenConfig.getTianGanYY().get(monthGan);
+            String dayGanYY = shiShenConfig.getTianGanYY().get(dayGan);
+            String timeGanYY = shiShenConfig.getTianGanYY().get(timeGan);
+
+            if ("阳".equals(yearGanYY) && "阳".equals(monthGanYY) && "阳".equals(dayGanYY) && "阳".equals(timeGanYY)) {
+                ziNvContent.append("女性四柱全阳，体现出较男性化，可能有同性取向的趋向。");
+            }
+
+            int fuqiGongShangCount = 0;  //夫妻宫伤官的数量
+            for (int i = 2; i < ganZhiRowVoList.size(); i++) {
+                String shiShen1 = ganZhiRowVoList.get(i).getShiShen1();
+                String shiShen2 = ganZhiRowVoList.get(i).getShiShen2();
+                String shiShen3 = ganZhiRowVoList.get(i).getShiShen3();
+                if (shiShen1 != null && shiShen1.contains("伤官")) {
+                    fuqiGongShangCount++;
+                }
+                if (shiShen2 != null && shiShen2.contains("伤官")) {
+                    fuqiGongShangCount++;
+                }
+                if (shiShen3 != null && shiShen3.contains("伤官")) {
+                    fuqiGongShangCount++;
+                }
+            }
+
+            if(fuqiGongShangCount>=3) {
+                ziNvContent.append("女命夫妻宫周围过多的伤官，可能出现夫妻感情不和睦的情况。");
+            }
+
+
+        }
+
+
+
+
+        return ziNvContent.toString();
+    }
+    
+    
 }