陪检优化

App.vue

@@ -219,4 +219,9 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
+  .ellipsis-oneline{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 </style>

components/fjj-condition/fjj-condition.vue

@@ -106,10 +106,7 @@
           <!-- 关键词 -->
           <view v-if="item.type == 'keyWord'">
             <view class="drawer-list-title flex justify-between">
-              <view>
-                {{item.title}}
-                <view style="color:red;font-size:28rpx;">(注:搜索住院号或检查项目名称)</view>
-              </view>
+              <view>{{item.title}}</view>
             </view>
             <view class="dateContent text-content flex">
               <view class="text-input">
@@ -127,7 +124,7 @@
             </view>
             <view class="dateContent sort-content flex">
               <checkbox-group @change="bedNumSortInputBlur">
-                <checkbox value="bedNumSort" :checked="bedNumSort" color="#49b856" />按床号排序
+                <checkbox value="bedNumSort" :checked="bedNumSort" color="#49b856" id="bedNumSort" /><label for="bedNumSort">按床号排序</label>
               </checkbox-group>
             </view>
           </view>
@@ -141,17 +138,33 @@
             <view class="dateContent inspectState-content flex">
               <!-- https://ext.dcloud.net.cn/plugin?id=1873#detail -->
               <ld-select :multiple="true" :list="inspectStateList" label-key="label" value-key="value" placeholder="请选择"
-                v-model="result.inspectState" @change="inspectStateChange" @parentCancel="parentCancel"></ld-select>
+                v-model="result.inspectState" @change="inspectStateChange"></ld-select>
             </view>
           </view>
-        </block>
-        <view class="filter-content-footer flex justify-center">
-          <view class="filter-content-footer-item" @tap="resetClick">
-            <text>重置</text>
-          </view>
-          <view class="filter-content-footer-item" :style="{color}" @tap="sureClick">
-            <text>确认</text>
+          <!-- 异常数据筛选 -->
+          <view v-if="item.type == 'abnormal'">
+            <view class="drawer-list-title flex justify-between">
+              <view>
+                {{item.title}}
+              </view>
+            </view>
+            <view class="checkContent">
+              <view class="">
+                <checkbox-group @change="noneEndDeptInputBlur">
+                  <checkbox value="noneEndDept" :checked="noneEndDept" color="#49b856" id="noneEndDept" /><label for="noneEndDept">未标记检查科室</label>
+                </checkbox-group>
+              </view>
+              <view class="">
+                <checkbox-group @change="noneYytimeInputBlur">
+                  <checkbox value="noneYytime" :checked="noneYytime" color="#49b856" id="noneYytime" /><label for="noneYytime">无预约时间检查</label>
+                </checkbox-group>
+              </view>
+            </view>
           </view>
+        </block>
+        <view class="foot_btn_spe">
+          <view class="btn3" style="background-image: none;background-color: #AFAFAF;" @tap="closeDrawer">取消</view>
+          <view class="btn1" @tap="sureClick">保存</view>
         </view>
       </scroll-view>
     </uni-drawer>
@@ -189,6 +202,12 @@
       bedNumSortGvie: {
         type: Boolean,
       },
+      noneEndDeptGvie: {
+        type: Boolean,
+      },
+      noneYytimeGvie: {
+        type: Boolean,
+      },
       list: {
         required: true,
         type: Array,
@@ -214,6 +233,8 @@
     created() {
       this.keyWord = this.keyWordGvie || '';
       this.bedNumSort = this.bedNumSortGvie;
+      this.noneEndDept = this.noneEndDeptGvie;
+      this.noneYytime = this.noneYytimeGvie;
       this.resetResult();
       uni.getSystemInfo({
         success: (res) => {
@@ -268,18 +289,11 @@
         maxNumber: "",
         keyWord: "",
         bedNumSort: false,
+        noneEndDept: false,
+        noneYytime: false,
       };
     },
     methods: {
-      parentCancel(flag) {
-        if (flag == 1) {
-          document.querySelector('.uni-drawer__content').style.width = '100vw';
-          document.querySelector('.drawer-list').style.padding = '0';
-        } else {
-          document.querySelector('.uni-drawer__content').style.width = '200px';
-          document.querySelector('.drawer-list').style.padding = '0 ' + uni.upx2px(20) + "px";
-        }
-      },
       getSelectedObj() {
         return this.commonResultObj();
       },
@@ -296,6 +310,8 @@
             (obj[item.key] = []) :
             item.type === "bedNumSort" ?
             (obj[item.key] = false) :
+            item.type === "abnormal" ?
+            (obj['noneEndDept'] = obj['noneYytime'] = false) :
             item.type === "inspectState" ?
             (obj[item.key] = ['1', '30']) :
             item.type === "single" ?
@@ -364,6 +380,8 @@
         this.maxNumber = "";
         this.keyWord = this.keyWordOld || '';
         this.bedNumSort = false;
+        this.noneEndDept = false;
+        this.noneYytime = false;
         this.single = [new Date().Format("yyyy/MM/dd")];
         for (let key in this.result) {
           if ((typeof this.result[key] == "object") && key != "inspectState") {
@@ -377,6 +395,9 @@
           } else {
             if (key == "bedNumSort") {
               this.result[key] = false;
+            } else if (key == "abnormal") {
+              this.result['noneEndDept'] = false;
+              this.result['noneYytime'] = false;
             } else if (key == "inspectState") {
               this.result[key] = ['1', '30'];
             } else {
@@ -453,6 +474,14 @@
         this.result.bedNumSort = e.detail.value.length > 0;
         this.bedNumSort = e.detail.value.length > 0;
       },
+      noneEndDeptInputBlur(e) {
+        this.result.noneEndDept = e.detail.value.length > 0;
+        this.noneEndDept = e.detail.value.length > 0;
+      },
+      noneYytimeInputBlur(e) {
+        this.result.noneYytime = e.detail.value.length > 0;
+        this.noneYytime = e.detail.value.length > 0;
+      },
       inspectStateChange(val) {
         this.result.inspectState = val;
       },
@@ -461,6 +490,31 @@
 </script>
 
 <style lang="scss" scoped>
+  .foot_btn_spe {
+    line-height: 88rpx;
+    height: 100rpx;
+    margin-top: 40rpx;
+    text-align: center;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+  
+    &::after {
+      content: '';
+      flex: 1;
+    }
+  
+    view {
+      height: 88rpx;
+      width: 48%;
+      margin: 0 1%;
+      background-image: linear-gradient(to right, #72c172, #3bb197);
+      color: #fff;
+      border-radius: 8rpx;
+      font-size: 32rpx;
+      margin-top: 16rpx;
+    }
+  }
   .flex {
     display: flex;
   }
@@ -495,7 +549,7 @@
     font-size: 34rpx;
     font-weight: 400;
     line-height: 48rpx;
-    margin: 38rpx 0 18rpx;
+    padding: 38rpx 0 18rpx;
     color: rgba(34, 34, 34, 1);
   }
 
@@ -534,7 +588,18 @@
 
   .dateContent {
     &>view {
-      background: rgba(244, 244, 244, 1);
+      border: 2rpx solid #ECECEC;
+      border-radius: 8rpx;
+      width: 100%;
+      height: 64rpx;
+      line-height: 64rpx;
+      margin-bottom: 12rpx;
+    }
+  }
+  
+  .checkContent {
+    &>view {
+      font-size: 15px !important;
       border-radius: 8rpx;
       width: 100%;
       height: 64rpx;

components/inspectExecDeptModel/inspectExecDeptModel.vue

@@ -0,0 +1,308 @@
+<template>
+	<view class="changeHospital" v-show="disjunctor">
+		<view class="changeHospital__wrap">
+			<view class="changeHospital__header" v-if="title">
+				<text v-if="icon" class="changeHospital__icon newicon" :class="[
+				    'changeHospital__icon--' + icon,
+				    { 'newicon-duigou': icon === 'success' },
+				    { 'newicon-shibai': icon === 'error' },
+				    { 'newicon-wenhao': icon === 'warn' },
+				  ]"></text>{{ title }}
+			</view>
+			<view class="changeHospital__article">
+				<view v-if="content" class="changeHospital__content" v-html="content"></view>
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						检查科室：
+					</view>
+					<view class="uni-list-cell-db-text">
+            <picker style="height: 100%;" @change="bindPickerChange" :value="index" :range="execDeptList" range-key="dept">
+              <view class="uni-input ellipsis-oneline" :style="{ color: execDeptList[index] ? '' : '#CFCFCF'}">{{execDeptList[index]?execDeptList[index].dept:'请选择检查科室'}}</view>
+            </picker>
+					</view>
+				</view>
+			</view>
+			<view class="changeHospital__footer">
+				<view v-if="operate.ok" class="changeHospital__ok" @click="ok" hover-class="seimin-btn-hover">
+					{{ operate.ok || "" }}
+				</view>
+				<view v-if="operate.cancel" class="changeHospital__cancel" @click="cancel"
+					hover-class="seimin-btn-hover">
+					{{ operate.cancel || "" }}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		post
+	} from "../../http/http.js";
+	export default {
+		data() {
+			return {
+				userData: null,
+				hosId: null,
+				timer: null,
+        index: -1,
+			};
+		},
+		watch: {
+			disjunctor(newValue) {
+				console.log(newValue)
+				if(newValue){
+          this.index = this.execDeptList.findIndex(v => v.id == this.execDeptId)
+				}
+				if (newValue && this.operate.know == "返回") {
+					this.time = 5;
+					this.timer = setInterval(() => {
+						this.time--;
+						if (this.time <= 0) {
+							clearInterval(this.timer);
+							this.know();
+						}
+					}, 1000);
+				}
+			},
+		},
+		props: {
+			// 显示隐藏
+			disjunctor: {
+				type: Boolean,
+				default: false,
+			},
+      // 检查科室列表
+			execDeptList: {
+				type: Array,
+				default: () => [],
+			},
+			// 检查科室
+			execDeptId: {
+				type: Number,
+			},
+      // 标题
+			title: {
+				type: String,
+				default: "提示",
+			},
+			// 图标
+			icon: {
+				type: String,
+				default: "success",
+			},
+			// 内容
+			content: {
+				type: String,
+				default: "",
+			},
+			// 操作按钮文字
+			operate: {
+				type: Object,
+				default: () => {
+					return {
+						ok: "确认",
+						cancel: "取消",
+					};
+				},
+			},
+			name: {
+				type: String,
+				default: '交接人'
+			}
+		},
+		methods: {
+      bindPickerChange: function(e) {
+        this.index = e.detail.value
+      },
+			// 确定
+			ok() {
+        if (this.index < 0) {
+          uni.showToast({
+            icon: 'none',
+            title: '请选择检查科室！'
+          })
+          return;
+        }
+				let e = {};
+				if (this.index > -1) {
+					e.execDeptId = this.execDeptList[this.index].id;
+				}
+				this.$emit("ok", e);
+			},
+			// 取消
+			cancel() {
+				this.$emit("cancel");
+			},
+		},
+		created() {
+			this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+  .changeHospital__icon {
+  	font-size: 40rpx;
+    margin-right: 8rpx;
+  	&.changeHospital__icon--success {
+  		color: rgb(52, 179, 73);
+  	}
+  
+  	&.changeHospital__icon--warn {
+  		color: rgb(245, 165, 35);
+  	}
+  
+  	&.changeHospital__icon--error {
+  		color: rgb(255, 58, 82);
+  	}
+  }
+	.changeHospital {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.2);
+		z-index: 999;
+
+		.uni-list-cell {
+			width: 95%;
+			display: flex;
+			flex-direction: row;
+			// justify-content: space-evenly;
+			align-items: center;
+			text-align: center;
+			margin-top: 32rpx;
+
+			.uni-list-cell-left {
+				font-size: 32rpx;
+				color: #666;
+        flex-shrink: 0;
+			}
+
+			.uni-list-cell-db {
+				border: 1px solid #e5e9ed;
+				background-color: #fff;
+				padding: 16rpx 0;
+				flex: 5;
+			}
+
+			.uni-list-cell-db-text {
+				flex: 1;
+				text-align: left;
+        border: 1px solid #DBDBDB;
+        padding: 0 8rpx;
+        height: 56rpx;
+        line-height: 56rpx;
+        border-radius: 4rpx;
+			}
+		}
+
+		.changeHospital__wrap {
+			width: 90vw;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+			background-color: #fff;
+			border-radius: 12rpx;
+			color: #666;
+
+			.changeHospital__header {
+				font-size: 36rpx;
+				color: #000;
+				height: 84rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.changeHospital__article {
+				width: 90%;
+				margin: 0 auto 25rpx;
+				padding: 48rpx 0;
+				background-color: rgb(249, 250, 251);
+				border: 2rpx solid rgb(229, 233, 237);
+				border-radius: 12rpx;
+				box-sizing: border-box;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				&.p0 {
+					padding: 0;
+				}
+
+				.changeHospital__content {
+					font-size: 32rpx;
+				}
+
+				.changeHospital__info {
+					font-size: 32rpx;
+					color: rgb(102, 102, 102);
+				}
+
+				.specialCloseFlag {
+					width: 90%;
+					height: 100%;
+					padding: 16rpx;
+				}
+
+				.radio-wrap {
+					.radio-item {
+						margin-top: 16rpx;
+
+						/deep/ .uni-radio-input-checked {
+							background-color: #49b856 !important;
+							border-color: #49b856 !important;
+						}
+					}
+				}
+			}
+
+			.changeHospital__footer {
+				box-sizing: border-box;
+				height: 100rpx;
+				border-top: 2rpx solid rgb(229, 233, 237);
+				display: flex;
+				align-items: center;
+
+				view {
+					height: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 36rpx;
+					color: rgb(102, 102, 102);
+					position: relative;
+
+					&:nth-of-type(2)::before {
+						content: "";
+						position: absolute;
+						left: 0;
+						bottom: 0;
+						width: 2rpx;
+						height: 87rpx;
+						background-color: rgb(229, 233, 237);
+					}
+				}
+
+				.changeHospital__ok {
+					flex: 1;
+					color: rgb(73, 184, 86);
+				}
+
+				.changeHospital__cancel {
+					flex: 1;
+				}
+
+				.changeHospital__know {
+					flex: 1;
+					color: rgb(73, 184, 86);
+				}
+			}
+		}
+	}
+</style>

components/inspectRemoveModel/inspectRemoveModel.vue

@@ -2,15 +2,14 @@
 	<view class="changeHospital" v-show="disjunctor">
 		<view class="changeHospital__wrap">
 			<view class="changeHospital__header" v-if="title">
-				{{ title }}
-			</view>
-			<view class="changeHospital__article">
 				<text v-if="icon" class="changeHospital__icon newicon" :class="[
 				    'changeHospital__icon--' + icon,
 				    { 'newicon-duigou': icon === 'success' },
 				    { 'newicon-shibai': icon === 'error' },
 				    { 'newicon-wenhao': icon === 'warn' },
-				  ]"></text>
+				  ]"></text>{{ title }}
+			</view>
+			<view class="changeHospital__article">
 				<view v-if="content" class="changeHospital__content" v-html="content"></view>
 				<view class="uni-list-cell" v-show="remove">
 					<view class="uni-list-cell-left">
@@ -84,7 +83,7 @@
 				if(newValue){
 					this.startTimestamp = Date.now();
 					this.current = -1;
-					this.yyTime = '';
+					this.yyTime = this.yy ? new Date(this.yy) : '';
 				}
 				if (newValue && this.operate.know == "返回") {
 					this.time = 5;
@@ -99,6 +98,11 @@
 			},
 		},
 		props: {
+      // 预约时间
+      yy: {
+      	type: String,
+      	default: '',
+      },
 			// 是否移除检查
 			remove: {
 				type: Boolean,
@@ -173,6 +177,21 @@
 </script>
 
 <style lang="less" scoped>
+  .changeHospital__icon {
+  	font-size: 40rpx;
+    margin-right: 8rpx;
+  	&.changeHospital__icon--success {
+  		color: rgb(52, 179, 73);
+  	}
+  
+  	&.changeHospital__icon--warn {
+  		color: rgb(245, 165, 35);
+  	}
+  
+  	&.changeHospital__icon--error {
+  		color: rgb(255, 58, 82);
+  	}
+  }
 	.changeHospital {
 		position: fixed;
 		left: 0;
@@ -246,25 +265,8 @@
 					padding: 0;
 				}
 
-				.changeHospital__icon {
-					font-size: 138rpx;
-					margin-bottom: 32rpx;
-
-					&.changeHospital__icon--success {
-						color: rgb(52, 179, 73);
-					}
-
-					&.changeHospital__icon--warn {
-						color: rgb(245, 165, 35);
-					}
-
-					&.changeHospital__icon--error {
-						color: rgb(255, 58, 82);
-					}
-				}
-
 				.changeHospital__content {
-					font-size: 36rpx;
+					font-size: 32rpx;
 				}
 
 				.changeHospital__info {

components/showModel/showModel.vue

@@ -2,10 +2,6 @@
   <view class="showModel" v-show="disjunctor">
     <view class="showModel__wrap">
       <view class="showModel__header" v-if="title">
-        {{ title }}
-        <text v-if="operate.know == '返回' && timerFlag">({{ time }})</text>
-      </view>
-      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length, p2: childrenDeptList.length || busyContentList.length }">
         <text
           v-if="icon"
           class="showModel__icon newicon"
@@ -15,7 +11,10 @@
             // { 'newicon-shibai': icon === 'error' },
             { 'newicon-wenhao': icon === 'warn' },
           ]"
-        ></text>
+        ></text>{{ title }}
+        <text v-if="operate.know == '返回'">({{ time }})</text>
+      </view>
+      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length, p2: childrenDeptList.length || busyContentList.length }">
         <view v-if="content" class="showModel__content" @click="tel()" v-html="content"></view>
         <view v-if="info" class="showModel__info">{{ info }}</view>
         <view class="specialCloseFlag" v-if="textareaFlag">
@@ -239,6 +238,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.showModel__icon {
+  font-size: 40rpx;
+  margin-right: 8rpx;
+
+  &.showModel__icon--success {
+    color: rgb(52, 179, 73);
+  }
+
+  &.showModel__icon--warn {
+    color: rgb(245, 165, 35);
+  }
+
+  &.showModel__icon--error {
+    color: rgb(255, 58, 82);
+  }
+}
 .showModel {
   position: fixed;
   left: 0;
@@ -309,23 +324,6 @@ export default {
         }
       }
 
-      .showModel__icon {
-        font-size: 138rpx;
-        margin-bottom: 32rpx;
-
-        &.showModel__icon--success {
-          color: rgb(52, 179, 73);
-        }
-
-        &.showModel__icon--warn {
-          color: rgb(245, 165, 35);
-        }
-
-        &.showModel__icon--error {
-          color: rgb(255, 58, 82);
-        }
-      }
-
       .showModel__content {
         font-size: 36rpx;
         word-break: break-all;

components/uni-drawer/uni-drawer.vue

@@ -87,7 +87,7 @@
 
 <style lang="scss" scoped>
 	// 抽屉宽度
-	$drawer-width: 220px;
+	$drawer-width: 615rpx;
 	.uni-drawer {
 		/* #ifndef APP-NVUE */
 		display: block;

pages/inspectList/inspectList.vue

@@ -4,10 +4,9 @@
       <view class="page_tab_bar active">
         <view class="tab_dept">
           <text @click="changeDept">{{ currenDept.dept}}</text>
-          <button class="changeDept" type="default" size="mini" @click="moreFilter()">
-            更多筛选
-          </button>
+          <text class="newicon newicon-weibiaoti2010104" @click="changeDept"></text>
         </view>
+        <text class="moreFilter newicon newicon-shaixuan" @click="moreFilter"></text>
       </view>
     </view>
     <view v-if="zxzData.length == 0" class="zwsj">
@@ -21,78 +20,85 @@
         refresher-background="transport">
         <view class="page_item_wrap" v-for="(item, index) of zxzData" :key="index">
           <view class="page_item">
-            <view class="L"></view>
-            <view class="R"></view>
             <view class="page_item_top">
               <view class="page_item_top_L">
-                <template v-if="item.illnessState">
-                  <text v-if="item.illnessState.value === '2'"
-                    class="colorRed newicon newicon-tubiao_wei"></text>
-                  <text v-if="item.illnessState.value === '3'" class="colorRed newicon newicon-zhong"></text>
-                </template>
-                <template v-if="item.careLevel">
-                  <text v-if="item.careLevel.value === '0'" class="newicon newicon-te1"></text>
-                  <text v-if="item.careLevel.value === '1'" class="newicon newicon-1_round_solid"></text>
-                  <text v-if="item.careLevel.value === '2'" class="newicon newicon-2_round_solid"></text>
-                  <text v-if="item.careLevel.value === '3'" class="newicon newicon-3_round_solid"></text>
-                </template>
-                <text class="L_time"
-                  :style="{ color: item.focusPatient == 1 ? 'red' : '' }">{{ item.patientName }}({{ item.bedNum }})</text>
+                <view class="L_time" @click="toPatientDetail(item)">
+                  <template v-if="!item.execDept">
+                    <!-- 没有标记出行方式 -->
+                    <view class="circle"></view>
+                    <view class="circle"></view>
+                    <view class="circle"></view>
+                  </template>
+                  <template v-else-if="!item.yyTime">
+                    <!-- 没有预约时间 -->
+                    <view class="circle"></view>
+                    <view class="circle"></view>
+                  </template>
+                  <template v-else-if="!(item.patientDTO && item.patientDTO.tripTypeDTO)">
+                    <!-- 没有检查科室 -->
+                    <view class="circle"></view>
+                  </template>
+                  {{ item.patientName }}({{ item.bedNum }})
+                </view>
               </view>
               <view class="page_item_top_R">
                 <text>{{item.inspectState?item.inspectState.name:''}}</text>
-                <button @click="build(item)"
-                  v-if="!item.gdId&&(item.inspectState.value==1||item.inspectState.value==30)">建单</button>
+                <button @click="build(item)" v-if="!item.gdId&&(item.inspectState.value==1||item.inspectState.value==30)&&item.execDept">建单</button>
                 <button @click="viewWorkOrder(item)" v-if="item.gdId">查看工单</button>
               </view>
             </view>
             <view class="page_item_cont">
               <view class="page_item_conts">
-                <view>
-                  <text class="p_title">住院号：</text>
-                  <text class="p_info">{{ item.residenceNo || "-" }}</text>
+                <view class="page_item_conts_item">
+                  <view class="column">
+                    <text class="p_title">住院号：</text>
+                    <text class="p_info">{{ item.residenceNo }}</text>
+                  </view>
+                  <view class="column">
+                    <text class="p_title">出行方式：</text>
+                    <text class="p_info">{{ (item.patientDTO && item.patientDTO.tripTypeDTO) ? item.patientDTO.tripTypeDTO.inspectMode : '' }}</text>
+                  </view>
                 </view>
-                <view>
+                <view class="page_item_conts_item">
                   <text class="p_title">检查科室：</text>
-                  <text class="p_info">{{
-                    item.execDept ? item.execDept.dept : "-"
-                  }}</text>
+                  <text class="p_info">{{ item.execDept ? item.execDept.dept : "" }}<text class="newicon newicon-weibiaoti2010104 fz28" @click="changeExecDept(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></text>
                 </view>
-                <view>
+                <view class="page_item_conts_item">
                   <text class="p_title">检查项目：</text>
-                  <text class="p_info">{{ item.inspectName || "-" }}</text>
+                  <text class="p_info">{{ item.inspectName }}</text>
                 </view>
-                <view class="btn">
+                <view class="page_item_conts_item btn">
                   <text class="p_title">预约时间：</text>
-                  <text class="p_info">{{ item.yyTime || "-" }}</text>
-									<button @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30">修改</button>
-                </view>
-                <view>
-                  <text class="p_title">预约叫号：</text>
-                  <text class="p_info">{{
-                    item.reservationNumber || "-"
-                  }}</text>
+                  <text class="p_info">{{ item.yyTime }}<text class="newicon newicon-weibiaoti2010104 fz28" @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></text>
                 </view>
-                <view>
-                  <text class="p_title">是否紧急：</text>
-                  <text class="p_info"
-                    :class="{red:item.priority==='1'||item.priority===1}">{{(item.priority==='1'||item.priority===1)?'是':'否'}}</text>
+                <view class="page_item_conts_item">
+                  <view class="column">
+                    <text class="p_title">预约叫号：</text>
+                    <text class="p_info">{{ item.reservationNumber }}</text>
+                  </view>
+                  <view class="column">
+                    <text class="p_title">是否紧急：</text>
+                    <text class="p_info" :class="{red:item.priority==='1'||item.priority===1}">{{(item.priority==='1'||item.priority===1)?'是':'否'}}</text>
+                  </view>
                 </view>
-                <view>
-                  <text class="p_title">护理等级：</text>
-                  <text class="p_info"
-                    :class="{red:item.careLevel&&(item.careLevel.value==0||item.careLevel.value==1)}">{{item.careLevel?item.careLevel.name:'-'}}</text>
+                <view class="page_item_conts_item">
+                  <view class="column">
+                    <text class="p_title">护理等级：</text>
+                    <text class="p_info" :class="{red:item.careLevel&&(item.careLevel.value==0||item.careLevel.value==1)}">{{item.careLevel?item.careLevel.name:''}}</text>
+                  </view>
+                  <view class="column">
+                    <text class="p_title">病情级别：</text>
+                    <text class="p_info"
+                      :class="{red:item.illnessState&&(item.illnessState.value==2||item.illnessState.value==3)}">{{item.illnessState?item.illnessState.name:''}}</text>
+                  </view>
                 </view>
-                <view>
-                  <text class="p_title">病情级别：</text>
-                  <text class="p_info"
-                    :class="{red:item.illnessState&&(item.illnessState.value==2||item.illnessState.value==3)}">{{item.illnessState?item.illnessState.name:'-'}}</text>
+                <view class="page_item_conts_item">
+                  <text class="p_title">注意事项：</text>
+                  <text class="p_info">{{ item.patientDTO ? item.patientDTO.remark : '' }}</text>
                 </view>
               </view>
             </view>
           </view>
-          <view class="L-l"></view>
-          <view class="R-l"></view>
         </view>
       </scroll-view>
     </view>
@@ -100,12 +106,14 @@
     <bigScreen></bigScreen>
     <!-- 筛选 -->
     <fjj-condition @touchmove.stop :list="list" :visibleDrawer="visibleDrawer" @result="resultConditon"
-      :keyWordGvie="searchlist.keyWord" :keyWordOld="keyWordOld" :bedNumSortGvie="searchlist.bedNumSort" :inspectStateList="inspectStateList" />
+      :keyWordGvie="searchlist.keyWord" :keyWordOld="keyWordOld" :bedNumSortGvie="searchlist.bedNumSort" :noneEndDeptGvie="searchlist.noneEndDept" :noneYytimeGvie="searchlist.noneYytime" :inspectStateList="inspectStateList" />
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
 		<!-- 弹窗 -->
-		<inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1"></inspectRemoveModel>
+		<inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :yy="currentInspect.yyTime"></inspectRemoveModel>
+    <!-- 弹窗 -->
+    <inspectExecDeptModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content" @know="know2" :operate="models2.operate" @ok="ok2" @cancel="cancel2" :execDeptList="currentInspect.inspectCheckType && currentInspect.inspectCheckType.deptList" :execDeptId="currentInspect.execDeptId"></inspectExecDeptModel>
   </view>
 </template>
 <script>
@@ -123,11 +131,15 @@
     data() {
       return {
 				keyWordOld: '',
-				currentInspect: null,
+				currentInspect: {},
 				// 弹窗model1
 				models1: {
 				  disjunctor: false,
 				},
+        // 弹窗model1
+        models2: {
+          disjunctor: false,
+        },
         // 记录当前滚动条的位置
         scrollYY: 0,
         // 建单的对象
@@ -159,6 +171,11 @@
             type: "inspectState", //检查信息状态
             key: "inspectState",
           },
+          {
+            title: "异常数据筛选",
+            type: "abnormal", //异常数据筛选
+            key: "abnormal",
+          },
         ],
         // 面板搜索数据
         searchlist: {
@@ -166,6 +183,8 @@
           keyWord: "",
           bedNumSort: false,
           inspectState: "1,30",
+          noneEndDept: false,
+          noneYytime: false,
         },
         // 检查信息状态列表
         inspectStateList: [],
@@ -190,6 +209,11 @@
       fjjCondition,
     },
     methods: {
+      toPatientDetail(data){
+        uni.navigateTo({
+          url: `/pages/patientInformationInfo/patientInformationInfo?patientCode=${data.patientCode}`,
+        });
+      },
 			// 修改预约时间->返回
 			know1() {
 			  this.models1.disjunctor = false;
@@ -254,6 +278,58 @@
 			    },
 			  };
 			},
+      // 修改检查科室
+			changeExecDept(item) {
+			  this.currentInspect = item;
+        if(this.currentInspect.inspectCheckType){
+          this.currentInspect.inspectCheckType.deptList = this.currentInspect.inspectCheckType.deptList || [];
+        }
+			  this.models2 = {
+			    disjunctor: true,
+			    content: `请选择[${item.patientName||''}]检查项目的检查科室`,
+			    icon: "warn",
+			    operate: {
+			      ok: "确定",
+			      cancel: "取消",
+			    },
+			  };
+			},
+      // 修改检查科室->返回
+      know2() {
+        this.models2.disjunctor = false;
+      },
+      // 修改检查科室->确定
+      ok2(data) {
+      	console.log(data);
+      	const { execDeptId } = data;
+        this.models2.disjunctor = false;
+        let postData = {
+          "id": this.currentInspect.id,
+          "execDeptId": execDeptId
+        };
+        
+        uni.showLoading({
+          title: '加载中',
+          mask: true,
+        })
+        post('/simple/data/updData/inspect', postData).then(res => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.idx = 0;
+            this.totalNum = -1;
+            this.waitingOrders(0);
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "修改失败",
+            });
+          }
+        })
+      },
+      // 修改检查科室->取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
       // 更多筛选
       moreFilter() {
         uni.showLoading({
@@ -413,6 +489,8 @@
             yyTime: obj.str_result.yyTime,
             keyWord: obj.str_result.keyWord,
             bedNumSort: obj.str_result.bedNumSort,
+            noneEndDept: obj.str_result.noneEndDept,
+            noneYytime: obj.str_result.noneYytime,
             inspectState: obj.str_result.inspectState,
           };
           this.idx = 0;
@@ -441,6 +519,7 @@
           idx,
           sum: 99999,
           inspect: {
+            queryInspect: 1,
             hosId: uni.getStorageSync("userData").user.currentHospital.id,
             platForm: 2,
             searchDays: 10000,
@@ -448,6 +527,8 @@
               id: this.currenDept.id,
             },
             clickSort: this.searchlist.bedNumSort,
+            noneEndDept: this.searchlist.noneEndDept ? 1 : undefined,
+            noneYytime: this.searchlist.noneYytime ? 1 : undefined,
             yyTime: this.searchlist.yyTime.split("/").join("-") + " 00:00:00",
           },
         };
@@ -585,25 +666,56 @@
     },
   };
 </script>
