fwq
2024-09-19 697203620b9fd30a2ec6206bb5f2fea233a1a691
Merge branch 'fwq-stander-皮肤测试报告' into master-xlk-test
1个文件已修改
3 ■■■■ 已修改文件
phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
@@ -1282,6 +1282,7 @@
        //返回数据
        Map<String,Object> data = new HashMap<>();
        data.put("mjSkinReportId",mjRecordId);
        data.put("userId",mjSkinReport.getCustomerId());
        SqlSentence sqlSentence = new SqlSentence();
        Map<String, Object> sqlMap = new HashMap<>();
@@ -1385,7 +1386,7 @@
        if (indicationList != null && indicationList.size() > 0) {
            sqlMap.put("typeStr", TreatPlan.TYPE_STR_INDICATION);
            sql.delete(0, sql.length());
            sql.append(" SELECT i.*,d.name AS commonName FROM treat_plan_item AS i ");
            sql.append(" SELECT i.commonId,d.name AS commonName FROM treat_plan_item AS i ");
            sql.append(" JOIN treat_plan AS t ON t.id = i.treatPlanId ");
            sql.append(" JOIN treat_plan_indication AS p ON p.treatPlanId = i.treatPlanId ");
            sql.append(" JOIN indication AS d ON d.id = p.indicationId ");