|
@@ -1957,9 +1957,9 @@ class ApiController extends BaseController
|
|
|
$result['sj_hj'] = $result['pm1_sj_ls'] + $result['pm2_sj_ls'];//实际合计
|
|
$result['sj_hj'] = $result['pm1_sj_ls'] + $result['pm2_sj_ls'];//实际合计
|
|
|
|
|
|
|
|
if (empty($bz1) && empty($bz2)) {
|
|
if (empty($bz1) && empty($bz2)) {
|
|
|
- $result['bz'] = '备注:无';
|
|
|
|
|
|
|
+ $result['bz'] = '无';
|
|
|
} else {
|
|
} else {
|
|
|
- $result['bz'] = '备注:'.implode(';', array_filter([$bz1, $bz2]));
|
|
|
|
|
|
|
+ $result['bz'] = implode(';', array_filter([$bz1, $bz2]));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
foreach ($result as $key => &$value) {
|
|
foreach ($result as $key => &$value) {
|