-<style lang="less">
+<style lang="less" scoped>
+  .toolbar {
+    position: fixed;
+    left: 0;
+    bottom: var(--window-bottom);
+    z-index: 99;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    box-sizing: border-box;
+    border-radius: 4rpx;
+    background-color: #E5E8ED;
+  
+    .toolbar-icon {
+      font-size: 52rpx;
+      margin-right: 16rpx;
+      color: #49B856;
+    }
+  
+    .toolbar-sao {
+      font-size: 36rpx;
+      color: #333;
+    }
+  }
+  .newicon-weibiaoti2010104 {
+    font-size: 32rpx;
+    padding-left: 5rpx;
+    color: #8A8A8A;
+    &.fz28{
+      font-size: 28rpx;
+    }
+  }
+  button {
+    font-size: 24rpx;
+    color: #49b856;
+    height: 48rpx;
+    margin: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
   .inspectList {
     width: 100%;
     height: 100%;
     position: relative;
 
-    .newicon {
-      color: #49b856;
-      font-size: 36rpx;
-
-      &.colorRed {
-        color: red;
-        font-size: 32rpx;
-      }
-    }
-
     .page_tab {
       width: 100%;
-      height: 96rpx;
+      height: 90rpx;
       display: flex;
       position: fixed;
       left: 0;
@@ -612,42 +724,25 @@
 
       .page_tab_bar {
         flex: 1;
-        font-size: 36rpx;
+        font-size: 30rpx;
         background: #fff;
         display: flex;
         justify-content: center;
         align-items: center;
         position: relative;
-
-        &:after {
-          content: "";
-          position: absolute;
-          left: 0;
-          bottom: 0;
-          height: 2rpx;
-          width: 100%;
-          background-color: transparent;
-        }
+        border-bottom: 8rpx solid #49B856;
 
         .tab_dept {
           position: relative;
-
-          .changeDept {
-            width: 140rpx;
-            white-space: nowrap;
-            margin: 0;
-            position: absolute;
-            right: 0;
-            top: 50%;
-            transform: translate(105%, -50%);
-            padding: 0 0.5em;
-            line-height: 2;
-          }
-
-          .moreFilter {
-            left: 0;
-            transform: translate(-105%, -50%);
-          }
+        }
+        
+        .moreFilter {
+          width: 48rpx;
+          position: absolute;
+          right: 16rpx;
+          top: 50%;
+          transform: translateY(-50%);
+          color: #8A8A8A;
         }
 
         &.active {
@@ -679,19 +774,20 @@
     }
 
     .page_items {
-      height: calc(100vh - 184rpx);
-      padding: 0 20rpx;
-      padding-top: 96rpx;
+      height: calc(100vh - 164rpx);
+      padding-top: 90rpx;
 
       .page_items_scroll {
         height: 100%;
 
         .page_item_wrap {
           position: relative;
-          margin-bottom: 32rpx;
+          margin-top: 8rpx;
+          &:last-of-type{
+            padding-bottom: 24rpx;
+          }
 
           .page_item {
-            margin-bottom: 16rpx;
             background: #fff;
             border-radius: 8rpx;
             overflow: hidden;
@@ -736,14 +832,33 @@
                 float: left;
                 display: flex;
                 align-items: center;
-                line-height: 88rpx;
                 text-overflow: ellipsis;
                 overflow: hidden;
                 white-space: nowrap;
-                color: #6cc076;
 
                 .L_time {
-                  font-size: 28rpx;
+                  font-size: 30rpx;
+                  font-weight: bold;
+                  position: relative;
+                  display: flex;
+                  align-items: center;
+                  &:after{
+                    content: '';
+                    position: absolute;
+                    left: 0;
+                    bottom: 0;
+                    height: 1px;
+                    width: 100%;
+                    background: #000;
+                  }
+                  .circle{
+                    display: inline-block;
+                    width: 12rpx;
+                    height: 12rpx;
+                    background-color: red;
+                    border-radius: 50%;
+                    margin-right: 8rpx;
+                  }
                 }
               }
 
@@ -754,47 +869,29 @@
                 justify-content: space-between;
 
                 text {
-                  font-size: 28rpx;
+                  font-size: 30rpx;
                   color: #49b856;
                   margin-right: 16rpx;
                 }
-
-                button {
-                  font-size: 28rpx;
-                  color: #49b856;
-                  height: 50rpx;
-                  line-height: 50rpx;
-                  margin: 0;
-                }
               }
             }
 
             .page_item_cont {
-              padding: 16rpx;
+              padding: 0 32rpx;
               text-align: left;
               position: relative;
 
               .page_item_conts {
                 color: rgb(102, 102, 102);
-                font-size: 28rpx;
+                font-size: 26rpx;
 
-                view {
-                  margin-bottom: 10rpx;
-                  margin-left: 40rpx;
+                .page_item_conts_item {
+                  margin-bottom: 16rpx;
                   display: flex;
-                }
-								.btn{
-									button {
-									  font-size: 28rpx;
-									  color: #49b856;
-									  height: 50rpx;
-									  line-height: 50rpx;
-									  margin: 0;
-									}
-								}
-
-                .p_title {
-                  width: 160rpx;
+                  justify-content: space-between;
+                  &:first-of-type{
+                    margin-top: 16rpx;
+                  }
                 }
 
                 .p_info {

pages/patientInformationInfo/patientInformationInfo.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="patientInformationInfo" v-if="Object.keys(infoDATA).length > 0">
 		<view class="page_head">
-			<view class="title">{{ infoDATA.patientName }}<text class="patientCode">{{ infoDATA.residenceNo }}</text></view>
+			<view class="title">{{ infoDATA.patientName }}<text class="patientCode">{{ infoDATA.residenceNo }}({{ infoDATA.bedNum }})</text></view>
 			<view class="info">
+        <view class="bedNum" v-if="infoDATA.tripTypeDTO">
+        	<text class="info_h">陪检方式</text>
+        	<text class="info_b">{{ infoDATA.tripTypeDTO ? infoDATA.tripTypeDTO.inspectMode : '' }}</text>
+        </view>
 				<view :class="(infoDATA.careLevel || infoDATA.illnessState)?'bedNum':'waitingCount'">
-					<text class="info_h">床号</text>
-					<text class="info_b">{{ infoDATA.bedNum }}</text>
-				</view>
-				<!-- <view :class="(infoDATA.careLevel || infoDATA.illnessState)?'bedNum':'waitingCount'">
 					<text class="info_h">待检查数</text>
 					<text class="info_b">{{ infoDATA.watingCount }}</text>
-				</view> -->
+				</view>
 				<view class="bedNum" v-if="infoDATA.careLevel">
 					<text class="info_h">护理等级</text>
 					<text class="info_b">{{ infoDATA.careLevel.name }}</text>
@@ -20,6 +20,9 @@
 					<text class="info_b">{{ infoDATA.illnessState.name }}</text>
 				</view>
 			</view>
+      <view class="remark">
+        <text class="remarkTitle">注意事项：</text><text class="remarkInfo">{{infoDATA.remark}}</text>
+      </view>
 		</view>
     <scroll-view v-if="!isEmpty" scroll-y class="scrollContent">
       <view class="page_item" v-for="(inspects, key, index) in infoDATA.inspectListMap" :key="key">
@@ -32,34 +35,42 @@
             <view class="splitLineBox"></view>
           </view>
         </view>
-        <view class="page_item_info" :class="{mt0: i === 0}" v-for="(item, i) in inspects" :key="item.id">
-          <view class="page_item_info_title">检查项目：<text class="bold">{{ item.inspectName }}</text></view>
-          <view class="page_item_info_title">检查科室：<text>{{ item.execDept ? item.execDept.dept : "" }}</text></view>
-          <view class="page_item_info_title btn row">
-            <view>预约时间：<text>{{ item.yyTime | filterSecondDate }}</text><text v-if="item.reservationNumber">（{{ item.reservationNumber }}）</text></view>
-            <button @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30">修改</button>
+        <checkbox-group @change="checkboxChange($event, key)">
+          <view class="page_item_info" :class="{mt0: i === 0}" v-for="(item, i) in inspects" :key="item.id">
+            <label class="page_item_info_title" style="display: inline-block;width: 100%;">
+              <checkbox color="#49B856" :value="item.id + ''" :checked="item.checked" />
+              检查项目：<text class="bold">{{ item.inspectName }}</text></label>
+            <view class="page_item_info_title"><text :class="{red: !item.execDept}">检查科室：</text><text>{{ item.execDept ? item.execDept.dept : "" }}<text class="newicon newicon-weibiaoti2010104 fz28" @click="changeExecDept(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></text></view>
+            <view class="page_item_info_title btn row">
+              <view><text :class="{red: !item.yyTime}">预约时间：</text><text>{{ item.yyTime | filterSecondDate }}</text><text v-if="item.reservationNumber">（{{ item.reservationNumber }}）</text><text class="newicon newicon-weibiaoti2010104" @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></view>
+            </view>
+            <view class="page_item_info_title row">
+              <view>是否紧急：<text :class="{red:item.priority===1||item.priority==='1'}">{{ (item.priority===1||item.priority==='1')?'是':'否' }}</text></view>
+              <view>状态：<text v-if="item.inspectState">{{ item.inspectState.name }}</text></view>
+            </view>
+            <view class="buildOrder" @click="build(item)" v-if="!item.gdId&&(item.inspectState.value==1||item.inspectState.value==30)">建单</view>
           </view>
-          <view class="page_item_info_title row">
-            <view>是否紧急：<text :class="{red:item.priority===1||item.priority==='1'}">{{ (item.priority===1||item.priority==='1')?'是':'否' }}</text></view>
-            <view>状态：<text v-if="item.inspectState">{{ item.inspectState.name }}</text></view>
-          </view>
-          <view class="buildOrder" @click="build(item)" v-if="!item.gdId&&(item.inspectState.value==1||item.inspectState.value==30)">建单</view>
-        </view>
+        </checkbox-group>
       </view>
     </scroll-view>
 		<view v-if="isEmpty" class="zwsj">
 			<image class="zwsj-img" mode="widthFix" src="../../static/img/zanwushuju.png"></image>
 			<view class="zwsj-txt">暂无检查信息</view>
 		</view>
-    <view class="toolbar" @click="Scanning()">
-      <text class="toolbar-icon newicon newicon-saoma"></text>
-      <text class="toolbar-sao">扫一扫</text>
+    <view class="page_item_btns">
+      <view class="page_item_btn" hover-class="seimin-btn-hover" @click="buildOrders()">批量陪检</view>
+      <view class="toolbar" @click="Scanning()">
+        <text class="toolbar-icon newicon newicon-saoma"></text>
+        <text class="toolbar-sao">扫一扫</text>
+      </view>
     </view>
-		<!-- 弹窗 -->
-		<inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1"></inspectRemoveModel>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
+    <!-- 弹窗 -->
+    <inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :yy="currentInspect.yyTime"></inspectRemoveModel>
+    <!-- 弹窗 -->
+    <inspectExecDeptModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content" @know="know2" :operate="models2.operate" @ok="ok2" @cancel="cancel2" :execDeptList="currentInspect.inspectCheckType && currentInspect.inspectCheckType.deptList" :execDeptId="currentInspect.execDeptId"></inspectExecDeptModel>
 	</view>
 </template>
 <script>
@@ -72,6 +83,7 @@
 	export default {
 		data() {
 			return {
+        currentInspect: {},
         SMFlag: true,
         isEmpty: true,
 				options: {},
@@ -80,8 +92,12 @@
 				models1: {
 				  disjunctor: false,
 				},
+        // 弹窗model1
+        models2: {
+          disjunctor: false,
+        },
         // 建单的对象
-        jdItem: {},
+        jdItem: [],
         // 弹窗model
         models: {
           disjunctor: false,
@@ -89,16 +105,76 @@
 			};
 		},
 		methods: {
+      // 选择楼栋
+      checkboxChange: function(e, key) {
+        var dataList = this.infoDATA.inspectListMap[key],
+            values = e.detail.value;
+        for (var i = 0, lenI = dataList.length; i < lenI; ++i) {
+          const item = dataList[i]
+          if (values.includes(item.id + '')) {
+            this.$set(item, 'checked', true)
+          } else {
+            this.$set(item, 'checked', false)
+          }
+        }
+      },
+      // 批量陪检
+      buildOrders(){
+        let list = Object.values(this.infoDATA.inspectListMap).flat().filter(v => v.checked);
+        console.log(list);
+        if(list.length){
+          // 只要有一个没有检查科室
+          let inspectDTO = list.find(v => !v.execDept);
+          if(inspectDTO){
+            this.models = {
+              disjunctor: true,
+              title: "提示",
+              content: `<span class="red">${inspectDTO.inspectName || ''}</span>没有检查科室，不能建单`,
+              icon: "warn",
+              operate: {
+                know: "返回",
+              },
+            };
+            return;
+          }
+          this.jdItem = list;
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: `您选择<span class="red">${this.infoDATA.patientName || ""}</span>患者<span class="red">${list.length}</span>项检查，是否确认建单？`,
+            icon: "warn",
+            operate: {
+              ok: "确定",
+              cancel: "取消",
+            },
+          };
+        }else{
+          uni.showToast({
+            icon: "none",
+            title: "至少选择一个检查！",
+          });
+        }
+      },
       // 建单
       build(data) {
         console.log(data);
-        this.jdItem = data;
+        if(!data.execDept){
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: `<span class="red">${data.inspectName || ''}</span>没有检查科室，不能建单`,
+            icon: "warn",
+            operate: {
+              know: "返回",
+            },
+          };
+          return;
+        }
+        this.jdItem = [data];
         this.models = {
           disjunctor: true,
           title: "提示",
-          content: `您即将创建【${data.patientName || ""}】患者前往【${
-          data.execDept ? data.execDept.dept : ""
-        }】进行【${data.inspectName || ""}】检查，您确认吗？`,
+          content: `您即将创建<span class="red">${data.patientName || ""}</span>患者前往<span class="red">${ data.execDept ? data.execDept.dept : "" }</span>进行<span class="red">${data.inspectName || ""}</span>检查，您确认吗？`,
           icon: "warn",
           operate: {
             ok: "确定",
@@ -109,7 +185,7 @@
       //建单后返回
       know() {
         this.models.disjunctor = false;
-        this.getInfo(this.jdItem.patientCode);
+        this.getInfo(this.infoDATA.patientCode);
       },
       //建单确定
       ok() {
@@ -141,11 +217,9 @@
                     id: this.infoDATA.department.id
                   },
                   patient: {
-                    patientCode: this.jdItem.patientCode
+                    patientCode: this.infoDATA.patientCode
                   },
-                  checkList: [{
-                    id: this.jdItem.id
-                  }],
+                  checkList: this.jdItem,
                   goods: "",
                   worker: {
                     id: uni.getStorageSync("userData").user.id
@@ -154,14 +228,17 @@
                 },
               };
               //根据检查的紧急度加急
-              if (this.jdItem.priority === 1 || this.jdItem.priority === '1') {
-                postData.workOrder["urgentDetails"] = {
-                  checkStatus: {
-                    id: 329
-                  },
-                  urgentReason: '系统根据检查信息，自动进行加急',
-                };
-              }
+              this.jdItem.forEach(v => {
+                if (v.priority === 1 || v.priority === '1') {
+                  postData.workOrder["urgentDetails"] = {
+                    checkStatus: {
+                      id: 329
+                    },
+                    urgentReason: '系统根据检查信息，自动进行加急',
+                  };
+                }
+              })
+
               post("/api/startOrder", postData).then((res) => {
                 uni.hideLoading();
                 let msg = res.msg;
@@ -278,6 +355,56 @@
 			    },
 			  };
 			},
+      // 修改检查科室
+      changeExecDept(item) {
+        this.currentInspect = item;
+        if(this.currentInspect.inspectCheckType){
+          this.currentInspect.inspectCheckType.deptList = this.currentInspect.inspectCheckType.deptList || [];
+        }
+        this.models2 = {
+          disjunctor: true,
+          content: `请选择[${item.patientName||''}]检查项目的检查科室`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      // 修改检查科室->返回
+      know2() {
+        this.models2.disjunctor = false;
+      },
+      // 修改检查科室->确定
+      ok2(data) {
+      	console.log(data);
+      	const { execDeptId } = data;
+        this.models2.disjunctor = false;
+        let postData = {
+          "id": this.currentInspect.id,
+          "execDeptId": execDeptId
+        };
+        
+        uni.showLoading({
+          title: '加载中',
+          mask: true,
+        })
+        post('/simple/data/updData/inspect', postData).then(res => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.getInfo(this.options.patientCode);
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "修改失败",
+            });
+          }
+        })
+      },
+      // 修改检查科室->取消
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
 			// 请求详细页面的数据
 			getInfo(patientCode) {
 				uni.showLoading({
@@ -286,6 +413,7 @@
 				});
 				post("/nurse/workOrder/getPatientInspectInfo", {
 					patientCode,
+          queryInspect: 1,
 				}).then((res) => {
 					uni.hideLoading();
 					if (res.status == 200) {
@@ -317,28 +445,58 @@
 	};
 </script>
 <style lang="less" scoped>
-  .toolbar {
-    margin-bottom: 16rpx;
-    z-index: 999;
-    height: 88rpx;
+  /deep/ uni-checkbox:not([disabled]) .uni-checkbox-input:hover{
+    border-color: #49B856!important;
+  }
+  .page_item_btns{
     display: flex;
-    justify-content: center;
+    justify-content: space-between;
     align-items: center;
-    box-sizing: border-box;
-    border-radius: 4rpx;
-    background-color: #E5E8ED;
-
-    .toolbar-icon {
-      font-size: 52rpx;
-      margin-right: 16rpx;
-      color: #07863c;
-    }
-
-    .toolbar-sao {
+    margin-top: 16rpx;
+    margin-bottom: 16rpx;
+    .page_item_btn {
+      flex: 1;
+      height: 88rpx;
+      background-image: linear-gradient(to right, #72c172, #3bb197);
+      border-radius: 8rpx;
+      line-height: 88rpx;
+      color: #fff;
       font-size: 36rpx;
-      color: #333;
+      font-weight: 700;
+      text-align: center;
+      margin-right: 24rpx;
+      &:first-of-type{
+        margin-left: 24rpx;
+      }
     }
+    .toolbar {
+      flex: 1;
+      z-index: 999;
+      height: 88rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      box-sizing: border-box;
+      border-radius: 4rpx;
+      background-color: #E5E8ED;
+      margin-right: 24rpx;
+    
+      .toolbar-icon {
+        font-size: 52rpx;
+        margin-right: 16rpx;
+        color: #07863c;
+      }
+    
+      .toolbar-sao {
+        font-size: 36rpx;
+        color: #333;
+      }
+    }
+  }
+  .newicon-weibiaoti2010104{
+    margin-left: 8rpx;
   }
+  
 	.patientInformationInfo {
     background-color: #F7F7F7;
     display: flex;
@@ -371,13 +529,23 @@
 				text-align: center;
 			}
 
+      .remark{
+        display: flex;
+        margin: 16rpx 27rpx;
+        .remarkTitle{
+          flex-shrink: 0;
+        }
+        .remarkInfo{
+          flex-shrink: 1;
+        }
+      }
+
 			.patientCode {
 				margin-left: 12rpx;
 				font-size: 28rpx;
 			}
 
 			.info {
-				padding-bottom: 24rpx;
 				margin: 8rpx 0;
 				height: 80rpx;
 				display: flex;
@@ -399,6 +567,7 @@
 
 					.info_b {
 						font-size: 26rpx;
+            margin-top: 8rpx;
 					}
 				}
 

pages/patientInformationList/patientInformationList.vue

@@ -2,10 +2,10 @@
   <view class="patientInformationList">
     <view class="page_tab">
       <view class="page_tab_bar active">
-        <view class="tab_dept">{{ currenDept.dept
-          }}<button type="default" size="mini" class="changeDept" @click="changeDept">
-            切换科室
-          </button></view>
+        <view class="tab_dept">
+          {{ currenDept.dept}}
+          <text class="newicon newicon-weibiaoti2010104" @click="changeDept"></text>
+        </view>
       </view>
     </view>
     <view v-if="zxzData.length == 0" class="zwsj">
@@ -19,46 +19,52 @@
         refresher-background="transport">
         <view class="page_item_wrap" v-for="(item, index) of zxzData" :key="index">
           <view class="page_item">
-            <view class="L"></view>
-            <view class="R"></view>
             <view class="page_item_top">
               <view class="page_item_top_L">
-                <template v-if="item.illnessState">
-                  <text v-if="item.illnessState.value === '2'"
-                    class="colorRed newicon newicon-tubiao_wei"></text>
-                  <text v-if="item.illnessState.value === '3'" class="colorRed newicon newicon-zhong"></text>
-                </template>
-                <template v-if="item.careLevel">
-                  <text v-if="item.careLevel.value === '0'" class="newicon newicon-te1"></text>
-                  <text v-if="item.careLevel.value === '1'" class="newicon newicon-1_round_solid"></text>
-                  <text v-if="item.careLevel.value === '2'" class="newicon newicon-2_round_solid"></text>
-                  <text v-if="item.careLevel.value === '3'" class="newicon newicon-3_round_solid"></text>
-                </template>
-                <!-- <view class="page_item_top_R" v-show="wechatFocusSwitch == 1 && item.focusPatient == 1">
-                  需要帮助
-                </view>
-                <view class="page_item_top_R" style="background-color: #49b856"
-                  v-show="wechatFocusSwitch == 1 && !item.focusPatient">
-                  无需帮助
-                </view> -->
+                {{ item.patientName }}({{ item.residenceNo }})({{ item.bedNum }})
               </view>
               <view class="send_wrap">
-                <view class="sendBack">
-                  <button @click="scanDept(item)">送回病房</button>
-                </view>
+                <template v-if="item.gender || item.age !== undefined">
+                  {{item.gender ? item.gender.name: ''}} {{item.age !== undefined ? item.age + '岁': ''}}
+                </template>
+                <template v-else>--</template>
               </view>
             </view>
             <view class="page_item_cont">
               <view class="page_item_conts">
-                <view>{{ item.patientName }}({{ item.residenceNo }})</view>
-                <view> 床号：{{ item.bedNum || "-" }} </view>
-                <view> 待检：{{ item.watingCount }} </view>
+                <view class="page_item_conts_item">
+                  <view class="column">
+                    <text class="p_title">护理信息：</text>
+                    <text class="p_info">
+                      <text :class="{red:item.careLevel&&(item.careLevel.value==0||item.careLevel.value==1)}">{{item.careLevel ? item.careLevel.name : '' }}</text>(<text :class="{red:item.illnessState&&(item.illnessState.value==2||item.illnessState.value==3)}">{{item.illnessState ? item.illnessState.name : ''}}</text>)
+                    </text>
+                  </view>
+                  <view class="column">
+                    <text class="p_title">待检：</text>
+                    <text class="p_info">{{ item.watingCount }}</text>
+                  </view>
+                </view>
+                
+                <view class="page_item_conts_item">
+                  <view class="column">
+                    <text class="p_title">陪检方式：</text>
+                    <text class="p_info">{{ item.tripTypeDTO ? item.tripTypeDTO.inspectMode : '' }}</text>
+                  </view>
+                </view>
+                
+                <view class="page_item_conts_item">
+                  <view class="column">
+                    <text class="p_title">注意事项：</text>
+                    <text class="p_info">{{ item.remark }}</text>
+                  </view>
+                </view>
               </view>
             </view>
-            <view class="page_item_btn" hover-class="seimin-btn-hover" @click="itemInfo(item.patientCode)">患者详情</view>
+            <view class="page_item_btns">
+              <view class="page_item_btn" hover-class="seimin-btn-hover" @click="itemInfo(item.patientCode)">患者详情</view>
+              <view class="page_item_btn" hover-class="seimin-btn-hover" @click="scanDept(item)">送回病房</view>
+            </view>
           </view>
-          <view class="L-l"></view>
-          <view class="R-l"></view>
         </view>
       </scroll-view>
     </view>
@@ -496,29 +502,6 @@
       stop(e) {
         e.preventDefault();
       },
-      // 获取需要帮助权限
-      // getWechatFocusSwitch() {
-      //   let postData = {
-      //     idx: 0,
-      //     sum: 1,
-      //     taskType: {
-      //       hosIds: this.hosId,
-      //       associationType: {
-      //         id: 260,
-      //       },
-      //     },
-      //   };
-      //   post("/configuration/fetchDataList/taskType", postData).then((res) => {
-      //     if (res.status == 200) {
-      //       this.wechatFocusSwitch = res.list[0].wechatFocusSwitch;
-      //     } else {
-      //       uni.showToast({
-      //         icon: "none",
-      //         title: res.msg || "接口获取数据失败！",
-      //       });
-      //     }
-      //   });
-      // },
     },
     onLoad(options) {
       console.log(options);
@@ -570,22 +553,47 @@
     },
   };
 </script>
-<style lang="less">
+<style lang="less" scoped>
+  .toolbar {
+    position: fixed;
+    left: 0;
+    bottom: var(--window-bottom);
+    z-index: 99;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    box-sizing: border-box;
+    border-radius: 4rpx;
+    background-color: #E5E8ED;
+  
+    .toolbar-icon {
+      font-size: 52rpx;
+      margin-right: 16rpx;
+      color: #49B856;
+    }
+  
+    .toolbar-sao {
+      font-size: 36rpx;
+      color: #333;
+    }
+  }
+  .column{
+    display: flex!important;
+  }
+  .newicon-weibiaoti2010104 {
+    font-size: 32rpx;
+    padding-left: 5rpx;
+    color: #8A8A8A;
+    &.fz28{
+      font-size: 28rpx;
+    }
+  }
   .patientInformationList {
     width: 100%;
     height: 100%;
     position: relative;
 
-    .newicon {
-      color: #49b856;
-      font-size: 50rpx;
-
-      &.colorRed {
-        color: red;
-        font-size: 40rpx;
-      }
-    }
-
     .page_tab {
       width: 100%;
       height: 96rpx;
@@ -597,7 +605,7 @@
 
       .page_tab_bar {
         flex: 1;
-        font-size: 36rpx;
+        font-size: 30rpx;
         background: #fff;
         display: flex;
         justify-content: center;
@@ -609,7 +617,7 @@
           position: absolute;
           left: 0;
           bottom: 0;
-          height: 2rpx;
+          height: 8rpx;
           width: 100%;
           background-color: transparent;
         }
@@ -658,27 +666,27 @@
     }
 
     .page_items {
-      height: calc(100vh - 184rpx);
-      padding: 0 20rpx;
-      padding-top: 96rpx;
+      height: calc(100vh - 164rpx);
+      padding-top: 90rpx;
 
       .page_items_scroll {
         height: 100%;
 
         .page_item_wrap {
           position: relative;
-          margin-bottom: 32rpx;
+          margin-top: 8rpx;
+          &:last-of-type{
+            padding-bottom: 24rpx;
+          }
 
           .page_item {
-            margin-bottom: 16rpx;
-            height: 276rpx;
             background: #fff;
             border-radius: 8rpx;
             overflow: hidden;
             border: 2rpx solid #e5e9ed;
             display: flex;
             flex-direction: column;
-            justify-content: space-between;
+            padding-bottom: 16rpx;
 
             .L {
               width: 40rpx;
@@ -715,6 +723,8 @@
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
+                font-size: 26rpx;
+                color: #6A6A6A;
               }
 
               .sendBack {
@@ -733,6 +743,8 @@
                 display: flex;
                 align-items: center;
                 line-height: 88rpx;
+                font-size: 30rpx;
+                font-weight: bold;
 
                 .L_time {
                   color: #6cc076;
@@ -752,48 +764,57 @@
             }
 
             .page_item_cont {
-              min-height: 100rpx;
-              max-height: 344rpx;
-              padding: 0 16rpx;
+              padding: 0 32rpx;
               text-align: left;
               position: relative;
 
               .page_item_conts {
                 color: rgb(102, 102, 102);
-                font-size: 28rpx;
-                display: flex;
-                align-items: center;
-                min-height: 100rpx;
-                max-height: 344rpx;
-
-                view {
-                  margin-bottom: 10rpx;
-                  margin-left: 40rpx;
-
-                  &:first-of-type {
-                    margin-left: 0;
+                font-size: 26rpx;
+
+                .page_item_conts_item {
+                  margin-bottom: 16rpx;
+                  display: flex;
+                  justify-content: space-between;
+                  &:first-of-type{
+                    margin-top: 16rpx;
                   }
                 }
-
-                text {
-                  color: #49b856;
+                
+                .p_info {
+                  flex: 1;
+                
+                  &.red {
+                    color: red;
+                  }
+                
                 }
-
+                
                 .num {
                   float: right;
                 }
               }
             }
-
-            .page_item_btn {
-              height: 88rpx;
-              background-image: linear-gradient(to right, #72c172, #3bb197);
-              border-radius: 8rpx;
-              line-height: 88rpx;
-              color: #fff;
-              font-size: 36rpx;
-              font-weight: 700;
-              text-align: center;
+            
+            .page_item_btns{
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              .page_item_btn {
+                flex: 1;
+                height: 72rpx;
+                background-image: linear-gradient(to right, #72c172, #3bb197);
+                border-radius: 8rpx;
+                line-height: 72rpx;
+                color: #fff;
+                font-size: 36rpx;
+                font-weight: 700;
+                text-align: center;
+                margin-right: 24rpx;
+                &:first-of-type{
+                  margin-left: 24rpx;
+                }
+              }
             }
           }