diff --git a/app/Admin/Controllers/OldmenController.php b/app/Admin/Controllers/OldmenController.php index cfbc3d6..01f86e8 100644 --- a/app/Admin/Controllers/OldmenController.php +++ b/app/Admin/Controllers/OldmenController.php @@ -264,7 +264,7 @@ class OldmenController extends AdminController } /** - * 费用表单 + * 推荐费用表单 * */ public function liveSchemaForm(Request $request) @@ -276,11 +276,13 @@ class OldmenController extends AdminController $endDay = $dateRange ? explode(',', $dateRange)[1].' 23:59:59' : $request->input('end_at', null); if($startDay && $endDay){ - $diffYears = Carbon::parse($startDay)->diffInYears($endDay); - $diffMonths = Carbon::parse($startDay)->addYears($diffYears)->diffInMonths($endDay); - $diffAbMonths = Carbon::parse($startDay)->diffInMonths($endDay); - $diffDays = Carbon::parse($startDay)->addYears($diffYears)->addMonths($diffMonths)->diffInDays($endDay); - $diffAbDays = Carbon::parse($startDay)->diffInDays($endDay); + $startDay = Carbon::parse($startDay); + $endDay = Carbon::parse($endDay)->addSecond(1); + $diffYears = $startDay->diffInYears($endDay); + $diffMonths = $startDay->addYears($diffYears)->diffInMonths($endDay); + $diffAbMonths = $startDay->diffInMonths($endDay); + $diffDays = $startDay->addYears($diffYears)->addMonths($diffMonths)->diffInDays($endDay); + $diffAbDays = $startDay->diffInDays($endDay); } $lv = $request->input('nurse_lv', 1); @@ -297,6 +299,7 @@ class OldmenController extends AdminController }, $feeKeyHelp[$fee->key]['values']); if(isset($_feeValues[$lv]['day'])){ + //判断是否有设置年份 if(isset($_feeValues[$lv]['year'])){ $_feeValue += bcmul($diffYears, $_feeValues[$lv]['year'], 2); @@ -309,6 +312,7 @@ class OldmenController extends AdminController }else{ if(isset($_feeValues[$lv]['month'])){ $_feeValue += bcmul($diffAbMonths, $_feeValues[$lv]['month'], 2); + $_feeValue += bcmul($diffDays, $_feeValues[$lv]['day'], 2); }else{ $_feeValue += bcmul($diffAbDays, $_feeValues[$lv]['day'], 2); } @@ -319,7 +323,7 @@ class OldmenController extends AdminController $_feeValue = $_feeValues[$lv]['fee'] ?? 0; } } - $feeArr[] = Components::make()->decimalControl($type.'['.$fee->key.']', $fee->name)->description(amis('tpl')->tpl('根据当前护理等级,建议费用为:'.$_feeValue)); + $feeArr[] = Components::make()->decimalControl($type.'['.$fee->key.']', $fee->name)->value($_feeValue)->description(amis('tpl')->tpl('根据当前护理等级,建议费用为:'.$_feeValue)); } return $this->response()->success($feeArr);