同级对比接口调整

src/main/java/com/rf/psychological/plan/dao/repository/TestPlanContendRepository.java

@@ -316,4 +316,6 @@ public interface TestPlanContendRepository extends BaseRepository<TestPlanConten
 
 
     List<TestPlanContendEntity> findAllByTestPlanId(String planId);
+
+    TestPlanContendEntity findTopByTestPlanId(String planId);
 }

src/main/java/com/rf/psychological/plan/service/TestPlanContendService.java

@@ -65,4 +65,6 @@ public interface TestPlanContendService {
     int countContent(String testPlanId);
 
     List<TestPlanContendEntity> findAllByTestPlanId(String testPlanId);
+
+    TestPlanContendEntity findOneByByTestPlanId(String testPlanId);
 }

src/main/java/com/rf/psychological/plan/service/impl/TestPlanContendServiceImpl.java

@@ -205,4 +205,9 @@ public class TestPlanContendServiceImpl implements TestPlanContendService {
     public List<TestPlanContendEntity> findAllByTestPlanId(String testPlanId) {
         return testPlanContendRepository.findAllByTestPlanId(testPlanId);
     }
+
+    @Override
+    public TestPlanContendEntity findOneByByTestPlanId(String testPlanId) {
+        return testPlanContendRepository.findTopByTestPlanId(testPlanId);
+    }
 }

src/main/java/com/rf/psychological/rest/ReportAnalysisController.java

@@ -151,16 +151,23 @@ public class ReportAnalysisController extends BaseController {
             if (StringUtils.isEmpty(structureNo)){
                 return fail("组织编号不能为空");
             }
+            //获取到计划下任务（目前只有一个）
+            TestPlanContendEntity contendEntity = planContendService.findOneByByTestPlanId(planId);
+            if (contendEntity == null){
+                return fail("内容不存在请确认，请联系管理员");
+            }
+            flag = contendEntity.getFlag();
             //获取到子节点
             List<StructureEntity> child = structureService.getChildByParent(structureNo,plan.getInstitutionNo());
             if (CollectionUtils.isEmpty(child)){
                 return fail("不存在子节点，请重新选择");
             }
+            String finalFlag = flag;
             child.forEach(item->{
                 JSONObject org = new JSONObject();
                 org.put("name",item.getStructureName());
                 //获取到该量表规则
-                List<ScaleMarksEntity> marksEntities = scaleMarksService.getScaleMarksByFlag(flag);
+                List<ScaleMarksEntity> marksEntities = scaleMarksService.getScaleMarksByFlag(finalFlag);
                 if (CollectionUtils.isEmpty(marksEntities)){
                     org.put("value",null);
                 }