bug

application/common/model/Orders.php

@@ -584,8 +584,16 @@ class Orders extends Base {
             if(!$ret){
                 \exception("操作失败");
             }
-
+            $taskData = [
+                'org_id' => $order['org_id'],
+                'type' => 1,
+                'start_time' => getTime(),
+                'create_time' => getTime(),
+            ];
             if($order['work_type_mode'] == 1){
+                if (isset($data['repair_priority']) && $data['repair_priority']==3) {
+                    $taskData['priority'] = 1;
+                }
                 $repair = Db::name('order_repair')->where('order_id',$order['id'])->find();
                 if($repair){
                     Db::name("order_repair")->where('id',$repair['id'])->update([
@@ -604,6 +612,9 @@ class Orders extends Base {
                     ]);
                 }
             }else if($order['work_type_mode'] == 3){
+                if (isset($data['priority']) && $data['priority']==3) {
+                    $taskData['priority'] = 2;
+                }
                 $conveyCate = Db::name('convey_cate')->where('id',$data['type'])->find();
                 if($conveyCate['cate'] == 1){
                     $ocp = Db::name('order_convey_patient')->where('order_id',$data['id'])->find();

application/h5/controller/Statistics.php

@@ -1263,8 +1263,8 @@ class Statistics extends Controller
             $count = Db::name('waste_record')->where($map)->where('cateid',$v['waste_id'])->sum('weight');
             $wasteTypes[$k]['count'] = round($count/1000,2)."kg";
             if($v['type'] == 1){
-                $count = Db::name('waste_record')->where($map)->where('cateid',$v['waste_id'])->sum('num');
-                $wasteTypes[$k]['count'] = round($count/1000,2)."kg".'('.$count.$v['unit'].')';
+                $num = Db::name('waste_record')->where($map)->where('cateid',$v['waste_id'])->sum('num');
+                $wasteTypes[$k]['count'] = round($count/1000,2)."kg".'('.$num.$v['unit'].')';
             }