diff --git a/public/sysConfig.json b/public/sysConfig.json
index 9b82a0f..956b438 100644
--- a/public/sysConfig.json
+++ b/public/sysConfig.json
@@ -1,7 +1,7 @@
 {
-    "apiurl": "http://192.168.5.52:9530",
+    "apiurl": "http://192.168.1.138:9527",
     "softName": "神豚体检管理系统",
-    "pacsApi": "http://192.168.5.52:9530",
+    "pacsApi": "http://192.168.1.138:9527",
     "dcmViewers": "https://app.mzaktj.com:4436",
     "pacsApiHttps": "https://app.mzaktj.com:8042",
     "dict":{
diff --git a/src/components/queue/Queue.vue b/src/components/queue/Queue.vue
index cd8b797..d9cc7cb 100644
--- a/src/components/queue/Queue.vue
+++ b/src/components/queue/Queue.vue
@@ -39,7 +39,7 @@
       <div style="display: flex;">
 
         <el-table :data="yesTriageAsbitemList" border row-key="id" height="270" highlight-current-row size="small"
-          ref="yesTriageAsbitemList">
+          ref="yesTriageAsbitemList" @row-click="rowClickQueue">
           <el-table-column label="房间" prop="roomName" min-width="80" align="center" />
           <el-table-column label="项目" min-width="150" prop="asbitemName">
             <template slot-scope="scope">
@@ -97,6 +97,7 @@ export default {
 
       curAsbitemId: '', // 当前选中 未分诊组合项目
       curRoomId: '', // 当前选中 房间
+      curQueueRow: {}, // 当前选扣的排队房间
     };
   },
 
@@ -145,6 +146,7 @@ export default {
       this.dictInit()
         .then(res => {
           //this.btnQuery()
+          this.curQueueRow = {}  // 清空已选排队信息
         })
         .catch(err => {
           console.log(err)
@@ -209,10 +211,22 @@ export default {
           })
           .catch(err => {
             reject(err)
+          })
+          .finally(() => {
+            // 清除选择
+            this.$refs['roomQueueList'].setCurrentRow();
+            this.$refs['notTriageAsbitemList'].setCurrentRow();
+            this.$refs['roomsForAsbitem'].setCurrentRow();
+            this.$refs['yesTriageAsbitemList'].setCurrentRow();
           });
       })
     },
 
+    // 选中已排队的信息
+    rowClickQueue(row) {
+      this.curQueueRow = row
+    },
+
     btnClose() {
       this.dialogWin.queue = false
       this.dialogWin.queue1 = false
@@ -289,19 +303,42 @@ export default {
 
     // 取消排队
     btnCancelQueue() {
-      if (!this.refParams.patientRegisterId) {
-        this.$message.warning({ showClose: true, message: '未获取到人员信息' })
-        return
-      }
-
-      postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', {
-        patientRegisterId: this.refParams.patientRegisterId
-      }).then(res => {
-        if (res.code > -1) {
-          this.$message.success({ showClose: true, message: '操作成功！' })
-          return this.dictInit()
+      // 有选择排队信息时，取消对应选中的排队信息
+      if (this.curQueueRow?.queueRegisterId) {
+        postapi('/api/app/QueueRegister/Delete', { queueRegisterId: this.curQueueRow.queueRegisterId })
+          .then(res => {
+            if (res.code > -1) {
+              this.curQueueRow = {}
+              return this.dictInit()
+            }
+          })
+      } else {
+        if (!this.refParams.patientRegisterId) {
+          this.$message.warning({ showClose: true, message: '未获取到人员信息' })
+          return
         }
-      })
+
+        this.$confirm("没用选中排队信息，则取消所有排队信息, 是否继续?", "提示", {
+          confirmButtonText: "是",
+          cancelButtonText: "否",
+          type: "warning",
+        })
+          .then(() => {
+            postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', {
+              patientRegisterId: this.refParams.patientRegisterId
+            }).then(res => {
+              if (res.code > -1) {
+                this.$message.success({ showClose: true, message: '操作成功！' })
+                return this.dictInit()
+              }
+            })
+          })
+          .catch((err) => {
+            if (err == "cancel") {
+              this.$message.info({ showClose: true, message: "已取消操作" });
+            }
+          });
+      }
     }
 
   },
diff --git a/src/components/room/RoomEdit.vue b/src/components/room/RoomEdit.vue
index 3542bcc..22e6a64 100644
--- a/src/components/room/RoomEdit.vue
+++ b/src/components/room/RoomEdit.vue
@@ -1,21 +1,6 @@
 <template>
   <div>
     <el-form :model="form" label-width="80px" :rules="rules" ref="form">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item prop="displayName" label="房间名称">
