数字交接优化

pages/scanning_code/scanning_code.vue

@@ -1140,6 +1140,9 @@
           uni.hideLoading();
           if (res.status == 200) {
             this.infoDATA = res.data;
+            if(this.infoDATA.taskType.isDigitalHandover==1){
+              this.checkNumber(this.infoDATA);//自动弹出数量核对
+            }
           } else {
             uni.showToast({
               icon: "none",
@@ -1160,6 +1163,9 @@
           uni.hideLoading();
           if (res.state == 200) {
             this.infoDATA = res.data;
+            if(this.infoDATA.taskType.isDigitalHandover==1){
+              this.checkNumber(this.infoDATA);//自动弹出数量核对
+            }
             // 计算高度
             setTimeout(() => {
               const query = uni.createSelectorQuery().in(this);

pages/scanning_djEnd/scanning_djEnd.vue

@@ -1033,6 +1033,9 @@
         this.type = list.type;
       }
       this.type1 = options.type1;
+      if(this.queryObj.isDigitalHandover==1){
+        this.checkNumber();//自动弹出数量核对
+      }
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif

pages/specimenChecking/specimenChecking.vue

@@ -33,6 +33,10 @@
       <view class="btn2" @click="createOrder">确认数量并建单</view>
       <view class="btn2" @click="goto()">知道了</view>
     </view>
+    <!-- 修改标本数量弹窗 -->
+    <changeSpeNum v-if="changeSpeModels.disjunctor" :operate="{ok:'确认数量',check:'详细核对',cancel:'取消'}" :title="changeSpeModels.title" :content="changeSpeModels.content"
+      :disjunctor="changeSpeModels.disjunctor" @ok="changeSpeOk" @check="changeSpeCheck" @cancel="changeSpeCancel" :num="speNumChange">
+    </changeSpeNum>
   </view>
 </template>
 <script>
@@ -46,9 +50,269 @@
       return {
         list: [],
         msg: {}, //页面展示信息
+        // 修改标本数量弹窗model
+        changeSpeModels: {
+          disjunctor: false,
+        },
+        speNumChange: 0,
+        changeSpeObj: {},
       };
     },
     methods: {
+      // 数量核对 start
+      // 修改标本数量-核对
+      changeSpeCheck(){
+        this.changeSpeModels.disjunctor = false;
+        uni.navigateTo({
+          url: `../../pages/specimenCheckingDetail/specimenCheckingDetail?infoDATA=${encodeURIComponent(JSON.stringify(this.changeSpeObj.infoDATA))}&id=${this.changeSpeObj.id}&endDepts=${this.changeSpeObj.endDepts}`,
+        });
+      },
+      // 修改标本数量-确认
+      changeSpeOk(data) {
+        console.log(data);
+        const pathUrl = uni.getStorageSync("path");
+        const {
+          speNum,
+          reason,
+          imageValue
+        } = data;
+        this.changeSpeModels.disjunctor = false;
+        uni.showLoading({
+          mask: true,
+          title: "加载中",
+        });
+        let postData = {
+          checkDept: this.changeSpeObj.endDepts, //终点科室
+          transDeptId: this.changeSpeObj.infoDATA.startDept,
+          gdId: this.changeSpeObj.infoDATA.uuid,
+          deptId: this.changeSpeObj.id == "undefined" ?
+            this.changeSpeObj.infoDATA.startDept : this.changeSpeObj.id,
+          specimensNum: speNum,
+          modifyReason: reason,
+        };
+        post("/api/updateCheckDeptSpecimensNum", postData).then((res) => {
+          if (res.status == 200) {
+            console.log(imageValue);
+            if (!imageValue.length) {
+              uni.hideLoading();
+              uni.showModal({
+                title: "提示",
+                content: "修改成功！",
+                showCancel: false,
+                success: (result) => {
+                  if (result.confirm) {
+                    console.log("用户点击确定");
+                    if (this.changeSpeObj.t == "big") {
+                      if (this.changeSpeObj.gdState == 4) {
+                        // 待到达
+                        uni.navigateTo({
+                          url: `../../pages/receiptpage/receiptpage`,
+                        });
+                      } else if (this.changeSpeObj.gdState == 5) {
+                        // 待送达
+                        if (res.type1 === "plan-spe-ddd-2") {} else {
+                          let content = `本工单已签到<strong class="red">${
+                          res.scanSet ? res.scanSet.join("、") : ""
+                        }</strong>，剩余需签到科室<strong class="red">${
+                          res.notScanSet ? res.notScanSet.join("、") : ""
+                        }</strong>，您确定完成工单吗？`;
+                          uni.navigateTo({
+                            url: `../scanning/scanning?type=${res.type}&type1=${
+                            res.type1
+                          }&id=${encodeURIComponent(
+                            JSON.stringify([res.gdid])
+                          )}&content=${content}`,
+                          });
+                        }
+                      }
+                    } else if (this.changeSpeObj.t == "small") {
+                      if (this.changeSpeObj.id == "undefined") {
+                        //快捷建单建单进入
+                        uni.navigateTo({
+                          url: `../../pages/receiptpage/receiptpage`,
+                        });
+                      } else {
+                        if (this.changeSpeObj.gdState == 4) {
+                          // 待到达
+                          uni.navigateTo({
+                            url: `../../pages/receiptpage/receiptpage`,
+                          });
+                        } else if (this.changeSpeObj.gdState == 5) {
+                          // 待送达
+                          if (res.type1 === "plan-spe-ddd-2") {} else {
+                            let content = `本工单已签到<strong class="red">${
+                            res.scanSet ? res.scanSet.join("、") : ""
+                          }</strong>，剩余需签到科室<strong class="red">${
+                            res.notScanSet ? res.notScanSet.join("、") : ""
+                          }</strong>，您确定完成工单吗？`;
+                            uni.navigateTo({
+                              url: `../scanning/scanning?type=${res.type}&type1=${
+                              res.type1
+                            }&id=${encodeURIComponent(
+                              JSON.stringify([res.gdid])
+                            )}&content=${content}`,
+                            });
+                          }
+                        }
+                      }
+                    } else {
+                      uni.navigateTo({
+                        url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                        JSON.stringify(this.changeSpeObj.infoDATA)
+                      )}`,
+                      });
+                    }
+                  } else if (result.cancel) {
+                    console.log("用户点击取消");
+                  }
+                },
+              });
+              return;
+            }
+            let n = 0;
+            imageValue.forEach((v) => {
+              // 图片上传 start
+              console.log("压缩前");
+              let canvasWidth = v.image.width; //图片原始长宽
+              let canvasHeight = v.image.height;
+              let img = new Image();
+              img.src = v.path;
+              let canvas = document.createElement("canvas");
+              let ctx = canvas.getContext("2d");
+              canvas.width = canvasWidth;
+              canvas.height = canvasHeight;
+              ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight);
+              canvas.toBlob(
+                (fileSrc) => {
+                  let tp = window.URL.createObjectURL(fileSrc);
+                  console.log("压缩后");
+                  n++;
+                  uni.uploadFile({
+                    url: pathUrl +
+                      "/common/common/uploadAttachment/specimenPhotos/" +
+                      res.deptSpecimensNumId +
+                      "/666",
+                    filePath: tp,
+                    name: "file",
+                    formData: {
+                      filename: v.cloudPath,
+                    },
+                    success: (uploadFileRes) => {
+                      console.log(uploadFileRes);
+                      if (--n === 0) {
+                        uni.hideLoading();
+                        uni.showModal({
+                          title: "提示",
+                          content: "修改成功！",
+                          showCancel: false,
+                          success: (result) => {
+                            if (result.confirm) {
+                              console.log("用户点击确定", this.changeSpeObj.t);
+                              if (this.changeSpeObj.t == "big") {
+                                if (this.changeSpeObj.gdState == 4) {
+                                  // 待到达
+                                  uni.navigateTo({
+                                    url: `../../pages/receiptpage/receiptpage`,
+                                  });
+                                } else if (this.changeSpeObj.gdState == 5) {
+                                  // 待送达
+                                  if (res.type1 === "plan-spe-ddd-2") {} else {
+                                    let content = `本工单已签到<strong class="red">${
+                                    res.scanSet ? res.scanSet.join("、") : ""
+                                  }</strong>，剩余需签到科室<strong class="red">${
+                                    res.notScanSet ? res.notScanSet.join("、") : ""
+                                  }</strong>，您确定完成工单吗？`;
+                                    uni.navigateTo({
+                                      url: `../scanning/scanning?type=${res.type}&type1=${
+                                      res.type1
+                                    }&id=${encodeURIComponent(
+                                      JSON.stringify([res.gdid])
+                                    )}&content=${content}`,
+                                    });
+                                  }
+                                }
+                              } else if (this.changeSpeObj.t == "small") {
+                                if (this.changeSpeObj.id == "undefined") {
+                                  //快捷建单建单进入
+                                  uni.navigateTo({
+                                    url: `../../pages/receiptpage/receiptpage`,
+                                  });
+                                } else {
+                                  if (this.changeSpeObj.gdState == 4) {
+                                    // 待到达
+                                    uni.navigateTo({
+                                      url: `../../pages/receiptpage/receiptpage`,
+                                    });
+                                  } else if (this.changeSpeObj.gdState == 5) {
+                                    // 待送达
+                                    if (res.type1 === "plan-spe-ddd-2") {} else {
+                                      let content = `本工单已签到<strong class="red">${
+                                      res.scanSet ? res.scanSet.join("、") : ""
+                                    }</strong>，剩余需签到科室<strong class="red">${
+                                      res.notScanSet ? res.notScanSet.join("、") : ""
+                                    }</strong>，您确定完成工单吗？`;
+                                      uni.navigateTo({
+                                        url: `../scanning/scanning?type=${res.type}&type1=${
+                                        res.type1
+                                      }&id=${encodeURIComponent(
+                                        JSON.stringify([res.gdid])
+                                      )}&content=${content}`,
+                                      });
+                                    }
+                                  }
+                                }
+                              } else {
+                                uni.navigateTo({
+                                  url: `../../pages/specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                                  JSON.stringify(this.changeSpeObj.infoDATA)
+                                )}`,
+                                });
+                              }
+                            } else if (result.cancel) {
+                              console.log("用户点击取消");
+                            }
+                          },
+                        });
+                      }
+                    },
+                    fail: (err) => {
+                      n--;
+                      console.error(err);
+                      uni.hideLoading();
+                      uni.showToast({
+                        icon: "none",
+                        title: "上传失败",
+                        duration: 2000,
+                      });
+                    },
+                  });
+                },
+                "image/jpeg",
+                0.3
+              );
+              // 图片上传 end
+            });
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      // 修改标本数量-取消
+      changeSpeCancel() {
+        this.changeSpeModels.disjunctor = false;
+      },
+      // 修改标本数量弹窗
+      showChangeSpe() {
+        this.changeSpeModels = {
+          title: "修改标本数量",
+          disjunctor: true,
+        };
+      },
+      // 数量核对 end
       // 获取列表
       getList() {
         uni.showLoading({
@@ -75,9 +339,13 @@
       },
       // 跳转到详情页
       gotoDetail(item) {
-        uni.navigateTo({
-          url: `../../pages/specimenCheckingDetail/specimenCheckingDetail?infoDATA=${encodeURIComponent(JSON.stringify(this.msg))}&id=${item[0]}&endDepts=${this.msg.targetDept}`,
-        });
+        this.speNumChange = item[2];
+        this.changeSpeObj = {
+          infoDATA: this.msg,
+          id: item[0],
+          endDepts:this.msg.targetDept,
+        }
+        this.showChangeSpe();
       },
       // 知道了
       goto() {

pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -20,13 +20,15 @@
         <view class="page_item_top">
           <view class="page_item_top-inner">
             <view class="page_item_top_L">
-              <view class="L_text">{{ item.patientName }}</view>
+              <view class="L_text">{{ item.patientName }}<text v-if="item.bedNum">({{item.bedNum}})</text></view>
             </view>
             <view class="page_item_top_R">
-              <view class="L_iocn"><button type="primary" size="mini" class="back" @click="back(item, msg.uuid)"
-                  v-if="options.t">
+              <view class="L_iocn">
+                <text>{{item.urgent == 1 ? "急" : "普"}}</text>
+                <button type="primary" size="mini" class="back" @click="back(item, msg.uuid)" v-if="options.t">
                   退回
-                </button></view>
+                </button>
+              </view>
             </view>
           </view>
         </view>
@@ -37,14 +39,12 @@
               <view class="text_big">{{ item.specimenDesc || "无" }}</view>
             </view>
             <view class="page_item_cont_title">
-              <view> 标本编码 </view>
-              <view class="text_big">{{ item.scode || "无" }}</view>
+              <view> 标本编码(标本类型) </view>
+              <view class="text_big">{{ item.scode || "无" }}<text v-if="item.stype">({{item.stype.name}})</text></view>
             </view>
             <view class="page_item_cont_title">
-              <view> 标本类型 </view>
-              <view class="text_big">{{
-                item.stype ? item.stype.name : "无"
-              }}</view>
+              <view> 住院号 </view>
+              <view class="text_big">{{ item.residenceNo || "无" }}</view>
             </view>
             <view class="page_item_cont_title">
               <view> 申请科室 </view>
@@ -53,8 +53,10 @@
               }}</view>
             </view>
             <view class="page_item_cont_title">
-              <view> 住院号 </view>
-              <view class="text_big">{{ item.residenceNo || "无" }}</view>
+              <view> 目标科室 </view>
+              <view class="text_big">{{
+                item.checkDept ? item.checkDept.dept : "-"
+              }}</view>
             </view>
           </view>
         </view>
@@ -792,11 +794,15 @@
               font-size: 32rpx;
 
               .back {
+                color: rgb(7, 134, 60);
                 background-color: #49b856;
+                margin-left: 16rpx;
               }
 
               .L_iocn {
-                color: rgb(7, 134, 60);
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
                 font-size: 36rpx;
                 font-weight: 700;
               }