Merge branch 'master-base' into master-test

fwq

2024-09-13 c0a45b7b68f60ccd25d759808351a84ea070ce09

Merge branch 'master-base' into master-test

 phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordController.java

@@ -468,7 +468,7 @@
            mjData.put("name", json.getString("name"));
            mjData.put("degree", json.getString("degree"));
            //获取二级分类程度数据
            mjData.put("typeDegreeData", MeiJiDataTool.getTypeDegreeData(mjData.get("contents").toString(), degreeMap));
            mjData.put("typeDegreeData", MeiJiDataTool.getTypeDegreeData(commonService, mjData.get("contents").toString(), degreeMap));
            mjData.remove("contents");

            //查询对应关联资源文件记录

 phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java

@@ -1056,7 +1056,7 @@
        Map<String, List<MjDataVo>> mjDataVoMap = null;
        List<MjDataVo> mjDataVoList = null;
        //获取模板分类数据(适应症,分类)
        Map<String, List<String>> relationMap = MeiJiDataTool.getRelationMap();
        Map<String, List<String>> relationMap = MeiJiDataTool.getRelationMap(commonService);
        //封装结构
        for (List<String> value : relationMap.values()) {
            //list是有顺序的,0是一级分类,1是二级分类