血制品

pages/blood_list/blood_list.vue

@@ -19,13 +19,13 @@
               <view class="page_item_cont_title">
                 <view class="text_big"><text v-if="bloodDTO.printDate">{{bloodDTO.printDate | formatDate('yyyy-MM-dd hh:mm')}}</text><text v-else>无</text></view>
                 <text style="width: 4em;text-align: center;" class="icon_transport transport-arrow-right-full"></text>
-                <view class="text_big">{{ bloodDTO.overDate||'无' }}</view>
+                <view class="text_big"><text v-if="bloodDTO.overDate">{{bloodDTO.overDate | formatDate('yyyy-MM-dd hh:mm')}}</text><text v-else>无</text></view>
               </view>
               <view class="page_item_cont_title">
                 <view>
                   血型：{{ bloodDTO.aboType||'无' }}
                   &emsp;&emsp;
-                  RH(D)：<text v-if="bloodDTO.rhType === '1'">+</text><text v-else-if="bloodDTO.rhType === '0'">-</text><text v-else>无</text>
+                  RH(D)：<text>{{bloodDTO.rhType || '无'}}</text>
                 </view>
                 <view class="text_big"></view>
               </view>

pages/check_blood/check_blood.vue

@@ -23,7 +23,7 @@
           工单号：{{order.gdcode||'无'}}
         </view>
         <view class="">
-          所属科室：{{order.startDept?order.startDept.dept:'无'}}
+          所属科室：{{order.endDepts?order.endDepts[0].dept:'无'}}
         </view>
         <view class="">
           接收数量：{{receiveNum}}
