Merge branch 'fwq-stander-皮肤测试报告' into master-xlk-test
| | |
| | | List<TreatPlan> treatPlanList = commonService.selectList(TreatPlanMapper.class, sqlSentence); |
| | | if (treatPlanList != null && treatPlanList.size() > 0){ |
| | | //治疗方案对应的设备 |
| | | String deviceSql = " SELECT id,describeMsg,imgUrl FROM treat_plan_device WHERE isDel = 0 AND treatPlanId = #{m.treatPlanId} "; |
| | | String deviceSql = " SELECT id,describeMsg,imgUrl,name FROM treat_plan_device WHERE isDel = 0 AND treatPlanId = #{m.treatPlanId} "; |
| | | //治疗方案对应的项目 |
| | | String projectSql = " SELECT id,commonId FROM treat_plan_item WHERE isDel = 0 AND treatPlanId = #{m.treatPlanId} "; |
| | | //返回的数据 |