|
|
@@ -475,7 +475,6 @@ class Entrust extends Backend
|
|
|
$params[$ke]['judge'] = 0;
|
|
|
if ($is_pass == 4) {
|
|
|
$params[$ke]['judge'] = 1;
|
|
|
- $str = '';
|
|
|
}
|
|
|
$params[$ke]['entrust_no'] = $entrust['no'];
|
|
|
$params[$ke]['entrust_id'] = $entrust['id'];
|
|
|
@@ -488,10 +487,26 @@ class Entrust extends Backend
|
|
|
$params[$ke]['sample_no'] = $entrust['sample_no'];
|
|
|
$params[$ke]['standard_id'] = $temp_id[$ke];
|
|
|
$params[$ke]['standard_name'] = $judge[0]['name'];
|
|
|
- $params[$ke]['dis'] = number_format($dis,'2','.','');
|
|
|
- $params[$ke]['dis_impurity'] = number_format($dis_impurity,'2','.','');
|
|
|
- $params[$ke]['ben_total'] = number_format($ben_total,'2','.','');
|
|
|
- $params[$ke]['ben'] = number_format($ben,'4','.','');
|
|
|
+ if (is_numeric($dis)){
|
|
|
+ $params[$ke]['dis'] = number_format($dis,'2','.','');
|
|
|
+ }else{
|
|
|
+ $params[$ke][$dis] = $dis;
|
|
|
+ }
|
|
|
+ if (is_numeric($dis_impurity)){
|
|
|
+ $params[$ke]['dis_impurity'] = number_format($dis_impurity,'2','.','');
|
|
|
+ }else{
|
|
|
+ $params[$ke]['dis_impurity'] = $dis_impurity;
|
|
|
+ }
|
|
|
+ if (is_numeric($ben_total)){
|
|
|
+ $params[$ke]['ben_total'] = number_format($ben_total,'2','.','');
|
|
|
+ }else{
|
|
|
+ $params[$ke]['ben_total'] = $ben_total;
|
|
|
+ }
|
|
|
+ if (is_numeric($ben)){
|
|
|
+ $params[$ke]['ben'] = number_format($ben,'4','.','');
|
|
|
+ }else{
|
|
|
+ $params[$ke]['ben'] = $ben;
|
|
|
+ }
|
|
|
$params[$ke]['unit'] = 'mg/m2';
|
|
|
$params[$ke]['remark'] = $str;
|
|
|
$params[$ke]['create'] = date('Y-m-d H:i:s');
|
