lgy há 6 anos atrás
pai
commit
143d7573bd

+ 24 - 6
.idea/workspace.xml

@@ -25,8 +25,8 @@
       <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.03826087">
-              <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
+            <state vertical-scroll-proportion="0.42086956">
+              <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
               <folding>
                 <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
                 <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />
@@ -135,6 +135,24 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="vendor" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="topthink" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="yczd" />
@@ -262,9 +280,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19253294" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19253294" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -735,8 +753,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
+        <state vertical-scroll-proportion="0.42086956">
+          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
           <folding>
             <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
             <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />

+ 4 - 0
application/inter/controller/Application.php

@@ -62,8 +62,12 @@ class Application extends Base
             $info['department_name'] = $dep['department_name'];
             if(empty($application)){
                 $exam_application = DB::table('exams')->where('id',$id)->field(['illness_desc','phys_sign','clin_symp','remark','clin_diag','anamnesis','family_ill'])->find();
+                $exam_application['anamnesis'] = explode(',',$exam_application['anamnesis']);
+                $exam_application['family_ill'] = explode(',',$exam_application['family_ill']);
                 $info['application'] = $exam_application;
             }else{
+                $application['anamnesis'] = explode(',',$application['anamnesis']);
+                $application['family_ill'] = explode(',',$application['family_ill']);
                 $info['application'] = $application;
             }
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'is_remote'=>$is_remote]);

+ 2 - 0
application/inter/controller/Inspectregister.php

@@ -42,6 +42,8 @@ class Inspectregister extends Base
             $sessionid = $_REQUEST['sessionid'];
             $examid = $_REQUEST['param']['id'];
             $examinfo = DB::table('exams')->where('id',$examid)->field(['id','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id'])->find();
+            $examinfo['family_ill'] = explode(',',$examinfo['family_ill']);
+            $examinfo['anamnesis'] = explode(',',$examinfo['anamnesis']);
             $exam_class = DB::table('constant')->where('id',$examinfo['exam_class'])->field('constant_value as name')->cache(300)->find();
             $department = DB::table('department')->where('id',$examinfo['dept_id'])->field('department_name')->find();
             $examinfo['dept_name'] = $department['department_name'];

+ 29 - 68
application/manage/controller/Doctors.php

@@ -10,7 +10,8 @@ use think\Cookie;
 use think\Request;
 use app\common\library\SysLogs;
 use app\common\library\UUIDs;
