diff --git a/app/Imports/Oldmen.php b/app/Imports/Oldmen.php index f69b010..4620c42 100644 --- a/app/Imports/Oldmen.php +++ b/app/Imports/Oldmen.php @@ -31,14 +31,21 @@ class Oldmen extends ImportBase if(ModelsOldmen::where('card_no', $cardNo)->exists()){//如果已存在,则为更新 $oldman = ModelsOldmen::where('card_no', $cardNo)->first(); - $newLv = Keyword::where(['type_key'=>'nurse_lv', 'name'=>$nurseLvName])->value('value'); - if($oldman->nurse_lv !== $newLv && $oldman->live_in > 0){ + $newLv = Keyword::where(['type_key'=>'nurse_lv', 'name'=>$nurseLvName])->first(); + if(!$newLv) { + throw new ImportException('未找到对应【'.$nurseLvName.'】护理等级'); + } + if($oldman->nurse_lv !== $newLv->value && $oldman->live_in > 0){ throw new ImportException('当前入住状态无法直接变更护理等级'); - }K; + }; }else{ $oldman = new ModelsOldmen(); $oldman->card_no = $cardNo; - $oldman->nurse_lv = Keyword::where(['type_key'=>'nurse_lv', 'name'=>$nurseLvName])->value('value'); + $nurseLv = Keyword::where(['type_key'=>'nurse_lv', 'name'=>$nurseLvName])->first(); + if(!$nurseLv) { + throw new ImportException('未找到对应【'.$nurseLvName.'】护理等级'); + } + $oldman->nurse_lv = $nurseLv->value; } $oldman->name = $name; $sexArr = [ @@ -46,6 +53,9 @@ class Oldmen extends ImportBase '男'=>1, '女'=>2 ]; + if(!isset($sexArr[$sex])){ + throw new ImportException('未填写性别'); + } $oldman->sex = $sexArr[$sex]; $oldman->birthday = Carbon::parse($birthDate); $oldman->card_city_code = Zone::where(['name' => $cardArea, 'type'=>'area'])->value('code') ?? '';