diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index 358c378..db67da8 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -586,8 +586,9 @@ export default {
 
           let fileName = item.FilePath
           let dotIndex = fileName.lastIndexOf('\\');
-          if (dotIndex > -1) fileName = fileName.substring(dotIndex, fileName.length);
-
+          let pointIndex = fileName.lastIndexOf('.');
+          if (dotIndex > -1) fileName = Date.now() + fileName.substring(dotIndex + 1, pointIndex || fileName.length);
+          
           let body = {
             registerCheckId: this.dataTransOpts.tableS.register_check.id,
             pictureBaseStrs: [{
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index cffa80b..0362b5a 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -72,19 +72,19 @@
               <thead>
                 <tr height="30">
                   <td class="tdCellClass">项目</td>
-                  <td class="tdCellClass">单位</td>
-                  <td class="tdCellClass">参考范围</td>
                   <td class="tdCellClass">{{ doctorCheck.preResult.checkDate || '结果' }}</td>
+                  <td class="tdCellClass">参考范围</td>
+                  <td class="tdCellClass">单位</td>
                 </tr>
               </thead>
               <tbody>
                 <tr v-for="(item, index) of doctorCheck.preResult.registerCheckItems || []" :key="index" height="30">
                   <td class="tdCellClass" style="text-align: left;">{{ item.itemName }}</td>
-                  <td class="tdCellClass">{{ item.unitName }}</td>
-                  <td class="tdCellClass">{{ item.referenceRangeValue }}</td>
                   <td
                     :style="`padding: 0 5px;text-align:left;color: ${item.itemName == '小结' ? '#000000' : getColorStr(item.reportFontColor)};`"
                     v-html="item.resultValue"></td>
+                  <td class="tdCellClass">{{ item.referenceRangeValue }}</td>
+                  <td class="tdCellClass">{{ item.unitName }}</td>
                 </tr>
                 <tr height="30">
                   <td class="tdCellClass" style="text-align: left;">小结</td>
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index 7249310..c8789d8 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -93,15 +93,15 @@
     <!-- 人员列表 -->
     <el-table :data="dataList" border width="100%" :height="tableHeight" row-key="id" size="small" highlight-current-row
       @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;"> 
-      <el-table-column type="index" label="序号" width="40" align="center" />   
-      <el-table-column prop="patientName" label="姓名" width="80" sortable align="center" />
-      <el-table-column prop="sexName" label="性别" sortable align="center" />
-      <el-table-column prop="age" label="年龄" width="40" align="center" />
+      <el-table-column type="index" label="序号" width="40" align="center" /> 
       <el-table-column prop="customerOrgParentName" label="单位" width="120" sortable show-overflow-tooltip>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
         </template>
-      </el-table-column>
+      </el-table-column>  
+      <el-table-column prop="patientName" label="姓名" width="80" sortable align="center" />
+      <el-table-column prop="sexName" label="性别" sortable align="center" />
+      <el-table-column prop="age" label="年龄" width="40" align="center" />
       <el-table-column prop="customerOrgName" label="部门" width="100" sortable show-overflow-tooltip>
         <template slot-scope="scope">
           <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 4985731..0435733 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -152,27 +152,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="5">
-                <el-form-item label="人员类别" prop="personnelTypeId">
-                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="5">
-                <el-form-item label="体检类别" prop="medicalTypeId">
-                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small"
-                    @change="changeMedicalTypeId">
-                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
-                      :value="item.id" />
-                  </el-select>
+                <el-form-item label="体检卡号" prop="medicalCardNo">
+                  <el-input v-model="form.medicalCardNo" size="small"></el-input>
                 </el-form-item>
-              </el-col>
-              <el-col :span="3" />
-            </el-row>
-            <el-row>
+              </el-col>              
               <el-col :span="3">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
                   <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small"
@@ -192,16 +175,33 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="3" />
+            </el-row>
+            <el-row>
               <el-col :span="5">
-                <el-form-item label="工卡号" prop="jobCardNo">
-                  <el-input v-model="form.jobCardNo" size="small"></el-input>
+                <el-form-item label="体检类别" prop="medicalTypeId">
+                  <el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
+                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small"
+                    @change="changeMedicalTypeId">
+                    <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
-                <el-form-item label="体检卡号" prop="medicalCardNo">
-                  <el-input v-model="form.medicalCardNo" size="small"></el-input>
+                <el-form-item label="人员类别" prop="personnelTypeId">
+                  <el-select v-model="form.personnelTypeId" placeholder="请选择" filterable clearable
+                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" size="small">
+                    <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
+                      :value="item.id" />
+                  </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="5">
+                <el-form-item label="工卡号" prop="jobCardNo">
+                  <el-input v-model="form.jobCardNo" size="small"></el-input>
+                </el-form-item>
+              </el-col>              
               <el-col :span="3">
                 <el-form-item label="职务" prop="jobPost">
                   <el-input v-model="form.jobPost" size="small"></el-input>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 1772e06..983f0aa 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -432,15 +432,15 @@
         <img width="100%" :src="qrCode.personUrl">
         <div style="font-size: 16px;">{{ qrCode.barcodeNo + ' ' + qrCode.patientName }}</div>
       </el-dialog>
-
-      <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogRecover" width="400" :append-to-body="true"
+      <!---->
+      <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogRecover" width="400px" :append-to-body="true"
         :close-on-click-modal="false">
-        <div class="query">
-          <span class="spanClass">条码号</span>
-          <el-input ref="tmh" v-model="patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+        <div class="query" >
+          <span class="spanClass">条码号</span> <!-- @change="signByPatientRegisterNo"  -->
+          <el-input ref="tmh" v-model="patientRegisterNo" @keyup.native.enter="signByPatientRegisterNo"></el-input>
         </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
+        <div slot="footer" class="dialog-footer">          
+          <el-button type="primary"   @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
           <el-button @click="dialogRecover = false" class="commonbutton">关闭</el-button>
         </div>
       </el-dialog>
diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index f903af8..1508347 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -113,11 +113,11 @@
           </download-excel>
       </div>
     </div>
-    <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogVisible" width="400" :append-to-body="true"
+    <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="dialogVisible" width="400px" :append-to-body="true"
       :close-on-click-modal="false">
       <div class="query">
-        <span class="spanClass">条码号</span>
-        <el-input ref="tmh" v-model="patientRegisterNo" @change="signByPatientRegisterNo"></el-input>
+        <span class="spanClass">条码号</span> <!-- @change="signByPatientRegisterNo" -->
+        <el-input ref="tmh" v-model="patientRegisterNo" @keyup.native.enter="signByPatientRegisterNo"></el-input>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>