-
+use PHPExcel_IOFactory;
+use PHPExcel;
 class Doctors extends Base {
 
     public function index() {
@@ -312,75 +313,35 @@ class Doctors extends Base {
     }
 
     public function import(){
-        include_once LIB_ROOT_PATH."3rdParty/phpexcel/PHPExcel.php";
-        $objReader = PHPExcel_IOFactory::createReader('Excel2007');
-        $objPHPExcel = $objReader->load($file_name,$encode='utf-8');
-        $sheet = $objPHPExcel->getSheet(0);
-        $highestRow = $sheet->getHighestRow();//取得总行数
-        $highestColumn = $sheet->getHighestColumn();//取得总列数
-        $data = array();
-        for($i=2;$i<=$highestRow;$i++){
-            for($j='A';$j<=$highestColumn;$j++){
-                $data[$i][] = $objPHPExcel->getActiveSheet()->getCell("$j$i")->getValue();
-            }
-        }
-        var_dump($data);
-        var_dump($_FILES);die;
-        if (!empty($_FILES)) {
-            import("@.ORG.UploadFile");
-            $config=array(
-                'allowExts'=>array('xlsx','xls'),
-                'savePath'=>'./Public/upload/',
-                'saveRule'=>'time',
-            );
-            $upload = new UploadFile($config);
-            if (!$upload->upload()) {
-                $this->error($upload->getErrorMsg());
-            } else {
-                $info = $upload->getUploadFileInfo();
-
+        $objPHPExcel = new PHPExcel();
+        //获取表单上传文件
+        $file = request()->file('excel');
+        $info = $file->validate(['size'=>99999,'ext'=>'xlsx,xls,csv'])->move(ROOT_PATH . 'public' . DS . 'excel');
+        if($info){
+            $exclePath = $info->getSaveName();  //获取文件名
+            $file_name = ROOT_PATH . 'public' . DS . 'excel' . DS . $exclePath;   //上传文件的地址
+            $objReader = new \PHPExcel_Reader_Excel2007();
+            if(!$objReader->canRead($file_name)){
+                $objReader = PHPExcel_IOFactory::createReader('Excel5');
             }
-
-            vendor("PHPExcel.PHPExcel");
-            $file_name=$info[0]['savepath'].$info[0]['savename'];
-            $objReader = PHPExcel_IOFactory::createReader('Excel5');
-            $objPHPExcel = $objReader->load($file_name,$encode='utf-8');
-            $sheet = $objPHPExcel->getSheet(0);
-            $highestRow = $sheet->getHighestRow(); // 取得总行数
-            $highestColumn = $sheet->getHighestColumn(); // 取得总列数
-            for($i=3;$i<=$highestRow;$i++)
-            {
-                $data['account']= $data['truename'] = $objPHPExcel->getActiveSheet()->getCell("B".$i)->getValue();
-                $sex = $objPHPExcel->getActiveSheet()->getCell("C".$i)->getValue();
-                // $data['res_id']    = $objPHPExcel->getActiveSheet()->getCell("D".$i)->getValue();
-                $data['class'] = $objPHPExcel->getActiveSheet()->getCell("E".$i)->getValue();
-                $data['year'] = $objPHPExcel->getActiveSheet()->getCell("F".$i)->getValue();
-                $data['city']= $objPHPExcel->getActiveSheet()->getCell("G".$i)->getValue();
-                $data['company']= $objPHPExcel->getActiveSheet()->getCell("H".$i)->getValue();
-                $data['zhicheng']= $objPHPExcel->getActiveSheet()->getCell("I".$i)->getValue();
-                $data['zhiwu']= $objPHPExcel->getActiveSheet()->getCell("J".$i)->getValue();
-                $data['jibie']= $objPHPExcel->getActiveSheet()->getCell("K".$i)->getValue();
-                $data['honor']= $objPHPExcel->getActiveSheet()->getCell("L".$i)->getValue();
-                $data['tel']= $objPHPExcel->getActiveSheet()->getCell("M".$i)->getValue();
-                $data['qq']= $objPHPExcel->getActiveSheet()->getCell("N".$i)->getValue();
-                $data['email']= $objPHPExcel->getActiveSheet()->getCell("O".$i)->getValue();
-                $data['remark']= $objPHPExcel->getActiveSheet()->getCell("P".$i)->getValue();
-                $data['sex']=$sex=='男'?1:0;
-                $data['res_id'] =1;
-
-                $data['last_login_time']=0;
-                $data['create_time']=$data['last_login_ip']=$_SERVER['REMOTE_ADDR'];
-                $data['login_count']=0;
-                $data['join']=0;
-                $data['avatar']='';
-                $data['password']=md5('123456');
-                M('Member')->add($data);
-
+            $obj_PHPExcel =$objReader->load($file_name);  //加载文件内容,编码utf-8
+            echo "<pre>";
+            $excel_array=$obj_PHPExcel->getsheet(0)->toArray();   //转换为数组格式
+            array_shift($excel_array);  //删除第一个数组(标题);
+            $data = [];
+            foreach($excel_array as $k=>$v) {
+                $data[$k]['name'] = $v[0];
+                $data[$k]['phone'] = $v[1];
             }
-            $this->success('导入成功!');
-        }else
-        {
-            $this->error("请选择上传的文件");
+            var_dump($data);die;
+            // $success=Db::name('t_station')->insertAll($data); //批量插入数据
+            //$i=
+            // $error=$i-$success;
+            // echo "总{$i}条,成功{$success}条,失败{$error}条。";
+            // Db::name('t_station')->insertAll($city); //批量插入数据
+        }else{
+            // 上传失败获取错误信息
+            echo $file->getError();
         }
     }
 }

+ 1 - 1
application/manage/view/doctors/index.html

@@ -208,7 +208,7 @@
     <a id="add" href="#" class="easyui-linkbutton" data-options="iconCls:'icon-add'" onclick="javascript:showEditWin()" style="width: 80px">添加</a>
     <a id="fieldVC" href="#" class="easyui-linkbutton" onclick="hideOrFields()" >显示[+]</a>
     <form action="import"  method="post" enctype="multipart/form-data">
-        <input type="file" name="import"/>
+        <input type="file" name="excel"/>
         <input type="submit" value="导入excel表格"/>
     </form>
 </div>