20250209 优化调整

application/admin/controller/student/Collection.php

@@ -243,15 +243,18 @@ class Collection extends Backend
                 $fault_right_list = Db::name('real_exam_fault')->where(['exam_id'=>$ids,'flag'=>1])->select();
                 //根据故障部位 数组
                 $fault_arr = [$fault_right_list[0]['fault_id'],$fault_right_list[1]['fault_id'],$fault_right_list[2]['fault_id']];
-                
+
+            
                 //根据故障部位查找，匹配的排除方法
                 $paichu_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('pc_id');
-                //根据故障部位查找，匹配可能原因
-                $yy_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('yy_id');
 
                 //查找故障现象 数组
                 $partent_fault_id = Fault::where(['fault_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('parent_fault_id');
 
+
+                //根据故障部位查找，匹配可能原因
+                $yy_arr = Fault::where(['parent_fault_id'=>['in',$partent_fault_id],'sim_type'=>$info['sim_type'],'fault_type'=>2])->column('fault_id');
+
                 //获取数组
                 $other_report = json_decode($params['other_report'],true);
                 if(!empty($other_report)){
@@ -356,7 +359,7 @@ class Collection extends Backend
                         ];
                     }
                 }
-                //循环作答的排除方法，，匹配固定的排除方法
+                //循环作答的排除方法，匹配固定的排除方法
                 foreach ($yuanyin_arr as $k32 =>$t32){
                     if(!empty($t32) && !in_array($t32,$yy_arr)){
                         $yuanyin_socre = 1+$yuanyin_socre;

application/admin/controller/student/Exercise.php

@@ -226,12 +226,15 @@ class Exercise extends Backend
                 
                 //根据故障部位查找，匹配的排除方法
                 $paichu_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('pc_id');
-                //根据故障部位查找，匹配可能原因
-                $yy_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('yy_id');
+                // //根据故障部位查找，匹配可能原因
+                // $yy_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('yy_id');
 
                 //查找故障现象 数组
                 $partent_fault_id = Fault::where(['fault_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('parent_fault_id');
 
+                //根据故障部位查找，匹配可能原因
+                $yy_arr = Fault::where(['parent_fault_id'=>['in',$partent_fault_id],'sim_type'=>$info['sim_type'],'fault_type'=>2])->column('fault_id');
+
                 //获取数组
                 $other_report = json_decode($params['other_report'],true);
                 if(!empty($other_report)){

application/admin/controller/student/Practice.php

@@ -259,12 +259,16 @@ class Practice extends Backend
                 
                 //根据故障部位查找，匹配的排除方法
                 $paichu_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('pc_id');
-                //根据故障部位查找，匹配可能原因
-                $yy_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('yy_id');
+                
+                // //根据故障部位查找，匹配可能原因
+                // $yy_arr = Report::where(['bw_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('yy_id');
 
                 //查找故障现象 数组
                 $partent_fault_id = Fault::where(['fault_id'=>['in',$fault_arr],'sim_type'=>$info['sim_type']])->column('parent_fault_id');
 
+                //根据故障部位查找，匹配可能原因
+                $yy_arr = Fault::where(['parent_fault_id'=>['in',$partent_fault_id],'sim_type'=>$info['sim_type'],'fault_type'=>2])->column('fault_id');
+
                 //获取数组
                 $other_report = json_decode($params['other_report'],true);
                 if(!empty($other_report)){