Browse Source

BUG处理。

zhangbin 1 year ago
parent
commit
7644e90e2d

+ 6 - 4
xpgx-admin/src/main/java/com/miaxis/app/controller/gan/GanZhiController.java

@@ -90,7 +90,7 @@ public class GanZhiController extends BaseController {
         List<GanZhiRowVo> ganZhiRowVoList = ganZhiService.selectGanZhiRowVoList(ganZhiDto);
         Map<String, Object> riYuanQrMap = ganZhiService.getRiYuanQr(ganZhiRowVoList);  //查出日元强弱
         String xifangWei = ganZhiService.getXiFangWei(ganZhiDaYunVo.getLunar()); //喜用的方位
-        Map<String, Object> chenGuMap = ganZhiService.getChenGu(ganZhiDaYunVo.getLunar());
+        Map<String, String> chenGuMap = ganZhiService.getChenGu(ganZhiDaYunVo.getLunar(),ganZhiDto.getSex());
 
 
         String guiren = ganZhiService.getGuiren(ganZhiRowVoList);
@@ -100,11 +100,11 @@ public class GanZhiController extends BaseController {
         Map<String,String> geJuMap = ganZhiService.getGeJu(ganZhiRowVoList,maxTianGan,riYuanQrMap.get("qr").toString()); //查出八字常见格局
         String geju = geJuMap.get("geju");
 
-        String industry = ganZhiService.getIndustry(riYuanQrMap,geju);
+        String industry = ganZhiService.getIndustry(riYuanQrMap,geju); //行业
 
-        Map<Integer,String> guoGuanMap = ganZhiService.getGuo3Guan(ganZhiRowVoList,riYuanQrMap.get("qr").toString());
+        Map<Integer,String> guoGuanMap = ganZhiService.getGuo3Guan(ganZhiRowVoList,riYuanQrMap.get("qr").toString()); //过三关
 
-        Map<String, Integer> fiveCountMap = ganZhiService.getGanZhiRowVoCount(ganZhiRowVoList);
+        Map<String, Object> fiveCountMap = ganZhiService.getGanZhiRowVoCount(ganZhiRowVoList);
         Map<String, Object> shiShenCountMap = ganZhiService.getShiShenCount(ganZhiRowVoList);
         List<GanZhiNaYinVo> ganZhiNaYinVoList = ganZhiService.selectGanZhiNaYinList(ganZhiDto);
         List<GanZhiKongWangVo> ganZhiKongWangVoList = ganZhiService.selectGanZhiKongWangList(ganZhiDto);
@@ -133,6 +133,8 @@ public class GanZhiController extends BaseController {
         ganZhiVo.setXiFangWei(xifangWei);
         ganZhiVo.setIndustry(industry);
         ganZhiVo.setGuiren(guiren);
+        ganZhiVo.setChenGuMap(chenGuMap);
+
 
         // 输出结果
         return Response.success(ganZhiVo);

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

@@ -83,6 +83,9 @@ public class ShiShenConfig {
     //十神缺失
     private Map<String, String> zeroShiShen = new TreeMap<String, String>();
 
+    //五行缺失
+    private Map<String, String> zeroFive = new TreeMap<String, String>();
+
     //五行与行业
     private Map<String, String> fiveIndustry = new TreeMap<String, String>();
 
@@ -816,6 +819,12 @@ public class ShiShenConfig {
         zeroShiShen.put("劫财", "缺少劫财,不会利用人,总被人利用");
         zeroShiShen.put("比肩", "缺少比肩,朋友少,性格孤僻,有点社交恐惧症");
 
+        //缺失五行补法
+        zeroFive.put("木", "五行缺木:在家中摆放一些绿色植物,如绿萝、仙人掌等,增加木元素;选择一些绿色的装饰品,如青翠的窗帘、地毯等。");
+        zeroFive.put("火", "五行缺火:使用明亮的灯光,尤其是红色或橙色的灯具,有助于增加火元素;点燃一些香气怡人的蜡烛,既能提升室内氛围,又有助于补充火元素。");
+        zeroFive.put("土", "五行缺土:选择一些土黄、咖啡色的装饰品,如地毯、靠垫等;在家中使用一些陶瓷餐具或装饰品,有助于增加土元素。");
+        zeroFive.put("金", "五行缺金:放置一些金属质地的装饰品,如金色的花瓶、金属相框等;引入一些金属家具,如金属椅子、桌子等。");
+        zeroFive.put("水", "五行缺水:在家中挂一些水景画,如瀑布、湖泊等,能够引入水元素;摆放一些水晶饰品,如水晶灯、水晶摆件等,有助于补充水元素。");
 
         //五行与行业
         fiveIndustry.put("木", "事业属性与木有直接或间接关联者,五行便属木。如:木制业、家具业、木材行、室内设计业、纸业、花业、园艺店、树苗盆栽业、医药医疗事业。文化事业、教育用品业、出版业、公务员、政界、安亲班、补习班、训练机构、宗教用品、画廊、装潢材料业、精品店、水果业、食品制造业、人才培育事业、布业、服饰业、窗帘业、茶叶行、栽种业、休闲农场等。");
@@ -1044,57 +1053,57 @@ public class ShiShenConfig {
         guZhongPingYuMan.put("71", "此命生来大不同,公侯卿相在其中。一生自有逍遥福,富贵荣华极品隆。");
 
         //女
-        guZhongPingYuWoman.put("21", "");
-        guZhongPingYuWoman.put("22", "");
-        guZhongPingYuWoman.put("23", "");
-        guZhongPingYuWoman.put("24", "");
-        guZhongPingYuWoman.put("25", "");
-        guZhongPingYuWoman.put("26", "");
-        guZhongPingYuWoman.put("27", "");
-        guZhongPingYuWoman.put("28", "");
-        guZhongPingYuWoman.put("29", "");
-        guZhongPingYuWoman.put("30", "");
-        guZhongPingYuWoman.put("31", "");
-        guZhongPingYuWoman.put("32", "");
-        guZhongPingYuWoman.put("33", "");
-        guZhongPingYuWoman.put("34", "");
-        guZhongPingYuWoman.put("35", "");
-        guZhongPingYuWoman.put("36", "");
-        guZhongPingYuWoman.put("37", "");
-        guZhongPingYuWoman.put("38", "");
-        guZhongPingYuWoman.put("39", "");
-        guZhongPingYuWoman.put("40", "");
-        guZhongPingYuWoman.put("41", "");
-        guZhongPingYuWoman.put("42", "");
-        guZhongPingYuWoman.put("43", "");
-        guZhongPingYuWoman.put("44", "");
-        guZhongPingYuWoman.put("45", "");
-        guZhongPingYuWoman.put("46", "");
-        guZhongPingYuWoman.put("47", "");
-        guZhongPingYuWoman.put("48", "");
-        guZhongPingYuWoman.put("49", "");
-        guZhongPingYuWoman.put("50", "");
-        guZhongPingYuWoman.put("51", "");
-        guZhongPingYuWoman.put("52", "");
-        guZhongPingYuWoman.put("53", "");
-        guZhongPingYuWoman.put("54", "");
-        guZhongPingYuWoman.put("55", "");
-        guZhongPingYuWoman.put("56", "");
-        guZhongPingYuWoman.put("57", "");
-        guZhongPingYuWoman.put("58", "");
-        guZhongPingYuWoman.put("59", "");
-        guZhongPingYuWoman.put("60", "");
-        guZhongPingYuWoman.put("61", "");
-        guZhongPingYuWoman.put("62", "");
-        guZhongPingYuWoman.put("63", "");
-        guZhongPingYuWoman.put("64", "");
-        guZhongPingYuWoman.put("65", "");
-        guZhongPingYuWoman.put("66", "");
-        guZhongPingYuWoman.put("67", "");
-        guZhongPingYuWoman.put("68", "");
-        guZhongPingYuWoman.put("69", "");
-        guZhongPingYuWoman.put("70", "");
-        guZhongPingYuWoman.put("71", "");
+        guZhongPingYuWoman.put("21", "生身此命运不通,乌云盖月黑朦胧,莫向故园载花木,可来幽地种青松。");
+        guZhongPingYuWoman.put("22", "女命孤冷独凄身,此身推来路乞人,操心烦恼难度日,一生痛苦度光阴。");
+        guZhongPingYuWoman.put("23", "女命生来轻薄人,营谋事作难称心,六亲骨肉亦无靠,奔走劳碌困苦门。");
+        guZhongPingYuWoman.put("24", "女命推来福禄无,治家艰难辛苦多,丈夫儿女不亲爱,奔走他乡作游姑。");
+        guZhongPingYuWoman.put("25", "此命一身八字低,家庭艰辛多苦妻,娘家亲友冷如炭,一生勤劳多忧眉。");
+        guZhongPingYuWoman.put("26", "平生依禄但苦求,两次配夫带忧愁,咸酸苦辣他偿过,晚年衣食本无忧。");
+        guZhongPingYuWoman.put("27", "此格做事单独强,难告夫君作主张,心问口来口问心,晚景衣禄宜自生。");
+        guZhongPingYuWoman.put("28", "女命生来八字轻,为善作事也无因,你把别人当亲生,别人对你假殷情。");
+        guZhongPingYuWoman.put("29", "花支艳来硬性身,自奔自力不求人,若问求财方可止,在苦有甜度光阴。");
+        guZhongPingYuWoman.put("30", "女命推来比郎强,婚姻大事碍无障,中年走过坎坷地,末年渐经行前强。");
+        guZhongPingYuWoman.put("31", "早年行运在忙头,劳碌奔波苦勤求,费力劳心把家立,后来晚景名忧愁。");
+        guZhongPingYuWoman.put("32", "时逢运来带吉神,从有凶星转灰尘,真变假来假成真,结拜弟妹当亲生。");
+        guZhongPingYuWoman.put("33", "初限命中有变化,中年可比树落花,勤俭持家难度日,晚年成业享荣华。");
+        guZhongPingYuWoman.put("34", "矮巴勾枣难捞枝,看破红尘最相宜,谋望求财空费力,婚姻三娶两次离。");
+        guZhongPingYuWoman.put("35", "女子走冰怕冰薄,出行交易受残霜,婚姻周郎休此意,官司口舌须相加。");
+        guZhongPingYuWoman.put("36", "忧悉常锁两眉间,家业挂心不等闲,从今以后防口角,任意行移不相关。");
+        guZhongPingYuWoman.put("37", "此命推来费运多,若作摧群受折磨,山路崎岖吊下耳,左插右安心难留。");
+        guZhongPingYuWoman.put("38", "凤鸣岐山四方扬,女命逢此大吉昌,走失夫君音信有,晚年衣禄财盈箱。");
+        guZhongPingYuWoman.put("39", "女命推来运未能,劳碌奔波一场空,好似俊乌在笼锁,中年未限凄秋风。");
+        guZhongPingYuWoman.put("40", "目前月令运不良,千辛万苦受煎熬,女身受得多苦难,晚年福禄比密甜。");
+        guZhongPingYuWoman.put("41", "此命推来一般艰,女子为人很非凡,中年逍遥多自在,晚年更比中年超。");
+        guZhongPingYuWoman.put("42", "杜井破废已多年,今有泉水出来鲜,资生济竭人称美,中运来转喜安然。");
+        guZhongPingYuWoman.put("43", "推车靠涯道路通,女名求财也无穷,婚姻出配无阻碍,疾病口舌离身躬。");
+        guZhongPingYuWoman.put("44", "夜梦金银醒来空,立志谋业运不通,婚姻难成交易散,夫君趟失未见踪。");
+        guZhongPingYuWoman.put("45", "女命终身驳杂多,六亲骨肉不相助,命中男女都难养,劳碌辛苦还奔波。");
+        guZhongPingYuWoman.put("46", "孤舟行水离沙滩,离乡出外早过家,是非口舌皆无碍,婚姻合配紫微房。");
+        guZhongPingYuWoman.put("47", "时来运转喜开颜,多年枯木逢春花,枝叶重生多茂盛,凡人见得都赞夸。");
+        guZhongPingYuWoman.put("48", "一朵鲜花镜中开,看着极好取不来,劝你休把镜花想,此命推来主可癫。");
+        guZhongPingYuWoman.put("49", "一生为人福宏名,心兹随君显门庭,容貌美丽惹人爱,银钱富足万事成。");
+        guZhongPingYuWoman.put("50", "马氏太公不相和,好命逢此忧凝多,恩人无义反为仇,是非平地起风波。");
+        guZhongPingYuWoman.put("51", "肥羊一群入出场,防虎逢之把口张,适口充饥心欢喜,女命八字大吉昌。");
+        guZhongPingYuWoman.put("52", "顺风行舟扯起帆,上天又助一顺风,不用费力逍遥去,任意顺行大享通。");
+        guZhongPingYuWoman.put("53", "此命相貌眉目清,文武双全功名成,一生衣禄皆无缺,可算世上积福人。");
+        guZhongPingYuWoman.put("54", "运开满腹好文章,谋事求财大吉祥,出行交易多得稳,到处享通姓名扬。");
+        guZhongPingYuWoman.put("55", "发政旅仁志量高,女命求财任他乡,交舍婚姻多有意,无君出外有音耗。");
+        guZhongPingYuWoman.put("56", "明珠辉吐离埃来,女有口有清散开,走失郎君当两归,交易有成永无灾。");
+        guZhongPingYuWoman.put("57", "游鱼戏水被网惊,踊身变化入龙门,三根杨柳垂金钱,万朵桃花显价能。");
+        guZhongPingYuWoman.put("58", "此命推来转悠悠,时运未来莫强求,幸得今日重反点,自有好运在后头。");
+        guZhongPingYuWoman.put("59", "雨雪载途活泥泞,交易不安难出生,疾病还拉婚姻慢,谋望求财事难寻。");
+        guZhongPingYuWoman.put("60", "女命八字喜气和,谋事求财吉庆多,口舌渐消疾病少,夫君走别归老巢。");
+        guZhongPingYuWoman.put("61", "缘木求鱼事多难,虽不得鱼无害反,若是行险弄巧地,事不遂心枉安凡。");
+        guZhongPingYuWoman.put("62", "指日高升气象新,走失待人有信音,好命遇事遂心好,伺病口舌皆除根。");
+        guZhongPingYuWoman.put("63", "五官脱运难抬头,妇命须当把财求,交易少行有人助,一生衣禄不须愁。");
+        guZhongPingYuWoman.put("64", "俊乌曾得出胧中,脱离为难显威风,一朝得意福力至,东南西北任意通。");
+        guZhongPingYuWoman.put("65", "女命推来福非轻,兹善为事受人敬,天降文王开基业,八百年来富贵门。");
+        guZhongPingYuWoman.put("66", "时来运转闺阁楼,贤德淑女君子求,击鼓乐之大吉庆,女命逢此喜悠悠。");
+        guZhongPingYuWoman.put("67", "乱丝无头定有头,碰得亲事暂折磨,交易出行无好处,谋事求财心不遂。");
+        guZhongPingYuWoman.put("68", "水底明月不可捞,女命早限运未高,交易出行难获利,未运终得渐见好。");
+        guZhongPingYuWoman.put("69", "太公封祖不非凡,女子求财稳如山,交易合伙多吉庆,疾病口角遗天涯。");
+        guZhongPingYuWoman.put("70", "本命推断喜气新,恰遇郎君金遂心,坤身来交正当运,富贵衣禄乐平生。");
+        guZhongPingYuWoman.put("71", "此命推来宏运交,不须再愁苦劳难,一生身有衣禄福,安享荣华胜班超。");
 
 
     }

+ 2 - 2
xpgx-service/src/main/java/com/miaxis/gan/service/IGanZhiService.java

@@ -63,7 +63,7 @@ public interface IGanZhiService extends IService<GanZhi>{
      * @param ganZhiRowVoList
      * @return
      */
-    Map<String,Integer> getGanZhiRowVoCount(List<GanZhiRowVo> ganZhiRowVoList);
+    Map<String,Object> getGanZhiRowVoCount(List<GanZhiRowVo> ganZhiRowVoList);
 
     /**
      * 获取十神数量
@@ -111,5 +111,5 @@ public interface IGanZhiService extends IService<GanZhi>{
 
     String getGuiren(List<GanZhiRowVo> ganZhiRowVoList);
 
-    Map<String, Object> getChenGu(Lunar lunar);
+    Map<String, String> getChenGu(Lunar lunar,Integer sex);
 }

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

@@ -411,9 +411,9 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         String xi1 = xiYong.get(0);
         String xi2 = xiYong.get(1);
 
-        Map<String, Integer> fiveCountMap = this.getGanZhiRowVoCount(list);
-        int xi1Count = fiveCountMap.get(xi1);
-        int xi2Count = fiveCountMap.get(xi2);
+        Map<String, Object> fiveCountMap = this.getGanZhiRowVoCount(list);
+        int xi1Count = (Integer)fiveCountMap.get(xi1);
+        int xi2Count = (Integer)fiveCountMap.get(xi2);
 
         if (xi1Count > 3) {
             xiYong.remove(xi1);
@@ -604,9 +604,15 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         //五行得出疾病
         List<DiseasePart> fivePartList = new ArrayList<DiseasePart>();
-        Map<String, Integer> fiveCount = this.getGanZhiRowVoCount(ganZhiRowVoList);
+        Map<String, Object> fiveCount = this.getGanZhiRowVoCount(ganZhiRowVoList);
         for (String key : fiveCount.keySet()) {
-            int count = fiveCount.get(key);
+            int count = 0;
+            if (fiveCount.get(key) instanceof Number) {
+                // 如果是数值类型,可以进行相应的操作
+                count = ((Number) fiveCount.get(key)).intValue(); // 通过 intValue() 转换成 int
+            } else {
+                continue;
+            }
             if (count >= 3) {
                 List<String> partList = shiShenConfig.getFiveBuWei().get(key);
                 DiseasePartDto fivePartDto = new DiseasePartDto();
@@ -914,9 +920,9 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
      * @return
      */
     @Override
-    public Map<String, Integer> getGanZhiRowVoCount(List<GanZhiRowVo> list) {
+    public Map<String, Object> getGanZhiRowVoCount(List<GanZhiRowVo> list) {
 
-        Map<String, Integer> fiveCount = new TreeMap<String, Integer>();
+        Map<String, Object> fiveCount = new TreeMap<String, Object>();
         fiveCount.put("木", 0);
         fiveCount.put("火", 0);
         fiveCount.put("土", 0);
@@ -925,9 +931,25 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         for (int i = 0; i < list.size(); i++) {
             String five = list.get(i).getFive();
-            Integer fiveC = fiveCount.get(five) + 1;
+            Integer fiveC = (Integer) fiveCount.get(five) + 1;
             fiveCount.put(five, fiveC);
         }
+
+        StringBuffer zeroCotent = new StringBuffer();
+        fiveCount.forEach((key, value) -> {
+            if (value instanceof Integer && (Integer) value == 0) {
+                zeroCotent.append(shiShenConfig.getZeroFive().get(key));
+                zeroCotent.append(";");
+            }
+        });
+
+        if (zeroCotent.toString().length() > 0) {
+            zeroCotent.deleteCharAt(zeroCotent.length() - 1);
+            fiveCount.put("缺失五行评语", zeroCotent.toString());
+        } else {
+            fiveCount.put("缺失五行评语", "命格中五行没有缺失,五行比较全面。");
+        }
+
         return fiveCount;
     }
 
@@ -1103,7 +1125,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             }
         });
 
-        if(zeroCotent.toString().length()>0) {
+        if (zeroCotent.toString().length() > 0) {
             zeroCotent.deleteCharAt(zeroCotent.length() - 1);
             shiShenCount.put("缺失十神评语", zeroCotent.toString());
         } else {
@@ -1122,9 +1144,9 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
     @Override
     public Map<String, Object> getZaoShiCount(List<GanZhiRowVo> list) {
 
-        Map<String, Integer> fiveCount = this.getGanZhiRowVoCount(list);
-        int huoCount = fiveCount.get("火");
-        int shuiCount = fiveCount.get("水");
+        Map<String, Object> fiveCount = this.getGanZhiRowVoCount(list);
+        int huoCount = (Integer)fiveCount.get("火");
+        int shuiCount = (Integer)fiveCount.get("水");
 
         for (int i = 1; i < list.size(); i += 2) {
             String five = list.get(i).getFive();
@@ -1132,13 +1154,13 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 if (huoCount > shuiCount) {
                     String name = list.get(i).getName();
                     if ("戌".equals(name) || "未".equals(name)) {
-                        Integer fiveC = fiveCount.get("火") + 1;
+                        Integer fiveC = (Integer)fiveCount.get("火") + 1;
                         fiveCount.put("火", fiveC);
                     }
                 } else if (huoCount < shuiCount) {
                     String name = list.get(i).getName();
                     if ("辰".equals(name) || "丑".equals(name)) {
-                        Integer fiveC = fiveCount.get("水") + 1;
+                        Integer fiveC = (Integer)fiveCount.get("水") + 1;
                         fiveCount.put("水", fiveC);
                     }
                 }
@@ -1147,10 +1169,11 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         fiveCount.remove("土");
         fiveCount.remove("金");
         fiveCount.remove("木");
+        fiveCount.remove("缺失五行评语");
 
 
-        int huoCount2 = fiveCount.get("火");
-        int shuiCoun2 = fiveCount.get("水");
+        int huoCount2 = (Integer)fiveCount.get("火");
+        int shuiCoun2 = (Integer)fiveCount.get("水");
 
         Map<String, Object> zaoShiMap = new TreeMap<String, Object>();
         zaoShiMap.putAll(fiveCount);
@@ -1697,7 +1720,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
     }
 
     @Override
-    public Map<String, Object> getChenGu(Lunar lunar) {
+    public Map<String, String> getChenGu(Lunar lunar, Integer sex) {
 
         System.out.println(lunar.getYear());   //年
         System.out.println(lunar.getMonth());   //月
@@ -1718,9 +1741,31 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         int total = yearZhong + monthZhong + dayZhong + timeZhong;
 
-        System.out.println(total);
+        Map<String, String> chenGuMap = new TreeMap<String, String>();
+        String chenGuContent = null;
+        if (sex == 1) {
+            chenGuContent = shiShenConfig.getGuZhongPingYuMan().get(String.valueOf(total));
+        } else if (sex == 2) {
+            chenGuContent = shiShenConfig.getGuZhongPingYuWoman().get(String.valueOf(total));
+        }
+
+
+        String liang = String.valueOf(total).substring(0, 1);
+        String qiang = String.valueOf(total).substring(1, 2);
+
+        String[] liangArray = {"零两", "一两", "二两", "三两", "四两"};
+        String[] qiangArray = {"零钱", "一钱", "二钱", "三钱", "四钱", "五钱", "六钱", "七钱", "八钱", "九钱"};
+
+        int shi = Integer.parseInt(liang);
+        int ge = Integer.parseInt(qiang);
+
+        String shiStr = liangArray[shi];
+        String geStr = qiangArray[ge];
+
+        chenGuMap.put("称骨重量", shiStr + geStr);
+        chenGuMap.put("称骨评语", chenGuContent);
 
-        return null;
+        return chenGuMap;
     }
 
 

+ 5 - 1
xpgx-service/src/main/java/com/miaxis/gan/vo/GanZhiVo.java

@@ -53,7 +53,7 @@ public class GanZhiVo {
     private List<GanZhiRowVo> ganZhiRowVoList;
 
     @ApiModelProperty(value = "八字五行个数集合")
-    private Map<String,Integer> fiveCountMap;
+    private Map<String,Object> fiveCountMap;
 
     @ApiModelProperty(value = "八字十神个数集合")
     private Map<String,Object> shiShenCountMap;
@@ -78,4 +78,8 @@ public class GanZhiVo {
 
     @ApiModelProperty(value = "贵人")
     private String guiren;
+
+    @ApiModelProperty(value = "称骨评语")
+    private Map<String,String> chenGuMap;
+
 }