Merge branch 'dev-1220' into develop

app/Admin/Extensions/ToolBar/Forms/ExternalPrescriptionImportForm.php

@@ -28,14 +28,29 @@ public function handle(array $input): JsonResponse
        // 表单参数
        $file = $input['import_file'];
        $filePath = storage_path('app/'.$file);
-       Log::info("====>".$filePath);
+       // Log::info("====>".$filePath);
        try {
            // 每100行数据为一批数据进行读取
            $chunkSize = 10;
            $successNum = 0;
            $failNum = 0;
            $data = Excel::import($filePath)->sheet('处方明细列表')->toArray();
-           Log::info("====>".json_encode($data));
+           if(!empty($data) && is_array($data)){
+                // 判断处方单编号是会否重复，如果重复需进行合并药品数据
+                $prescriptions = [];
+                foreach($data as $row){
+                    $prescriptionNo = $row['处方编号'];
+                    $drug_info['drug_name'] = $row['药品名称'];
+                    $drug_info['drug_spec'] = $row['药品规格'];
+                    $drug_info['drug_num'] = $row['药品数量'];
+                    if(!isset($prescriptions[$prescriptionNo])){
+                        $prescriptions[$prescriptionNo] = $row;
+                    }
+                    $prescriptions[$prescriptionNo]['药品明细'][] = $drug_info;
+                }
+                Log::info("prescriptions====>".json_encode($prescriptions));
+           }
+           
            $return = $this->response()->success("导入成功{$successNum}条")->refresh();
            unlink($filePath);
        } catch (Exception $e) {