财运

xpgx-common/src/main/java/com/miaxis/common/config/ShiShenConfig.java

@@ -799,12 +799,12 @@ public class ShiShenConfig {
         //身体位置坐标
         body.put(0, "头部");
         body.put(1, "脖子");
-        body.put(2, "胸部至背部");
-        body.put(3, "腹部至下背部");
-        body.put(4, "小腹至后腰");
-        body.put(5, "胯部到屁股");
+        body.put(2, "胸部");
+        body.put(3, "腹部");
+        body.put(4, "小腹");
+        body.put(5, "屁股");
         body.put(6, "大腿");
-        body.put(7, "小腿至脚部");
+        body.put(7, "小腿-脚部");
 
 
         //方位位置坐标

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

@@ -929,14 +929,16 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         for (int i = 0; i < list.size(); i++) {
             String five = list.get(i).getFive();
-            Integer fiveC = (Integer) fiveCount.get(five) + 1;
+            Integer fiveC = fiveCount.get(five) + 1;
             fiveCount.put(five, fiveC);
         }
 
         StringBuffer zeroCotent = new StringBuffer();
         fiveCount.forEach((key, value) -> {
-            zeroCotent.append(shiShenConfig.getZeroFive().get(key));
-            zeroCotent.append(";");
+            if(value==0) {
+                zeroCotent.append(shiShenConfig.getZeroFive().get(key));
+                zeroCotent.append(";");
+            }
         });
 
         if (zeroCotent.toString().length() > 0) {
@@ -1437,7 +1439,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         }
         if (tuContent.toString().length() > 0) {
             tuContent.deleteCharAt(tuContent.length() - 1);
-            tuContent.append("以上身体部位存在伤疤或痣。");
+            tuContent.append("身体部位存在伤疤或痣。");
             guo3GuanMap.put(x++, tuContent.toString());
         }