@@ -161,7 +161,7 @@
             if (codes) {
               post("/transflow/scanBind", {type: 'blood',orderId: this.queryObj.orderId, code: ress1}).then((ress) => {
                 uni.hideLoading();
-                if (ress.state == 200) {
+                if (ress.state == 200 && ress.data.state != 400) {
                   //扫描标本后会自动调用摄像头，继续扫描，直到status不是200
                   setTimeout(()=>{
                     if (type === 'scan') {
@@ -170,11 +170,11 @@
                   },500)
                   //todo
                   uni.redirectTo({
-                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&bloodDTO=${encodeURIComponent(JSON.stringify(ress.data.dto))}&scanCount=${ress.data.scanCount}&status=${ress.state}&scanOrHand=${type}`,
+                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&bloodDTO=${encodeURIComponent(JSON.stringify(ress.data.dto))}&scanCount=${ress.data.scanCount}&status=200&scanOrHand=${type}`,
                   });
                 } else {
                   uni.redirectTo({
-                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&status=${ress.state}&scanOrHand=${type}&qrcode=${ress1}`,
+                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&status=500&scanOrHand=${type}&qrcode=${ress1}`,
                   });
                 }
               });

pages/receipt_infopage/receipt_infopage.vue

@@ -93,10 +93,10 @@
               infoDATA.taskType.associationType.value == 'inspect'
             ">待送回</text>
         </view>
-        <view class="page_item_foot_text">
+        <!-- <view class="page_item_foot_text">
           <text class="text1">关联类型</text>
           <text class="text2">{{ infoDATA.taskType.associationType.name }}</text>
-        </view>
+        </view> -->
         <view class="page_item_foot_text">
           <text class="text1">任务类型</text>
           <text class="text2">{{ infoDATA.taskType.taskName }}<template
@@ -112,20 +112,20 @@
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '2'">
           <text class="text1">预计响应时间</text>
-          <text class="text2">{{ infoDATA.estimeResponseTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimeResponseTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '5'">
           <text class="text1" v-if="!(infoDATA.taskType.associationType.value == 'inspect')">预计送达时间</text>
           <text class="text1" v-if="infoDATA.taskType.associationType.value == 'inspect'">预计送回时间</text>
-          <text class="text2">{{ infoDATA.estimeCompleteTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimeCompleteTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '4'">
           <text class="text1">预计到达时间</text>
-          <text class="text2">{{ infoDATA.estimateArriveTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimateArriveTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text">
           <text class="text1">创建时间</text>
-          <text class="text2">{{ infoDATA.startTime }}</text>
+          <text class="text2">{{ infoDATA.startTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text">
           <text class="text1">预约时间</text>
@@ -194,6 +194,27 @@
         <text class="page_item_info_title">药包编码</text>
         <text class="text">{{ infoDATA.drugs?infoDATA.drugs.packid:'无' }}</text>
       </view>
+      <!-- 血制品 -->
+      <view class="page_item_info" v-if="
+          infoDATA.taskType.associationType.value == 'ordinary' &&
+          infoDATA.taskType.ordinaryField.value == 'blood'
+        ">
+        <view>
+          <text class="page_item_info_title">·</text>
+          <text class="text">
+            送达数量
+            <text class="page_item_info_txt">{{infoDATA.deliveryNum || '无'}}</text>
+          </text>
+          <text class="text">
+            实收数量
+            <text class="page_item_info_txt">{{infoDATA.actualReceiveNum || '无'}}</text>
+          </text>
+          <text class="text">
+            应收数量
+            <text class="page_item_info_txt">{{infoDATA.expectReceiveNum || '无'}}</text>
+          </text>
+        </view>
+      </view>
       <!-- 标本 -->
       <view class="page_item_info" v-if="
           infoDATA.taskType.associationType.value == 'specimen' ||
@@ -204,17 +225,17 @@
           <text class="text">
             预计接收
             <text class="page_item_info_txt">{{
-              infoDATA.expectReceiveNum || 0
+              infoDATA.expectReceiveNum || '无'
             }}</text>
           </text>
           <text class="text"
             v-if="infoDATA.gdState.value == 5 || infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
             扫描接收
-            <text class="page_item_info_txt">{{infoDATA.actualReceiveNum || 0}}</text>
+            <text class="page_item_info_txt">{{infoDATA.actualReceiveNum || '无'}}</text>
           </text>
           <text class="text" v-if="infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
             实际送达
-            <text class="page_item_info_txt">{{actualDelivery || 0}}</text>
+            <text class="page_item_info_txt">{{actualDelivery || '无'}}</text>
           </text>
         </view>
         <view v-for="spe in infoDATA.specimenSet" :key="spe.id" class="spe_list">

pages/receiptpage/receiptpage.vue

@@ -63,13 +63,13 @@
                     item.gdState.value == 5
                   )
                 ">
-                {{ item.gdState.name }}
+                <text class="text_big">{{ item.gdState.name }}</text>
               </view>
               <view class="page_item_top_R" v-if="
                   item.taskType.associationType.value == 'inspect' &&
                   item.gdState.value == 5
                 ">
-                待送回
+                <text class="text_big">待送回</text>
               </view>
               <!-- <view class="page_item_top_R type">
                 {{
@@ -1224,6 +1224,9 @@
                   text-overflow: ellipsis;
                   overflow: hidden;
                 }
+                .text_big{
+                  font-weight: bold;
+                }
               }
             }
 

pages/scanning_all/scanning_all.vue

@@ -150,7 +150,7 @@
             </view>
             <view class="page_item_foot_text">
               <text class="text1">创建时间</text>
-              <text class="text2">{{ infoDATA.startTime }}</text>
+              <text class="text2">{{ infoDATA.startTime || '无' }}</text>
             </view>
           </view>
         </view>

pages/scanning_blood/scanning_blood.vue

@@ -52,7 +52,8 @@
             <view class="page_item_cont_title_C">
               <text>有效期至</text>
               <text class="text_big">
-                <text>{{ bloodDTO.overDate||'无' }}</text>
+                <text v-if="bloodDTO.overDate">{{bloodDTO.overDate | formatDate('yyyy-MM-dd hh:mm')}}</text>
+                <text v-else>无</text>
               </text>
             </view>
           </view>
@@ -67,11 +68,7 @@
           <view class="page_item_cont_C">
             <view class="page_item_cont_title_C">
               <text>RH(D)</text>
-              <text class="text_big">
-                <text v-if="bloodDTO.rhType === '1'">+</text>
-                <text v-else-if="bloodDTO.rhType === '0'">-</text>
-                <text v-else>无</text>
-              </text>
+              <text class="text_big">{{bloodDTO.rhType || '无'}}</text>
             </view>
           </view>
           <view class="page_item_cont_C">

pages/scanning_blood_process/scanning_blood_process.vue

@@ -24,11 +24,11 @@
     <view class="Scanning_cont" v-if="status == 200">
       <view>{{bloodDTO.type ? bloodDTO.type.name : "无"}}<text v-if="bloodDTO.type">({{bloodDTO.bloodCode||'无'}}) {{ bloodDTO.volume?bloodDTO.volume+'ML':'无' }}</text></view>
       <view>采血日期：<text v-if="bloodDTO.printDate">{{bloodDTO.printDate | formatDate('yyyy-MM-dd hh:mm')}}</text><text v-else>无</text></view>
-      <view>有效期至：{{ bloodDTO.overDate||'无' }}</view>
+      <view>有效期至：<text v-if="bloodDTO.overDate">{{bloodDTO.overDate | formatDate('yyyy-MM-dd hh:mm')}}</text><text v-else>无</text></view>
       <view>
         血型：{{ bloodDTO.aboType||'无' }}
         &emsp;&emsp;
-        RH(D)：<text v-if="bloodDTO.rhType === '1'">+</text><text v-else-if="bloodDTO.rhType === '0'">-</text><text v-else>无</text>
+        RH(D)：<text>{{bloodDTO.rhType || '无'}}</text>
       </view>
       <view>患者：<text>{{ bloodDTO.patientName }}<text v-if="bloodDTO.hosNum">({{ bloodDTO.hosNum }})</text></text></view>
       <view>申请科室：{{ bloodDTO.applyDeptDTO?bloodDTO.applyDeptDTO.dept:'无' }}</view>
@@ -122,7 +122,7 @@
             if (codes) {
               post("/transflow/scanBind", {type: 'blood',orderId: this.queryObj.orderId, code: ress1}).then((ress) => {
                 uni.hideLoading();
-                if (ress.state == 200) {
+                if (ress.state == 200 && ress.data.state != 400) {
                   //扫描标本后会自动调用摄像头，继续扫描，直到status不是200
                   setTimeout(()=>{
                     if (type === 'scan') {
@@ -131,11 +131,11 @@
                   },500)
                   //todo
                   uni.redirectTo({
-                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&bloodDTO=${encodeURIComponent(JSON.stringify(ress.data.dto))}&scanCount=${ress.data.scanCount}&status=${ress.state}&scanOrHand=${type}`,
+                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&bloodDTO=${encodeURIComponent(JSON.stringify(ress.data.dto))}&scanCount=${ress.data.scanCount}&status=200&scanOrHand=${type}`,
                   });
                 } else {
                   uni.redirectTo({
-                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&status=${ress.state}&scanOrHand=${type}&qrcode=${ress1}`,
+                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&status=500&scanOrHand=${type}&qrcode=${ress1}`,
                   });
                 }
               });

pages/scanning_code/scanning_code.vue

@@ -150,20 +150,20 @@
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '2'">
           <text class="text1">预计响应时间</text>
-          <text class="text2">{{ infoDATA.estimeResponseTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimeResponseTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '5'">
           <text class="text1" v-if="!(infoDATA.taskType.associationType.value == 'inspect')">预计送达时间</text>
           <text class="text1" v-if="infoDATA.taskType.associationType.value == 'inspect'">预计送回时间</text>
-          <text class="text2">{{ infoDATA.estimeCompleteTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimeCompleteTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '4'">
           <text class="text1">预计到达时间</text>
-          <text class="text2">{{ infoDATA.estimateArriveTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimateArriveTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text">
           <text class="text1">创建时间</text>
-          <text class="text2">{{ infoDATA.startTime }}</text>
+          <text class="text2">{{ infoDATA.startTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="
             infoDATA.taskType.associationType.value == 'inspect' ||

pages/scanning_ins/scanning_ins.vue

@@ -178,20 +178,20 @@
             </view>
             <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '2'">
               <text class="text1">预计响应时间</text>
-              <text class="text2">{{ infoDATA.estimeResponseTime || 0 }}</text>
+              <text class="text2">{{ infoDATA.estimeResponseTime || '无' }}</text>
             </view>
             <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '5'">
               <text class="text1" v-if="!(infoDATA.taskType.associationType.value == 'inspect')">预计送达时间</text>
               <text class="text1" v-if="infoDATA.taskType.associationType.value == 'inspect'">预计送回时间</text>
-              <text class="text2">{{ infoDATA.estimeCompleteTime || 0 }}</text>
+              <text class="text2">{{ infoDATA.estimeCompleteTime || '无' }}</text>
             </view>
             <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '4'">
               <text class="text1">预计到达时间</text>
-              <text class="text2">{{ infoDATA.estimateArriveTime || 0 }}</text>
+              <text class="text2">{{ infoDATA.estimateArriveTime || '无' }}</text>
             </view>
             <view class="page_item_foot_text">
               <text class="text1">创建时间</text>
-              <text class="text2">{{ infoDATA.startTime }}</text>
+              <text class="text2">{{ infoDATA.startTime || '无' }}</text>
             </view>
           </view>
         </view>

pages/scanning_orderSign/scanning_orderSign.vue

@@ -83,20 +83,20 @@
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '2'">
           <text class="text1">预计响应时间</text>
-          <text class="text2">{{ infoDATA.estimeResponseTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimeResponseTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '5'">
           <text class="text1" v-if="!(infoDATA.taskType.associationType.value == 'inspect')">预计送达时间</text>
           <text class="text1" v-if="infoDATA.taskType.associationType.value == 'inspect'">预计送回时间</text>
-          <text class="text2">{{ infoDATA.estimeCompleteTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimeCompleteTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '4'">
           <text class="text1">预计到达时间</text>
-          <text class="text2">{{ infoDATA.estimateArriveTime || 0 }}</text>
+          <text class="text2">{{ infoDATA.estimateArriveTime || '无' }}</text>
         </view>
         <view class="page_item_foot_text">
           <text class="text1">创建时间</text>
-          <text class="text2">{{ infoDATA.startTime }}</text>
+          <text class="text2">{{ infoDATA.startTime || '无' }}</text>
         </view>
       </view>
       <!-- 标本 送达-->

pages/signIn_blood/signIn_blood.vue

@@ -68,12 +68,19 @@
           uni.hideLoading();
           if(res.state == 200){
             console.log(res);
+            res.data.all = res.data.all || [];
+            res.data.dto = res.data.dto || {};
             this.order = res.data.dto;
-            this.bloods = {...res.data.complete, ...res.data.unComplete};
-            this.receiveNum = 0;
-            for (let key in this.bloods) {
-              this.receiveNum += this.bloods[key].length;
-            }
+            const bloods = {};
+            res.data.all.forEach(v => {
+              if(bloods[v.type.name]){
+                bloods[v.type.name].push(v);
+              }else{
+                bloods[v.type.name] = [v];
+              }
+            })
+            this.bloods = bloods;
+            this.receiveNum = res.data.all.length;
           }else{
             uni.showToast({
               icon: "none",
@@ -136,7 +143,7 @@
             if (codes) {
               post("/transflow/scanBind", {type: 'blood',orderId: this.queryObj.orderId, code: ress1}).then((ress) => {
                 uni.hideLoading();
-                if (ress.state == 200) {
+                if (ress.state == 200 && ress.data.state != 400) {
                   //扫描标本后会自动调用摄像头，继续扫描，直到status不是200
                   setTimeout(()=>{
                     if (type === 'scan') {
@@ -145,11 +152,11 @@
                   },500)
                   //todo
                   uni.redirectTo({
-                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&bloodDTO=${encodeURIComponent(JSON.stringify(ress.data.dto))}&scanCount=${ress.data.scanCount}&status=${ress.state}&scanOrHand=${type}`,
+                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&bloodDTO=${encodeURIComponent(JSON.stringify(ress.data.dto))}&scanCount=${ress.data.scanCount}&status=200&scanOrHand=${type}`,
                   });
                 } else {
                   uni.redirectTo({
-                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&status=${ress.state}&scanOrHand=${type}&qrcode=${ress1}`,
+                    url: `../scanning_blood_process/scanning_blood_process?orderId=${this.queryObj.orderId}&status=500&scanOrHand=${type}&qrcode=${ress1}`,
                   });
                 }
               });