-            <el-input v-model="form.displayName" size="small" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="适用性别">
-            <el-select v-model="form.forSexId" placeholder="请选择" size="small" style="width:310px;">
-              <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item prop="medicalCenterId" label="体检中心">
@@ -26,13 +11,37 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item prop="displayName" label="房间名称">
+            <el-input v-model="form.displayName" size="small" />
+          </el-form-item>
+        </el-col>        
+      </el-row>
+      <el-row>        
+        <el-col :span="8">
           <el-form-item prop="itemTypeId" label="项目类别">
             <el-cascader :options="dict.itemTypeTree" v-model="form.itemTypeId" popper-class="example"
-              style="width:310px;" filterable size="small"
+              filterable size="small"
               :props="{ checkStrictly: true, expandTrigger: 'hover', label: 'displayName', value: 'id', id: 'id', children: 'treeChildren' }">
             </el-cascader>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item prop="queueRoomFlag" label="排队模式">
+            <el-select v-model="form.queueRoomFlag" placeholder="请选择" size="small" >
+              <el-option label="单房间模式" value="0" />
+              <el-option label="多房间模式--手动" value="1" />
+              <el-option label="多房间模式--自动" value="2" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="适用性别">
+            <el-select v-model="form.forSexId" placeholder="请选择" size="small" >
+              <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -98,7 +107,8 @@ export default {
         forSexId: "A",
         roomTypeFlag: "0",
         queueTime: 0,
-        isActive: "Y"
+        isActive: "Y",
+        queueRoomFlag: '0', //分诊模式 0-默认模式（单房间） 1-多房间模式 2-多房间模式， 并且启用自动排队（人员签到等模式）
       },
       formInit: {}, //表单初始值
       rules: {
diff --git a/src/components/room/room.vue b/src/components/room/room.vue
index 667e702..7f7371b 100644
--- a/src/components/room/room.vue
+++ b/src/components/room/room.vue
@@ -31,8 +31,8 @@
             <el-table :data="tableData" ref="tableData" style="margin-top: 2px" row-key="id" border height="340px"
               size="small" highlight-current-row :row-class-name="handleRowClassName" @row-click="rowClick" @row-dblclick="dblClick">
               <el-table-column type="index" label="序号" width="50" align="center" />
-              <el-table-column label="id" prop="id" min-width="200" align="center" />
-              <el-table-column label="房间号" prop="roomNo" min-width="60" align="center" sortable/>              
+              <el-table-column label="id" prop="id" min-width="300" align="center" />
+              <el-table-column label="房间号" prop="roomNo" min-width="70" align="center" sortable/>              
               <el-table-column prop="displayName" label="名称" min-width="150" sortable/>
               <el-table-column prop="medicalCenterId" label="体检中心" min-width="150" sortable>
                 <template slot-scope="scope">
@@ -59,12 +59,17 @@
                   <div>{{ scope.row.queueTime}} 分钟</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="isActive" label="启用" min-width="40" align="center" sortable>
+              <el-table-column prop="queueRoomFlag" label="房间类别" min-width="180" align="center" sortable>
+                <template slot-scope="scope">
+                  {{ dddw(queueRoomFlags, "id", scope.row.queueRoomFlag, "displayName") }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="isActive" label="启用" min-width="50" align="center" sortable>
                 <template slot-scope="scope">
                   <div style="font-family: 'Microsoft YaHei';">{{ scope.row.isActive == 'Y' ? '√' : '' }}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="creatorName" label="创建者" min-width="60" align="center" sortable/>
+              <el-table-column prop="creatorName" label="创建者" min-width="70" align="center" sortable/>
               <el-table-column label="创建时间" min-width="150" align="center" sortable>
                 <template slot-scope="scope">
                   {{ scope.row.creationTime ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
@@ -164,8 +169,14 @@ export default {
         forSexId: "A",
         roomTypeFlag: "0",
         queueTime: 0,
-        isActive: "Y"
+        isActive: "Y",
+        queueRoomFlag: '0', //分诊模式 0-默认模式（单房间） 1-多房间模式 2-多房间模式， 并且启用自动排队（人员签到等模式）
       },
+      queueRoomFlags:[
+        {id:'0',displayName:'单房间模式'},
+        {id:'1',displayName:'多房间模式--手动'},
+        {id:'2',displayName:'多房间模式--自动'}
+      ],
       formInit: {}, //表单初始值
       itemTypeId:"",
       backupTableData:[],