Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

components/bigScreen/bigScreen.vue

@@ -524,7 +524,7 @@
       // 底部扫描
       Scanning(qrcodePrefix = '') {
 				// 起点科室-综合交接
-				// this.ScanningCommon('', '87bdf1c7-1514-4fa8-8fa4-07f37c06bec7');
+				// this.ScanningCommon('', '1011103648');
 				// 起点科室-非综合交接
 				// this.ScanningCommon('', '5465456466546546565');
 				// 终点科室-综合交接

components/inspectRemoveModel/inspectRemoveModel.vue

@@ -32,7 +32,15 @@
 						预约时间：
 					</view>
 					<view class="uni-list-cell-db-text">
-						<uni-datetime-picker v-model="yyTime" returnType="date" :start="startTimestamp" />
+						<uni-datetime-picker v-model="yyTime" returnType="date" :start="startTimestamp" @change="dateChange($event)"/>
+					</view>
+				</view>
+				<view class="uni-list-cell" v-show="current === 1 || !remove">
+					<view class="uni-list-cell-left">
+						结束时间：
+					</view>
+					<view class="uni-list-cell-db-text">
+						{{yyEndTime}}
 					</view>
 				</view>
 			</view>
@@ -53,6 +61,7 @@
 	import {
 		post
 	} from "../../http/http.js";
+	import dayjs from 'dayjs';
 	export default {
 		data() {
 			return {
@@ -75,15 +84,16 @@
 				hosId: null,
 				timer: null,
 				yyTime: '', //预约时间
+				yyEndTime:'', //预约结束时间
 			};
 		},
 		watch: {
 			disjunctor(newValue) {
-				console.log(newValue)
 				if(newValue){
 					this.startTimestamp = Date.now();
 					this.current = -1;
-					this.yyTime = this.yy ? new Date(this.yy) : '';
+					this.yyTime = this.yy ? new Date(this.yy) : dayjs().format('YYYY-MM-DD HH:mm:ss');
+					this.setDate(this.yyTime)
 				}
 				if (newValue && this.operate.know == "返回") {
 					this.time = 5;
@@ -103,6 +113,16 @@
       	type: String,
       	default: '',
       },
+			// 当前项
+			currentInspect:{
+				type: Object,
+				default: {},
+			},
+			// 系统配置间隔时长
+			yytimeGapMinute:{
+				type: Number,
+				default: 0,
+			},
 			// 是否移除检查
 			remove: {
 				type: Boolean,
@@ -144,6 +164,21 @@
 			}
 		},
 		methods: {
+			dateChange(e){
+				if(e){
+					this.setDate(e)
+				}else{
+					this.yyEndTime = null
+				}
+			},
+			// 设置预约结束时间
+			setDate(yyTime){
+				let date = dayjs(new Date(yyTime));
+				let num = this.currentInspect.inspectCheckType.extra1?this.currentInspect.inspectCheckType.extra1:undefined
+				let newDate = date.add(num ? num : this.yytimeGapMinute, 'minute'); 
+				let endTime = new Date(newDate);
+				this.yyEndTime = endTime.Format('yyyy-MM-dd hh:mm:ss')
+			},
 			radioChange: function(evt) {
 				this.yyTime = '';
 				this.startTimestamp = Date.now();
@@ -156,7 +191,13 @@
 			},
 			// 确定
 			ok() {
-				let e = {};
+				let date = dayjs(new Date(this.yyTime));
+				let num = this.currentInspect.inspectCheckType.extra1?this.currentInspect.inspectCheckType.extra1:undefined
+				let newDate = date.add(num ? num : this.yytimeGapMinute, 'minute'); 
+				let endTime = new Date(newDate);
+				let e = {
+					yyEndTime: endTime.getTime()
+				};
 				if (this.current > -1) {
 					e.value = this.removeReasons[this.current].value;
 				}

manifest.json

@@ -123,8 +123,8 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.3.108", //请求的目标域名
-
+                    // "target" : "http://192.168.3.108", //请求的目标域名
+										"target" : "http://192.168.4.129", //陈肖本地
                     // "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false

pages/inspectList/inspectList.vue

@@ -69,7 +69,7 @@
                 </view>
                 <view class="page_item_conts_item btn">
                   <text class="p_title">预约时间：</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>
+                  <text class="p_info">{{ item.yyEndTime }}<text class="newicon newicon-weibiaoti2010104 fz28" @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></text>
                 </view>
                 <view class="page_item_conts_item">
                   <view class="column">
@@ -115,7 +115,7 @@
     <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>
+		<inspectRemoveModel v-if="configObj" :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :yy="currentInspect.yyTime" :currentInspect="currentInspect" :yytimeGapMinute="configObj.yytimeGapMinute"></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>
@@ -128,6 +128,7 @@
     deleteIt,
     webHandle
   } from "../../http/http.js";
+	import dayjs from 'dayjs';
   // https://ext.dcloud.net.cn/plugin?id=2849
   import fjjCondition from "@/components/fjj-condition/fjj-condition.vue";
   import showModel from "../../components/showModel/showModel.vue";
@@ -206,6 +207,8 @@
         freshing: false, //上拉加载开关
         scroll_top: 0, //距离顶部的距离
         scroll_refresher_enabled: true, //是否开启自定义下拉刷新
+				configObj: null,
+				hosId: uni.getStorageSync("userData").user.currentHospital.id,
       };
     },
     components: {
@@ -225,7 +228,7 @@
 			// 修改预约时间->确定
 			ok1(data) {
 				console.log(data);
-				const { yyTime} = data;
+				const { yyTime, yyEndTime} = data;
 				if (!yyTime) {
 				  //没有填写预约时间
 				  uni.showModal({
@@ -245,7 +248,8 @@
 			  this.models1.disjunctor = false;
 			  let postData = {
 			    inspectCode: this.currentInspect.inspectCode,
-					yyTime
+					yyTime,
+					yyEndTime
 			  };
 			  uni.showLoading({
 			    title: '加载中',
@@ -508,6 +512,34 @@
           url: `../search/search?type=inspectList`,
         });
       },
+			// 获取系统配置预约时间间隔
+			getInspectConfig(idx) {
+			  const postData = {
+			    "idx": 0,
+			    "sum": 1,
+			    "taskTypeConfig": {
+			      "taskTypeDTO": {
+			        "hosId": {
+			          "id": this.hosId
+			        },
+			        "associationType": {
+			          "key": "association_types",
+			          "value": "inspect",
+			        },
+			      },
+			    },
+			  };
+			  uni.showLoading({
+			    mask: true,
+			    title: '加载中'
+			  })
+			  post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
+			    if (res.status == 200) {
+			      this.configObj = res.list[0];
+						this.waitingOrders(idx);
+			    }
+			  })
+			},
       //检查列表数据获取
       waitingOrders(idx) {
         if (this.zxzData.length == this.totalNum) {
@@ -563,13 +595,21 @@
             this.triggered = false;
             this.freshing = true;
             this.totalNum = res.totalNum;
-						console.log(66666,res.list)
-						res.list = res.list.map(v => {
+						res.list.forEach(v => {
 							if(v.yyTime){
-								let [date, time] = v.yyTime.split(" ");
-								v.yyTime = new Date(date).Format('yyyy-MM-dd') + " " + time.slice(0, -3);
+								v.newTime = dayjs(new Date(v.yyTime)).format('MM-DD HH:mm')
+								if(v.endCheckTime){
+									v.newTime2 = dayjs(new Date(v.endCheckTime)).format('HH:mm')
+								}else{
+									let date = dayjs(new Date(v.yyTime));
+									let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
+									v.newTime2 = newDate.format('HH:mm');
+								}
+								v.yyEndTime = v.newTime +'--'+ v.newTime2
+								// let [date, time] = v.yyTime.split(" ");
+								// v.yyTime = new Date(date).Format('yyyy-MM-dd') + " " + time.slice(0, -3);
 							}
-							return v;
+							// return v;
 						})
             if (idx === 0) {
               this.zxzData = res.list;
@@ -646,7 +686,7 @@
       } else {
         this.currenDept = uni.getStorageSync("userData").user.dept;
       }
-      this.waitingOrders(0);
+			this.getInspectConfig(0)
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/patientInformationInfo/patientInformationInfo.vue

@@ -42,7 +42,7 @@
               检查项目：<text class="bold">{{ item.inspectName }}-{{item.inspectCode}}</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><text :class="{red: !item.yyTime}">预约时间：</text><text>{{ item.yyEndTime }}</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">
               <text>医生备注：{{ item.remark }}</text>
@@ -71,7 +71,7 @@
     <showModel :checkBoxText="models.checkBoxText" :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>
+    <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" :currentInspect="currentInspect" :yytimeGapMinute="configObj.yytimeGapMinute"></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>
@@ -83,6 +83,7 @@
 		SM,
 		webHandle
 	} from "../../http/http.js";
+	import dayjs from 'dayjs';
 	export default {
 		data() {
 			return {
@@ -105,6 +106,8 @@
         models: {
           disjunctor: false,
         },
+				configObj: null,
+				hosId: uni.getStorageSync("userData").user.currentHospital.id,
 			};
 		},
 		methods: {
@@ -345,7 +348,7 @@
 			// 修改预约时间->确定
 			ok1(data) {
 				console.log(data);
-				const { yyTime} = data;//暂时这样
+				const { yyTime, yyEndTime} = data;//暂时这样
 				if (!yyTime) {
 				  //没有填写预约时间
 				  uni.showModal({
@@ -365,7 +368,8 @@
 			  this.models1.disjunctor = false;
 			  let postData = {
 			    inspectCode: this.currentInspect.inspectCode,
-			  	yyTime
+			  	yyTime,
+					yyEndTime
 			  };
 			  uni.showLoading({
 			    title: '加载中',
@@ -450,6 +454,34 @@
       cancel2() {
         this.models2.disjunctor = false;
       },
+			// 获取系统配置预约时间间隔
+			getInspectConfig(patientCode) {
+			  const postData = {
+			    "idx": 0,
+			    "sum": 1,
+			    "taskTypeConfig": {
+			      "taskTypeDTO": {
+			        "hosId": {
+			          "id": this.hosId
+			        },
+			        "associationType": {
+			          "key": "association_types",
+			          "value": "inspect",
+			        },
+			      },
+			    },
+			  };
+			  uni.showLoading({
+			    mask: true,
+			    title: '加载中'
+			  })
+			  post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
+			    if (res.status == 200) {
+			      this.configObj = res.list[0];
+						this.getInfo(patientCode);
+			    }
+			  })
+			},
 			// 请求详细页面的数据
 			getInfo(patientCode) {
 				uni.showLoading({
@@ -464,6 +496,21 @@
 					if (res.status == 200) {
             res.data.inspectListMap = res.data.inspectListMap || {};
             this.isEmpty = Object.keys(res.data.inspectListMap).length === 0;
+						for(let i of Object.keys(res.data.inspectListMap)){
+							let x = res.data.inspectListMap[i]
+							for(let e of x){
+								e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
+								if(e.endCheckTime){
+									e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
+								}else{
+									let date = dayjs(new Date(e.yyTime));
+									let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
+									e.newTime2 = newDate.format('HH:mm');
+								}
+								e.yyEndTime = e.newTime +'--'+ e.newTime2
+							}
+						}
+						// console.log(222, res.data.inspectListMap)
 						this.infoDATA = res.data;
 					} else {
 						uni.showToast({
@@ -477,7 +524,7 @@
 		onLoad(options) {
       console.log('options', options);
 			this.options = options;
-			this.getInfo(this.options.patientCode);
+			this.getInspectConfig(this.options.patientCode)
 			// #ifdef APP-PLUS
 			webHandle("no", "app");
 			// #endif

pages/patientInformationList/patientInformationList.vue

@@ -77,7 +77,7 @@
                     </text>
                   </view>
                   <view class="column" style="flex-shrink: 0;margin-left: 40rpx;">
-                    <text class="p_info">{{ item.sortYytime | yyTimeFilter }}</text>
+                    <text class="p_info">{{ item.yyEndTime }}</text>
                   </view>
                 </view>
               </view>
@@ -163,6 +163,7 @@
         scroll_top: 0, //距离顶部的距离
         scroll_refresher_enabled: true, //是否开启自定义下拉刷新
         currentStartDept: {}, //扫描的起点科室
+				configObj:{}
       };
     },
     components: {
@@ -484,6 +485,34 @@
           url: `../patientInformationInfo/patientInformationInfo?patientCode=${patientCode}`,
         });
       },
+			// 获取系统配置预约时间间隔
+			getInspectConfig() {
+			  const postData = {
+			    "idx": 0,
+			    "sum": 1,
+			    "taskTypeConfig": {
+			      "taskTypeDTO": {
+			        "hosId": {
+			          "id": this.hosId
+			        },
+			        "associationType": {
+			          "key": "association_types",
+			          "value": "inspect",
+			        },
+			      },
+			    },
+			  };
+			  uni.showLoading({
+			    mask: true,
+			    title: '加载中'
+			  })
+			  post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
+			    if (res.status == 200) {
+			      this.configObj = res.list[0];
+						this.waitingOrders(0);
+			    }
+			  })
+			},
       //患者列表数据获取
       waitingOrders(idx) {
         if (this.zxzData.length == this.totalNum) {
@@ -516,6 +545,17 @@
             this.triggered = false;
             this.freshing = true;
             this.totalNum = res.totalNum;
+						res.list.forEach(e => {
+							e.newTime = dayjs(new Date(e.sortYytime)).format('MM-DD HH:mm')
+							if(e.inspects && e.inspects.length && e.inspects[0].endCheckTime){
+								e.newTime2 = dayjs(new Date(e.inspects[0].endCheckTime)).format('HH:mm')
+							}else{
+								let date = dayjs(new Date(e.sortYytime));
+								let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
+								e.newTime2 = newDate.format('HH:mm');
+							}
+							e.yyEndTime = e.newTime +'--'+ e.newTime2
+						})
             if (idx === 0) {
               this.zxzData = res.list;
             } else {
@@ -597,7 +637,7 @@
         this.currenDept = uni.getStorageSync("userData").user.dept;
       }
       // this.getWechatFocusSwitch();
-      this.waitingOrders(0);
+			this.getInspectConfig();
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/patientInspectLog/patientInspectLogSendBack.vue

@@ -80,6 +80,8 @@
         models1: {
           disjunctor: false,
         },
+				handover: null ,//交接人id
+				handoverId: null //交接人id
       };
     },
     computed: {
@@ -127,6 +129,9 @@
           });
       },
       confirmKey(data){
+				let id = JSON.parse(JSON.stringify(data))
+				id = id.split('||')
+				this.handoverId = id[id.length-1]
       	this.padChange(data)
       	this.showKey = false
       },
@@ -218,7 +223,9 @@
             title: "加载中",
             mask: true,
           });
-      
+					let id = JSON.parse(JSON.stringify(content))
+					id = id.split('||')
+					this.handoverId = id[id.length-1]
           this.bigScan(content);
         }).catch(err => {
           this.SMFlag = true;
@@ -269,7 +276,7 @@
         });
         post("/nurse/patientInspect/setPatientInspectBackDept", {
           pilIds: this.list.map(v => v.id).toString(),
-          handover: this.handover,
+          handover: this.handover?this.handover:this.handoverId,
         }).then((res) => {
           uni.hideLoading();
           if (res.state == 200) {

pages/receipt_infopage/receipt_infopage.vue

@@ -129,7 +129,7 @@
         </view>
         <view class="page_item_foot_text" v-if="!(infoDATA.taskType.associationType.value == 'ordinary' && (infoDATA.taskType.ordinaryField.value == 'drugsJpbag' || infoDATA.taskType.ordinaryField.value == 'drugsWestern' || infoDATA.taskType.ordinaryField.value == 'drugsReturn' || infoDATA.taskType.ordinaryField.value == 'drugsPoison' || infoDATA.taskType.ordinaryField.value == 'drugsHerbal'))">
           <text class="text1">预约时间</text>
-          <text class="text2" v-if="infoDATA.taskType.associationType.value == 'inspect'">{{ infoDATA.yyTime }}</text>
+          <text class="text2" v-if="infoDATA.taskType.associationType.value == 'inspect'">{{ infoDATA.yyEndTime }}</text>
           <text class="text2"
             v-if="infoDATA.taskType.associationType.value == 'patientTransport' || infoDATA.taskType.associationType.value == 'other'">{{ infoDATA.yyjdTime|yyTimeFilter }}</text>
 				</view>
@@ -339,7 +339,7 @@
               </view>
               <view class="page_item_foot_text">
                 <text class="text1">预约时间</text>
-                <text class="text2">{{ item.yyTime || "-" }}</text>
+                <text class="text2">{{ item.yyEndTime || "-" }}</text>
               </view>
 							<view class="page_item_foot_text">
 							  <text class="text1">是否送达</text>
@@ -455,7 +455,7 @@
       @know="know" :operate="models.operate" @ok="ok" @cancel="cancel" :textareaFlag="textareaFlag"
       @textareaInput="textareaInput"></showModel>
     <!-- 弹窗 -->
-    <inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor"
+    <inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :currentInspect="infoDATA"
       :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :remove="true">
     </inspectRemoveModel>
     <!-- 弹窗 -->
@@ -481,6 +481,7 @@
   </view>
 </template>
 <script>
+	import dayjs from 'dayjs';
 	import scanner from "../../components/scanner/scanner.vue";
   import selectAccount from "../../components/selectAccount/selectAccount.vue";
   import smallScreen from "../../components/smallScreen/smallScreen.vue";
@@ -551,6 +552,7 @@
 				tasktype: null,
 				sPehandoverOrder: null ,//是否转派
 				speContent: null,
+				configObj: null
       };
     },
     filters: {
@@ -1677,6 +1679,29 @@
         get("/api/fetchData/workOrder/" + id).then((res) => {
           uni.hideLoading();
           if (res.status == 200) {
+						if(res.data.checkList){
+							res.data.checkList.forEach(e =>{
+								e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
+								if(e.endCheckTime){
+									e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
+								}else{
+									let date = dayjs(new Date(e.yyTime));
+									let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
+									e.newTime2 = newDate.format('HH:mm');
+								}
+								e.yyEndTime = e.newTime +'--'+ e.newTime2
+							})
+						}
+						let newTime = dayjs(new Date(res.data.yyTime)).format('MM-DD HH:mm')
+						let newTime2 = null
+						if(res.data.endCheckTime){
+							newTime2 = dayjs(new Date(res.data.endCheckTime)).format('HH:mm')
+						}else{
+							let date = dayjs(new Date(res.data.yyTime));
+							let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
+							newTime2 = newDate.format('HH:mm');
+						}
+						res.data.yyEndTime = newTime +'--'+ newTime2
             this.infoDATA = res.data;
             // 计算高度
             setTimeout(() => {
@@ -1736,7 +1761,7 @@
         });
       },
 			// 获取标本是否转派配置
-			getSpeTaskConfig(){
+			getSpeTaskConfig(id){
 				let postData = {
 					idx: 0,
 					sum: 10,
@@ -1755,12 +1780,12 @@
 				post("/simple/data/fetchDataList/taskType", postData).then((result) => {
 					if (result.status == 200) {
 						this.tasktype = result.list[0] || {};
-						this.getSpeConfig();
+						this.getSpeConfig(id);
 					}
 				});
 			},
 			// 获取配置
-			getSpeConfig() {
+			getSpeConfig(id) {
 				let postData = {
 					idx: 0,
 					sum: 10,
@@ -1777,6 +1802,7 @@
 					if (result.status == 200) {
 						this.configs = result.list[0] || {};
 						this.sPehandoverOrder = this.configs.handoverOrder || null;
+						this.getInfo(id);
 					}
 			  });
 			},
@@ -1799,6 +1825,7 @@
         }).then((result) => {
           if (result.status == 200) {
             if(result.list && result.list[0]){
+							this.configObj = result.list[0];
               this.multiplayerMode = result.list[0].multiplayerMode;
               this.handoverOrder = result.list[0].handoverOrder;
               this.hideInspectScan = result.list[0].hideInspectScan;
@@ -2062,10 +2089,10 @@
         options.associationTypeValue == 'specimenPlan'
       ) {
 				// 到达 送达 执行中
-				this.getSpeTaskConfig();
+				this.getSpeTaskConfig(id);
         this.getInfoBySpecimen(id);
       } else {
-        this.getInfo(id);
+				this.getSpeTaskConfig(id);
       }
       if (
         options.associationTypeValue == 'inspect' ||

pages/receiptpage/receiptpage.vue

@@ -218,7 +218,7 @@
                     <text class="text_big">{{ item.middleDept[0].dept }}</text>
                   </view>
                   <view style="text-align: right;">
-                    {{ item.middleDept[0].yyTime | yyTimeFilter}}
+                    {{ item.middleDept[0].yyEndTime }}
                   </view>
                 </view>
 								<view class="page_item_cont_title" v-if="item.middleDept&&item.middleDept.length>1 && item.taskType.associationType.value == 'inspect'">
@@ -228,7 +228,7 @@
 										  <text class="text_big" :class="dept.signIn ? 'green': ''">{{ dept.dept }}</text>
 										</view>
                     <view style="text-align: right;">
-                      {{ dept.yyTime | yyTimeFilter}}
+                      {{ dept.yyEndTime | yyTimeFilter}}
                     </view>
 									</view>
 								</view>
@@ -429,6 +429,7 @@
 	</view>
 </template>
 <script>
+	import dayjs from 'dayjs';
   import selectAccount from "../../components/selectAccount/selectAccount.vue";
   import smallScreen from "../../components/smallScreen/smallScreen.vue";
 	import scanner from "../../components/scanner/scanner.vue";
@@ -613,7 +614,8 @@
 				keyArr: [],
 				isApp:false,
 				isUpdate:false,
-				taskTypeList:[]
+				taskTypeList:[],
+				taskTypeConfigObj:{}
       };
     },
 		components: {
@@ -916,6 +918,7 @@
           let result = await this.getTaskInspectConfig();
           if (result.status == 200) {
             if(result.list && result.list[0]){
+							this.taskTypeConfigObj = result.list[0];
               this.hideInspectScan = result.list[0].hideInspectScan;
             }else{
               this.hideInspectScan = 0;
@@ -2727,6 +2730,19 @@
 							this.totalNum = res.data.resultCount;
 							res.data.data = res.data.data || [];
 							res.data.data.forEach(v => {
+								if(v.middleDept && v.middleDept.length>0){
+									for(let e of v.middleDept){
+										e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
+										if(e.endCheckTime){
+											e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
+										}else{
+											let date = dayjs(new Date(e.yyTime));
+											let newDate = date.add(this.taskTypeConfigObj.yytimeGapMinute, 'minute'); 
+											e.newTime2 = newDate.format('HH:mm');
+										}
+										e.yyEndTime = e.newTime +'--'+ e.newTime2
+									}
+								}
 								v.taskTypeConfig = this.taskTypeList.find(i=>i.id == v.taskType.id)
 								v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
 							})