components/bigScreen/bigScreen.vue

@@ -412,14 +412,14 @@
                   });
                 }else{
                   if(config.drugsEndCheck === 1){
-                    // 起点科室支持核对
+                    // 终点科室支持核对
                     uni.navigateTo({
                       url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
                     });
                   }else{
-                    // 起点科室不支持核对
+                    // 终点科室不支持核对
                     if(config.drugsEndPhoto === 1){
-                      // 起点科室支持拍照留存
+                      // 终点科室支持拍照留存
                       uni.navigateTo({
                         url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}`,
                       });
@@ -457,9 +457,16 @@
 									  url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
 									});
 								}else{
-									uni.navigateTo({
-									  url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
-									});
+                  if(config.drugsScanHandover === 1){
+                    // 终点科室开通一扫交接
+                    uni.navigateTo({
+                      url: `/pages/newDrug/checkPage/checkPage?drugsBagType=${drugsBagType}&orderId=${orderId}`,
+                    });
+                  }else{
+                    uni.navigateTo({
+                      url: `/pages/newDrug/continueScanning/continueScanning?drugsBagType=${drugsBagType}&orderId=${orderId}&drugsBagId=${drugsBagId}&orderStateValue=${orderStateValue}`,
+                    });
+                  }
 								}
               }
             } else {

components/specimenListItem/specimenListItem.vue

@@ -18,7 +18,7 @@
         </view>
         <view class="page_item_cont_title">
           <view class="text_big"> {{ item.patientName }}<text v-if="item.bedNum">({{item.bedNum}}床)</text> </view>
-          <view class="text_big">{{ item.residenceNo }}</view>
+          <view class="text_big">{{ item.residenceNo || item.patientNo }}</view>
         </view>
         <view class="page_item_cont_title">
           <view class="text_big"> 收取:{{item.receiverName||'无'}} </view>

pages/inspectList/inspectList.vue

@@ -65,7 +65,7 @@
                 </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 }}-{{ item.inspectCode }}</text>
                 </view>
                 <view class="page_item_conts_item btn">
                   <text class="p_title">预约时间：</text>

pages/newDrug/checkPage/checkPage.vue

@@ -16,7 +16,10 @@
       </view>
       <scroll-view scroll-y class="scrollContent">
         <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
-          <view class="value1">{{item.packid}}</view>
+          <view class="value1">
+            <view class="">{{item.packid}}</view>
+            <view class="">{{item.launch ? item.launch.dept : ''}}</view>
+          </view>
           <view class="value2" v-if="config.showDrugsBagTypeCount == 1">{{item.drugsTypeCount}}</view>
           <view class="value3" v-if="config.showDrugsBagTypeCount == 1">{{item.drugsCount}}</view>
         </view>
@@ -25,9 +28,9 @@
 
     <view class="foot_btn_spe">
       <view class="column">
-				<view v-if="config.drugsStartCheck==0 && workOrder.gdState.value == 4" class="btn" @click="checkSubmit()">确认交接</view>
-        <view v-if="workOrder.gdState.value == 4 && config.drugsStartCheck==1" class="btn" @click="scanCode()">扫一扫交接</view>
-				<view v-if="workOrder.gdState.value == 5 && config.drugsEndCheck==1" class="btn" @click="scanCode()">扫一扫交接</view>
+				<view v-if="config.drugsStartCheck==0 && workOrder.gdState && workOrder.gdState.value == 4" class="btn" @click="checkSubmit()">确认交接</view>
+        <view v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartCheck==1" class="btn" @click="scanCode()">扫一扫交接</view>
+				<view v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndCheck==1" class="btn" @click="scanCode()">扫一扫交接</view>
 				<view class="btn" @click="fillInManually(config.drugsStartManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 4 && config.drugsStartManual">{{config.drugsStartManual.name}}</view>
         <view class="btn" @click="fillInManually(config.drugsEndManual.value)" v-if="workOrder.gdState && workOrder.gdState.value == 5 && config.drugsEndManual">{{config.drugsEndManual.name}}</view>
       </view>
@@ -300,12 +303,12 @@
         }else if(workOrder.gdState.value == 5){
           // 待送达
           if(config.drugsEndPhoto === 1){
-            // 起点科室支持拍照留存
+            // 终点科室支持拍照留存
             uni.navigateTo({
               url: `/pages/newDrug/photoRetention/photoRetention?drugsBagType=${drugsBagType}&orderId=${orderId}&accountId=${accountObj ? accountObj.id : ''}&accountName=${accountObj ? accountObj.name : ''}&accountDeptName=${departmentDTO ? departmentDTO.dept : ''}`,
             });
           }else{
-            // 起点科室不支持拍照留存
+            // 终点科室不支持拍照留存
             this.completeOrder(workOrder, queryObj, accountObj, "");
           }
         }

pages/newDrug/continueScanning/continueScanning.vue

@@ -20,6 +20,10 @@
           <view class="name">发药科室：</view>
           <view class="value">{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
         </view>
+        <view class="column">
+          <view class="name">打印时间：</view>
+          <view class="value">{{drugsBag.creatTime}}</view>
+        </view>
         <view class="column" v-if="config.showDrugsBagTypeCount == 1">
           <view class="name">种类数：</view>
           <view class="value">{{drugsBag.drugsTypeCount}}</view>

pages/newDrug/createOrder/createOrder.vue

@@ -20,6 +20,10 @@
           <view class="name">发药科室：</view>
           <view class="value">{{drugsBag.launch ? drugsBag.launch.dept : ''}}</view>
         </view>
+        <view class="column">
+          <view class="name">打印时间：</view>
+          <view class="value">{{drugsBag.creatTime}}</view>
+        </view>
         <view class="column" v-if="config.showDrugsBagTypeCount == 1">
           <view class="name">种类数：</view>
           <view class="value">{{drugsBag.drugsTypeCount}}</view>

pages/newDrug/list.vue

@@ -15,6 +15,10 @@
 						  <view class="name">种类数：{{item.drugsTypeCount}}</view>
 						  <view class="value">总数：{{item.drugsCount}}</view>
 						</view>
+            <view class="bodyColumn" v-if="config.showDrugsBagTypeCount == 1">
+              <view class="name">发药科室：{{item.launch ? item.launch.dept : ''}}</view>
+              <view class="value">打印时间：{{item.creatTime}}</view>
+            </view>
             <view class="bodyColumn">
               <view class="name">收取人：<template v-if="item.startLog">{{item.startLog.username}}</template></view>
               <view class="value">收取时间：<template v-if="item.startLog">{{item.startLog.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</template></view>

pages/patientInformationInfo/patientInformationInfo.vue

@@ -39,7 +39,7 @@
           <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>
+              检查项目：<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.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>

pages/patientInformationList/patientInformationList.vue

@@ -65,7 +65,7 @@
                 <view class="page_item_conts_item" v-if="item.inspects && item.inspects[0]">
                   <view class="column">
                     <text class="p_title">检查项目：</text>
-                    <text class="p_info">{{ item.inspects[0].inspectName }}</text>
+                    <text class="p_info">{{ item.inspects[0].inspectName }}-{{ item.inspects[0].inspectCode }}</text>
                   </view>
                 </view>
                 

pages/receipt_infopage/receipt_infopage.vue

@@ -331,7 +331,7 @@
               </view>
               <view class="page_item_foot_text">
                 <text class="text1">检查项</text>
-                <text class="text2">{{ item.inspectName||'-' }}</text>
+                <text class="text2">{{ item.inspectName }}-{{ item.inspectCode }}</text>
               </view>
               <view class="page_item_foot_text">
                 <text class="text1">叫号信息</text>
@@ -2422,7 +2422,7 @@
             .text2 {
               max-width: 60%;
               font-weight: 700;
-              text-align: justify;
+              text-align: right;
               line-height: normal;
             }
 

pages/scanning_B/scanning_B.vue

@@ -26,7 +26,8 @@
       <view>检验科室 : {{ infoDATA.checkDept || "-" }}</view>
       <view>检验项目 : {{ res.data.specimenDesc || "-" }}</view>
       <view>患者姓名 : {{ res.data.patientName}}<text v-if="res.data.bedNum">({{res.data.bedNum}})</text></view>
-      <view>住院号 : {{ res.data.residenceNo || "-" }}</view>
+      <view v-if="res.data.residenceNo">住院号 : {{ res.data.residenceNo }}</view>
+      <view v-else-if="res.data.patientNo">门诊号 : {{ res.data.patientNo }}</view>
     </view>
     <view class="Scanning_cont" v-else>
       <view>{{ res.msg }}</view>

pages/scanning_Result/scanning_Result.vue

@@ -55,7 +55,8 @@
         <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}</text>
       </view>
       <view class="df"><view class="width-100">患者姓名：</view>{{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
-      <view class="df"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo || '-' }}</view>
+      <view class="df" v-if="infoDATA.residenceNo"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo }}</view>
+      <view class="df" v-else-if="infoDATA.patientNo"><view class="width-100">门诊号：</view>{{ infoDATA.patientNo }}</view>
     </view>
 
     <view class="Scanning_cont spe" v-if="
@@ -72,7 +73,8 @@
 			  <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.checkDept ? infoDATA.checkDept.dept : "" }}</text>
 			</view>
 			<view class="df"><view class="width-100">患者姓名：</view>{{ infoDATA.patientName}}（{{infoDATA.bedNum}}）</view>
-			<view class="df"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo || '-' }}</view>
+			<view class="df" v-if="infoDATA.residenceNo"><view class="width-100">住院号：</view>{{ infoDATA.residenceNo }}</view>
+      <view class="df" v-else-if="infoDATA.patientNo"><view class="width-100">门诊号：</view>{{ infoDATA.patientNo }}</view>
     </view>
 
     <view class="Scanning_cont" v-if="

pages/scanning_djInfo/scanning_djInfo.vue

@@ -54,7 +54,8 @@
         <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.data.checkDept ? infoDATA.data.checkDept.dept : "" }}</text>
       </view>
       <view>患者姓名 : {{ infoDATA.data.patientName}}（{{infoDATA.data.bedNum}}）</view>
-      <view>住院号 : {{ infoDATA.data.residenceNo || '-' }}</view>
+      <view v-if="infoDATA.data.residenceNo">住院号 : {{ infoDATA.data.residenceNo }}</view>
+      <view v-else-if="infoDATA.data.patientNo">门诊号 : {{ infoDATA.data.patientNo }}</view>
     </view>
     <view class="Scanning_cont" v-if="
         (res.status == 11111 && type == 'specimenPlan') ||
@@ -69,7 +70,8 @@
         <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.data.checkDept ? infoDATA.data.checkDept.dept : "" }}</text>
       </view>
       <view>患者姓名 : {{ infoDATA.data.patientName}}（{{infoDATA.data.bedNum}}）</view>
-      <view>住院号 : {{ infoDATA.data.residenceNo || '-' }}</view>
+      <view v-if="infoDATA.data.residenceNo">住院号 : {{ infoDATA.data.residenceNo }}</view>
+      <view v-else-if="infoDATA.data.patientNo">门诊号 : {{ infoDATA.data.patientNo }}</view>
     </view>
     <view class="Scanning_cont" v-if="
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'

pages/specimenDetail/specimenDetail.vue

@@ -147,6 +147,9 @@
   };
 </script>
 <style lang="less" scoped>
+  /deep/ .more_picker > div{
+    height: 100%;
+  }
   .specimenCheckingDetail {
     padding-top: 96rpx;
     padding-bottom: 100rpx;