Merge branch 'fwq-stander-皮肤测试报告' into master-xlk-test

fwq

2024-09-24 8ab408cb12ba61f876171c508d076f86672f8861

Merge branch 'fwq-stander-皮肤测试报告' into master-xlk-test

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

@@ -1418,7 +1418,8 @@
                    }
                    //查看程度匹配度
                    String degreeId = degreeMap.get(mjIndicationDetailVo.getDegree());
                    if (StringUtils.noNull(degreeId) && !degreeId.equals(treatPlan.getDegreeTypeId())) {
                    if (StringUtils.noNull(degreeId) && StringUtils.noNull(treatPlan.getDegreeTypeId())
                            && !degreeId.equals(treatPlan.getDegreeTypeId())) {
                        logger.info("当前治疗方案与适应症的匹配程度不匹配,当前是{},客户适应症是{},{}", treatPlan.getDegreeTypeId(), degreeId, mjIndicationDetailVo.getDegree());
                        continue;
                    }