优化检测判定

application/admin/controller/Entrust.php

@@ -303,7 +303,7 @@ class Entrust extends Backend
         }
         $detail_data = Db::name($gather_tab)->where('pid',$gather['id'])->field('chemical_compound,potency')->select();
 
-        $is_qualified = 1;//默认合格，当有一项不合格时，判定此次检测不合格
+        $is_qualified = [];//默认合格，当有一项不合格时，判定此次检测不合格
         $dis= 0;//溶剂残留总量
         $dis_impurity_data = [];//溶剂杂质总量
         $ben_total_data = [];//苯系物总量
@@ -336,30 +336,36 @@ class Entrust extends Backend
         foreach ($judge as $k=>$v){
             if ($v['params'] == '溶剂残留总量'){
                 if ( $dis < $v['max']){
-                    $is_qualified = 1;
+                    $is_qualified[$k] = 1;
                 }else{
-                    $is_qualified = 0;
+                    $is_qualified[$k] = 0;
                 }
             }if ($v['params'] == '溶剂杂质总量' || $v['params'] == '总量'){
                 if ( $dis_impurity < $v['max']){
-                    $is_qualified = 1;
+                    $is_qualified[$k] = 1;
                 }else{
-                    $is_qualified = 0;
+                    $is_qualified[$k] = 0;
                 }
             }if ($v['params'] == '溶剂杂质苯系物' || $v['params'] == '苯系物'){
                 if ( $ben_total < $v['max']){
-                    $is_qualified = 1;
+                    $is_qualified[$k] = 1;
                 }else{
-                    $is_qualified = 0;
+                    $is_qualified[$k] = 0;
                 }
             }if ($v['params'] == '溶剂杂质苯' || $v['params'] == '苯'){
                 if ($ben < $v['max']){
-                    $is_qualified = 1;
+                    $is_qualified[$k] = 1;
                 }else{
-                    $is_qualified = 0;
+                    $is_qualified[$k] = 0;
                 }
             }
         }
+        $is_pass = array_sum($is_qualified);//4项都合格，sum=4才判定合格 不等于4就说明有不合格的
+        if ($is_pass == 4){
+            $params['judge'] = 1;
+        }else{
+            $params['judge'] = 0;
+        }
         $params  = [];//检测结果数据
         $params['entrust_no'] = $entrust['no'];
         $params['entrust_id'] = $entrust['id'];
@@ -373,7 +379,6 @@ class Entrust extends Backend
         $params['ben_total'] = $ben_total;
         $params['ben'] = $ben;
         $params['unit'] = 'mg/m2';
-        $params['judge'] = $is_qualified;
         $params['create'] = date('Y-m-d H:i:s');
         $params['maker'] = Session::get('admin')['username'];
         $params['params'] = Db::name('item_judge')->where('id',$temp_id)->value('list_name');