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

components/bigScreen/bigScreen.vue

@@ -397,251 +397,233 @@
         }
         this.SMFlag = false;
         SM().then((content) => {
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性(扫码前必须验证)
-          post("/dept/scanning", {
-              content,
-            })
-            .then((result) => {
-              this.currentCode = result.code;
-              this.SMFlag = true;
-              // 200检测通过，201没有有效期也通过。
-              if (result.state == 200 || result.state == 201) {
-                let data = {
-                  code: result.code, //二维码
-                };
-                //微信—大扫描（科室码，患者码，标本码，快捷建单码，药包码）
-                let code = result.code.includes(qrcodePrefix) ? result.code : qrcodePrefix + result.code;
-                post("/workerOrder/scanCode", { code, hosId: this.hosId })
-                  .then((res) => {
-                    uni.hideLoading();
-                    if (res.status == 200) {
-                      // 扫描标本码
-                      if (res.type == "specimen") {
-                        let infoDATA = {
-                          stype: res.data.stype,
-                          scode: res.data.scode,
-                          patientName: res.data.patientName,
-                          sickRoom: res.data.sickRoom ?
-                            res.data.sickRoom.dept : "-",
-                          checkDept: res.data.checkDept ?
-                            res.data.checkDept.dept : "-",
-                          bedNum: res.data.bedNum,
-                        };
+          this.ScanningCommon(qrcodePrefix, content);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      //底部扫描-无须扫码
+      ScanningCommon(qrcodePrefix = '', content){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //检验二维码的有效性(扫码前必须验证)
+        post("/dept/scanning", {
+            content,
+          })
+          .then((result) => {
+            this.currentCode = result.code;
+            this.SMFlag = true;
+            // 200检测通过，201没有有效期也通过。
+            if (result.state == 200 || result.state == 201) {
+              let data = {
+                code: result.code, //二维码
+              };
+              //微信—大扫描（科室码，患者码，标本码，快捷建单码，药包码）
+              let code = result.code.includes(qrcodePrefix) ? result.code : qrcodePrefix + result.code;
+              post("/workerOrder/scanCode", { code, hosId: this.hosId })
+                .then((res) => {
+                  uni.hideLoading();
+                  if (res.status == 200) {
+                    // 扫描标本码
+                    if (res.type == "specimen") {
+                      let infoDATA = {
+                        stype: res.data.stype,
+                        scode: res.data.scode,
+                        patientName: res.data.patientName,
+                        sickRoom: res.data.sickRoom ?
+                          res.data.sickRoom.dept : "-",
+                        checkDept: res.data.checkDept ?
+                          res.data.checkDept.dept : "-",
+                        bedNum: res.data.bedNum,
+                      };
+                      uni.navigateTo({
+                        url: `../scanning_B/scanning_B?res=${encodeURIComponent(
+                        JSON.stringify(res)
+                      )}&infoDATA=${encodeURIComponent(
+                        JSON.stringify(infoDATA)
+                      )}`,
+                      });
+                    } else if (res.type == "patient") {
+                      //如果是患者腕带码
+                      // code: data.code //二维码
+                      res.workOrder = res.workOrder ? res.workOrder : []; //liao
+                      uni.navigateTo({
+                        url: `../scanning_ins/scanning_ins?code=${
+                        data.code
+                      }&infoDATA=${encodeURIComponent(
+                        JSON.stringify(res.data)
+                      )}&workData=${encodeURIComponent(
+                        JSON.stringify(res.workOrder)
+                      )}&patientOrders=${encodeURIComponent(
+                        JSON.stringify(res.patientOrders)
+                      )}`,
+                      });
+                    } else if (res.type == "quickOrder") {
+                      //快捷建单
+                      if(res.data.isDigitalHandover == 1){
                         uni.navigateTo({
-                          url: `../scanning_B/scanning_B?res=${encodeURIComponent(
-                          JSON.stringify(res)
-                        )}&infoDATA=${encodeURIComponent(
-                          JSON.stringify(infoDATA)
+                          url: `../specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
+                          JSON.stringify(res.data)
                         )}`,
                         });
-                      } else if (res.type == "patient") {
-                        //如果是患者腕带码
-                        // code: data.code //二维码
-                        res.workOrder = res.workOrder ? res.workOrder : []; //liao
+                      }else{
                         uni.navigateTo({
-                          url: `../scanning_ins/scanning_ins?code=${
-                          data.code
-                        }&infoDATA=${encodeURIComponent(
+                          url: `../shortcutbuildOrders/shortcutbuildOrders?infoDATA=${encodeURIComponent(
                           JSON.stringify(res.data)
-                        )}&workData=${encodeURIComponent(
-                          JSON.stringify(res.workOrder)
-                        )}&patientOrders=${encodeURIComponent(
-                          JSON.stringify(res.patientOrders)
                         )}`,
                         });
-                      } else if (res.type == "quickOrder") {
-                        //快捷建单
-                        if(res.data.isDigitalHandover == 1){
-                          uni.navigateTo({
-                            url: `../specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-                            JSON.stringify(res.data)
-                          )}`,
-                          });
-                        }else{
-                          uni.navigateTo({
-                            url: `../shortcutbuildOrders/shortcutbuildOrders?infoDATA=${encodeURIComponent(
-                            JSON.stringify(res.data)
-                          )}`,
-                          });
-                        }
-                      } else if (res.type == "dept") {
-                        // 扫描科室码
-                        // code: data.code //二维码
-                        let infoDATA = res.data;
-                        console.log(infoDATA)
+                      }
+                    } else if (res.type == "dept") {
+                      // 扫描科室码
+                      // code: data.code //二维码
+                      let infoDATA = res.data;
+                      console.log(infoDATA)
+
+                      if(res.sign === 'bloodTake'){
+                        //新血制品-扫科室
+                        uni.navigateTo({
+                          url: `/pages/newBlood/startOrderSignBlood/startOrderSignBlood?deptId=${res.deptId}&deptName=${res.deptName}&taskTypeId=${res.taskTypeId}`,
+                        });
+                      }else if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
                         // 判断是否是标本配送，并且仅仅只有这一种业务类型，默认全选,并跳转到下一步;
                         // 判断是否是标本轮巡 ，并且仅仅只有这一种业务类型，并且只有一个工单，默认选中,并跳转到下一步;
-                        if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
-                          this.infoDATA = infoDATA;
-                          this.workData = infoDATA.specimen || infoDATA.specimenPlan;
-                          this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
-                          this.code = data.code;
-                          this.selectArr = [];
-                          for (var i = 0; i < this.workData.length; i++) {
-                            this.selectArr.push(this.workData[i].id);
-                          }
-                          this.userId.ids = this.selectArr;
-                          this.orderDeptHandler(true);
-                        }else if(res.deptHandoverType && res.deptHandoverType.value == 'clinicalWaste'){
-                          // 医废
-                          uni.navigateTo({
-                            url: `/pages/medicalWaste/medicalWasteSignIn/medicalWasteSignIn?code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
-                          });
-                        }else{
-                          uni.navigateTo({
-                            url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
-                            JSON.stringify(infoDATA)
-                          )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
-                          });
+                        this.infoDATA = infoDATA;
+                        this.workData = infoDATA.specimen || infoDATA.specimenPlan;
+                        this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
+                        this.code = data.code;
+                        this.selectArr = [];
+                        for (var i = 0; i < this.workData.length; i++) {
+                          this.selectArr.push(this.workData[i].id);
                         }
-                      } else if (res.type == 'drugsBag') {
-                        if (res.drugsBagType == 'drugsJpbag' || res.drugsBagType == 'drugsWestern' || res.drugsBagType == 'drugsReturn' || res.drugsBagType == 'drugsPoison' || res.drugsBagType == 'drugsHerbal') {
-                          //新药品-扫静配|西药|退药|毒麻|中草药
-                          if(res.orderId){
-                            // 有工单
-                            this.getInfo(res, code);
-                          }else{
-                            // 没有工单,进入起点科室流程
-                            uni.navigateTo({
-                              url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
-                            });
-                          }
+                        this.userId.ids = this.selectArr;
+                        this.orderDeptHandler(true);
+                      }else if(res.deptHandoverType && res.deptHandoverType.value == 'clinicalWaste'){
+                        // 医废
+                        uni.navigateTo({
+                          url: `/pages/medicalWaste/medicalWasteSignIn/medicalWasteSignIn?code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
+                        });
+                      }else if(res.sign === 'patientIntelligentScan'){
+                        // 患者陪检和患者其他服务智能扫码
+                        uni.navigateTo({
+                          url: `/pages/newSendBack/sendBackOrder/sendBackOrder?deptId=${res.deptId}&code=${data.code}`,
+                        });
+                      }else{
+                        uni.navigateTo({
+                          url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
+                          JSON.stringify(infoDATA)
+                        )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
+                        });
+                      }
+                    } else if (res.type == 'drugsBag') {
+                      if (res.drugsBagType == 'drugsJpbag' || res.drugsBagType == 'drugsWestern' || res.drugsBagType == 'drugsReturn' || res.drugsBagType == 'drugsPoison' || res.drugsBagType == 'drugsHerbal') {
+                        //新药品-扫静配|西药|退药|毒麻|中草药
+                        if(res.orderId){
+                          // 有工单
+                          this.getInfo(res, code);
                         }else{
-                          //扫药包码
+                          // 没有工单,进入起点科室流程
                           uni.navigateTo({
-                            url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}&drugsBagBatchNo=${res.drugsBagBatchNo}`,
+                            url: `/pages/newDrug/createOrder/createOrder?drugsBagType=${res.drugsBagType}&drugsBagId=${res.drugsBagId}&type=build`,
                           });
                         }
-                      } else if (res.type == 'nucleicAcid') {
-                        //扫核酸码
+                      }else{
+                        //扫药包码
                         uni.navigateTo({
-                          url: `/pages/scanning_nucleicAcid/scanning_nucleicAcid?qrcode=${data.code}`,
+                          url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}&drugsBagBatchNo=${res.drugsBagBatchNo}`,
                         });
-                      } else if (res.type == 'blood') {
-                        //扫血制品
-                        // 判断size,多个则进入新页面选择
-                        if(res.size > 1){
-                          uni.navigateTo({
-                            url: `/pages/bloodSelect/bloodSelect?qrcode=${data.code}&navigateTo=scanning_blood`,
-                          });
-                        } else {
-                          uni.navigateTo({
-                            url: `/pages/scanning_blood/scanning_blood?qrcode=${data.code}`,
-                          });
-                        }
-                      } else if (res.type == 'receiveOrder') {
-                        //扫快捷接单
-                        uni.showModal({
-                          title: "提示",
-                          content: `您本次接单包括${res.names.join('、')}，一共含有${res.data.length}个工单，是否确认接单？`,
-                          success: function(result) {
-                            if (result.confirm) {
-                              uni.showLoading({
-                                title: "加载中",
-                                mask: true,
-                              });
-                              post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((result) => {
-                                uni.hideLoading();
-                                if (result.status == 200) {
-                                  uni.showModal({
-                                    title: "提示",
-                                    content: `本次接单包括${res.names.join('、')}，${res.data.length}个工单已接单完成`,
-                                    showCancel: false,
-                                    success: function(res) {
-                                      if (res.confirm) {
-                                        console.log("用户点击确定");
-                                        uni.redirectTo({
-                                          url: "../receiptpage/receiptpage",
-                                        });
-                                      } else if (res.cancel) {
-                                        console.log("用户点击取消");
-                                      }
-                                    },
-                                  });
-                                } else {
-                                  uni.showToast({
-                                    icon: "none",
-                                    title: result.msg || "接口获取数据失败！",
-                                  });
-                                }
-                              });
-                            } else if (result.cancel) {
-                              console.log("用户点击取消");
-                            }
-                          },
+                      }
+                    } else if (res.type == 'nucleicAcid') {
+                      //扫核酸码
+                      uni.navigateTo({
+                        url: `/pages/scanning_nucleicAcid/scanning_nucleicAcid?qrcode=${data.code}`,
+                      });
+                    } else if (res.type == 'blood') {
+                      //扫血制品
+                      // 判断size,多个则进入新页面选择
+                      if(res.size > 1){
+                        uni.navigateTo({
+                          url: `/pages/bloodSelect/bloodSelect?qrcode=${data.code}&navigateTo=scanning_blood`,
                         });
-                      } else if (res.type == 'bloodTake') {
-                        if(res.data){
-                          //新血制品-扫科室
-                          uni.navigateTo({
-                            url: `/pages/newBlood/startOrderSignBlood/startOrderSignBlood?deptId=${res.deptId}&deptName=${res.deptName}&taskTypeId=${res.taskTypeId}`,
-                          });
-                        }else{
-                          // 走type是dept的流程
-                          // 扫描科室码
-                          // code: data.code //二维码
-                          let infoDATA = res.data;
-                          console.log(infoDATA)
-                          // 判断是否是标本配送，并且仅仅只有这一种业务类型，默认全选,并跳转到下一步;
-                          // 判断是否是标本轮巡 ，并且仅仅只有这一种业务类型，并且只有一个工单，默认选中,并跳转到下一步;
-                          if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
-                            this.infoDATA = infoDATA;
-                            this.workData = infoDATA.specimen || infoDATA.specimenPlan;
-                            this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
-                            this.code = data.code;
-                            this.selectArr = [];
-                            for (var i = 0; i < this.workData.length; i++) {
-                              this.selectArr.push(this.workData[i].id);
-                            }
-                            this.userId.ids = this.selectArr;
-                            this.orderDeptHandler(true);
-                          }else{
-                            uni.navigateTo({
-                              url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
-                              JSON.stringify(infoDATA)
-                            )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
+                      } else {
+                        uni.navigateTo({
+                          url: `/pages/scanning_blood/scanning_blood?qrcode=${data.code}`,
+                        });
+                      }
+                    } else if (res.type == 'receiveOrder') {
+                      //扫快捷接单
+                      uni.showModal({
+                        title: "提示",
+                        content: `您本次接单包括${res.names.join('、')}，一共含有${res.data.length}个工单，是否确认接单？`,
+                        success: function(result) {
+                          if (result.confirm) {
+                            uni.showLoading({
+                              title: "加载中",
+                              mask: true,
                             });
+                            post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((result) => {
+                              uni.hideLoading();
+                              if (result.status == 200) {
+                                uni.showModal({
+                                  title: "提示",
+                                  content: `本次接单包括${res.names.join('、')}，${res.data.length}个工单已接单完成`,
+                                  showCancel: false,
+                                  success: function(res) {
+                                    if (res.confirm) {
+                                      console.log("用户点击确定");
+                                      uni.redirectTo({
+                                        url: "../receiptpage/receiptpage",
+                                      });
+                                    } else if (res.cancel) {
+                                      console.log("用户点击取消");
+                                    }
+                                  },
+                                });
+                              } else {
+                                uni.showToast({
+                                  icon: "none",
+                                  title: result.msg || "接口获取数据失败！",
+                                });
+                              }
+                            });
+                          } else if (result.cancel) {
+                            console.log("用户点击取消");
                           }
-                        }
-                      } else if(res.type == 'clinicalWaste'){
-                        // 医废
-                        if(res.wasteDetails){
-                          uni.navigateTo({
-                            url: `/pages/medicalWaste/medicalWasteDetail/medicalWasteDetail?qrcode=${res.code}`,
-                          });
-                        }else{
-                          uni.navigateTo({
-                            url: `/pages/medicalWaste/medicalWasteBind/medicalWasteBind?qrcode=${res.code}`,
-                          });
-                        }
-                      }
-                    } else {
-                      if(res.bigScanSpecialMsg){
+                        },
+                      });
+                    } else if(res.type == 'clinicalWaste'){
+                      // 医废
+                      if(res.wasteDetails){
                         uni.navigateTo({
-                          url: `../scanning_big_Result/scanning_big_Result?msg=${res.msg || ''}&qrcode=${this.currentCode}&bigScanSpecialMsg=${encodeURIComponent(JSON.stringify(res.bigScanSpecialMsg))}`,
+                          url: `/pages/medicalWaste/medicalWasteDetail/medicalWasteDetail?qrcode=${res.code}`,
                         });
                       }else{
                         uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}`,
+                          url: `/pages/medicalWaste/medicalWasteBind/medicalWasteBind?qrcode=${res.code}`,
                         });
                       }
                     }
-                  });
-              } else {
-                uni.hideLoading();
-                uni.showToast({
-                  icon: "none",
-                  title: result.info || "接口获取数据失败！",
+                  } else {
+                    if(res.bigScanSpecialMsg){
+                      uni.navigateTo({
+                        url: `../scanning_big_Result/scanning_big_Result?msg=${res.msg || ''}&qrcode=${this.currentCode}&bigScanSpecialMsg=${encodeURIComponent(JSON.stringify(res.bigScanSpecialMsg))}`,
+                      });
+                    }else{
+                      uni.navigateTo({
+                        url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}`,
+                      });
+                    }
+                  }
                 });
-              }
-            })
-        }).catch(err => {
-          this.SMFlag = true;
-        });
+            } else {
+              uni.hideLoading();
+              uni.showToast({
+                icon: "none",
+                title: result.info || "接口获取数据失败！",
+              });
+            }
+          })
       },
     },
     onShow() {

components/handViewDrugsBag/handViewDrugsBag.vue

@@ -10,7 +10,7 @@
             {{name}}：
           </view>
           <view class="uni-list-cell-db">
-            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name" v-model="account"
+            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name" placeholder-style="text-align:left;" v-model="account"
               @input="bindPickerChange($event)" />
           </view>
         </view>
@@ -117,7 +117,7 @@
         type: Object,
         default: () => {
           return {
-            ok: "确认",
+            ok: "确定",
             cancel: "取消",
           };
         },
@@ -196,7 +196,7 @@
     z-index: 999;
 
     .uni-list-cell {
-      width: 90%;
+      width: 100%;
       display: flex;
       flex-direction: row;
       justify-content: space-evenly;
@@ -205,16 +205,18 @@
       margin-top: 32rpx;
 
       .uni-list-cell-left {
-        flex: 3;
         font-size: 32rpx;
         color: #666;
+        text-align: left;
+        padding-left: 24rpx;
       }
 
       .uni-list-cell-db {
         border: 1px solid #e5e9ed;
         background-color: #fff;
-        padding: 16rpx 0;
-        flex: 5;
+        padding: 16rpx;
+        flex: 1;
+        margin-right: 24rpx;
       }
 
       .uni-list-cell-db-text {

components/handViewPatient/handViewPatient.vue

@@ -0,0 +1,322 @@
+<template>
+  <view class="changeHospital" v-show="disjunctor">
+    <view class="changeHospital__wrap">
+      <view class="changeHospital__header" v-if="title">
+        {{ title }}
+      </view>
+      <view class="changeHospital__article">
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            {{name}}：
+          </view>
+          <view class="uni-list-cell-db">
+            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name" v-model="account"
+              @input="bindPickerChange($event)" />
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            患者姓名：
+          </view>
+          <view class="uni-list-cell-db-text">
+            <text v-show="!loading">{{patientDTO.patientName||'无'}}</text>
+            <view class="sk-circle" v-show="loading">
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+              <view class="sk-circle-dot"></view>
+            </view>
+          </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 {
+        cValue: '', //当前输入的内容
+        loading: false,
+        userData: null,
+        hosId: null,
+        timer: null,
+        patientDTO: {}, //发药单对象
+        account: '',
+      };
+    },
+    watch: {
+      disjunctor(newValue) {
+        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,
+      },
+      // 标题
+      title: {
+        type: String,
+        default: "提示",
+      },
+      // 操作按钮文字
+      operate: {
+        type: Object,
+        default: () => {
+          return {
+            ok: "确认",
+            cancel: "取消",
+          };
+        },
+      },
+      name: {
+        type: String,
+        default: '患者住院号'
+      }
+    },
+    methods: {
+      //修改picker的值
+      bindPickerChange(e) {
+        this.patientDTO = {};
+        this.loading = true;
+        this.cValue = e.target.value;
+        clearTimeout(this.timer);
+        if (this.cValue.length <= 4) {
+          this.patientDTO = {};
+          this.loading = false;
+          return;
+        }
+        this.timer = setTimeout(() => {
+          let nAccount = e.target.value;
+          post("/patient/patientByCode ", {
+            "code": e.target.value,
+          }).then(result => {
+            if (result.status == 200) {
+              if (this.cValue === nAccount) {
+                if (result.data) {
+                  //有值
+                  this.patientDTO = result.data;
+                } else {
+                  // 没值
+                  this.patientDTO = {};
+                }
+                this.loading = false;
+              }
+            } else {
+              this.patientDTO = {};
+              this.loading = false;
+            }
+          }).catch(err=>{
+            this.patientDTO = {};
+            this.loading = false;
+          })
+        }, 500)
+      },
+      // 确定
+      ok() {
+        this.$emit("ok", this.patientDTO);
+      },
+      // 取消
+      cancel() {
+        this.$emit("cancel");
+      },
+    },
+    created() {
+      this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+  .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: 90%;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-evenly;
+      align-items: center;
+      text-align: center;
+      margin-top: 32rpx;
+
+      .uni-list-cell-left {
+        flex: 3;
+        font-size: 32rpx;
+        color: #666;
+      }
+
+      .uni-list-cell-db {
+        border: 1px solid #e5e9ed;
+        background-color: #fff;
+        padding: 16rpx 0;
+        flex: 5;
+      }
+
+      .uni-list-cell-db-text {
+        flex: 5;
+        text-align: left;
+      }
+    }
+
+    .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__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;
+        }
+
+        .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/uni-datetime-picker/uni-datetime-picker.vue

@@ -836,7 +836,7 @@
 		overflow: hidden;
 		flex: 1;
 		line-height: 1;
-		font-size: 14px;
+		font-size: 12px;
 		height: 35px;
 		display: flex;
 		align-items: center;

main.js

@@ -46,6 +46,14 @@ Vue.filter('formatDate', function(timestamp, format){
     return '';
   }
 })
+// 日期过滤器（去掉秒）
+Vue.filter('filterSecondDate', function(dateStr){
+  if(dateStr && dateStr.length === 19){
+    return dateStr.slice(0, -3);
+  }else{
+    return dateStr;
+  }
+})
 App.mpType = 'app'
 
 const app = new Vue({

manifest.json

@@ -1,5 +1,6 @@
 {
-    "name" : "病理全流程",
+    /* "name" : "病理全流程", */
+    "name" : "",
     "appid" : "__UNI__9F2011E",
     "description" : "",
     "versionName" : "1.11",

package-lock.json

@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "big.js": "^6.2.1",
+        "compressorjs": "^1.2.1",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.10",
         "js-base64": "^2.6.4",
@@ -57,6 +58,12 @@
         "url": "https://opencollective.com/bigjs"
       }
     },
+    "node_modules/blueimp-canvas-to-blob": {
+      "version": "3.29.0",
+      "resolved": "https://registry.npmmirror.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz",
+      "integrity": "sha512-0pcSSGxC0QxT+yVkivxIqW0Y4VlO2XSDPofBAqoJ1qJxgH9eiUDLv50Rixij2cDuEfx4M6DpD9UGZpRhT5Q8qg==",
+      "license": "MIT"
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -83,6 +90,16 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/compressorjs": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/compressorjs/-/compressorjs-1.2.1.tgz",
+      "integrity": "sha512-+geIjeRnPhQ+LLvvA7wxBQE5ddeLU7pJ3FsKFWirDw6veY3s9iLxAQEw7lXGHnhCJvBujEQWuNnGzZcvCvdkLQ==",
+      "license": "MIT",
+      "dependencies": {
+        "blueimp-canvas-to-blob": "^3.29.0",
+        "is-blob": "^2.1.0"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
@@ -209,6 +226,18 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-blob": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-blob/-/is-blob-2.1.0.tgz",
+      "integrity": "sha512-SZ/fTft5eUhQM6oF/ZaASFDEdbFVe89Imltn9uZr03wdKMcWNVYSMjQPFtg05QuNkt5l5c135ElvXEQG0rk4tw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-core-module": {
       "version": "2.13.1",
       "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.13.1.tgz",

package.json

@@ -15,6 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "big.js": "^6.2.1",
+    "compressorjs": "^1.2.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
     "js-base64": "^2.6.4",

pages.json

@@ -704,6 +704,22 @@
           "titleNView": false
         }
       }
+    },
+    {
+      "path": "pages/newSendBack/sendBackPatient/sendBackPatient", //批量送回患者-添加患者
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    },
+    {
+      "path": "pages/newSendBack/sendBackOrder/sendBackOrder", //批量送回患者-工单核对
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }
   ],
   "globalStyle": {

pages/newSendBack/sendBackOrder/sendBackOrder.vue

@@ -0,0 +1,232 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      工单总数量：<text class="green">{{orderList.length}}</text>
+    </view>
+
+    <view class="Scanning_cont">
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column" v-for="(item, index) in orderList" :key="item.id">
+          <view class="top">
+            <text class="">
+              <text class="orders green">{{index + 1}}</text>
+              <text class="gdcode">{{item.gdcode}}</text>
+            </text>
+            <text class="taskName">{{item.taskType.taskName}}</text>
+          </view>
+          <view class="bottom">
+            <view class="name">备注：</view>
+            <view class="value">{{item.workOrderRemark}}</view>
+          </view>
+          <view class="bottom">
+            <view class="name">{{item.patient.patientName}}（{{item.patient.residenceNo}}）</view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="goBack()">取消</view>
+        <view class="btn" @click="orderSignAll()" v-if="orderList.length">一键签到</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync("userData").user.currentHospital.id,
+        orderList: [],//工单列表
+        queryObj: {}, //路由传递过来的数据
+      };
+    },
+    methods: {
+      goBack(){
+        uni.navigateBack();
+      },
+      // 一键签到
+      orderSignAll(){
+        uni.showModal({
+          title: "提示",
+          content: "您确定一键签到吗？",
+          success: (res) => {
+            if (res.confirm) {
+              console.log("用户点击确定");
+              uni.showLoading({
+                mask: true,
+                title: '加载中'
+              })
+              let postData = {
+                "deptCode": this.queryObj.code,
+                "ids": this.orderList.map(v => v.id),
+              };
+              console.log(this.orderList);
+              post("/workerOrder/handleInsAndTrans", postData).then((res) => {
+                console.log(res)
+                uni.hideLoading();
+                if (res.status == 200) {
+                  uni.showToast({
+                    icon: 'success',
+                    title: '工单签到成功',
+                    duration: 2000,
+                    mask: true,
+                  });
+                  setTimeout(() => {
+                    uni.navigateTo({
+                      url: `/pages/receiptpage/receiptpage`,
+                    });
+                  }, 2000)
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: res.msg || "接口获取数据失败！",
+                  });
+                }
+              })
+            } else if (res.cancel) {
+              console.log("用户点击取消");
+            }
+          },
+        });
+      },
+      // 获取工单列表
+      getOrderList(){
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        let postData = {
+          "deptId": +this.queryObj.deptId,
+        };
+
+        post("/workerOrder/patientIntelligentScan", postData).then((res) => {
+          console.log(res)
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.orderList = res.data || [];
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        })
+      }
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.getOrderList();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .green{
+    color:#49b856;
+  }
+  .Scanning_Result {
+    background: #EBEBEB;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 63rpx;
+      font-size: 28rpx;
+      font-weight: bold;
+      background-color: #fff;
+      margin-top: 16rpx;
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .column{
+        padding: 24rpx;
+        font-size: 26rpx;
+        margin-top: 16rpx;
+        background-color: #fff;
+        .top,.bottom{
+          display: flex;
+          align-items: center;
+          .name{
+            flex-shrink: 0;
+          }
+          .value{
+            word-break: break-all;
+          }
+        }
+        .top{
+          .orders{
+            font-size: 28rpx;
+            font-weight: bold;
+            margin-right: 24rpx;
+          }
+          .gdcode{
+            font-weight: bold;
+          }
+          .taskName{
+            flex: 1;
+            text-align: right;
+          }
+        }
+        .bottom{
+          margin-top: 16rpx;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      padding: 24rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/newSendBack/sendBackPatient/sendBackPatient.vue

@@ -0,0 +1,405 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      患者总数量：<text class="green">{{patientList.length}}</text>
+    </view>
+
+    <view class="Scanning_cont">
+      <scroll-view scroll-y class="scrollContent">
+        <view class="column" v-for="(item, index) in patientList" :key="item.id">
+          <view class="top">
+            <view class="name">姓名：</view>
+            <view class="value">{{item.patientName}}</view>
+            <text class="orders green">{{index + 1}}</text>
+          </view>
+          <view class="bottom">
+            <view class="name">住院号：</view>
+            <view class="value">{{item.residenceNo}}</view>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="foot_btn_spe">
+      <view class="column">
+        <view class="btn" @click="scan()">扫一扫</view>
+        <view class="btn" @click="hand_again()">手动录入</view>
+      </view>
+      <view class="column" v-if="patientList.length">
+        <view class="btn" @click="scanDept()">建单</view>
+      </view>
+    </view>
+    <!-- 手动查询患者弹窗 -->
+    <handViewPatient v-if="patientModels.disjunctor" :title="patientModels.title"
+      :disjunctor="patientModels.disjunctor" @ok="patientOk" @cancel="patientCancel">
+    </handViewPatient>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "@/http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: uni.getStorageSync("userData").user.currentHospital.id,
+        patientList: [],//患者列表
+        queryObj: {}, //路由传递过来的数据
+        scanCount: '', //已扫描数量
+        SMFlag: true,
+        // 手动查询弹窗model
+        patientModels: {
+          disjunctor: false,
+        },
+      };
+    },
+    onShow() {
+      this.SMFlag = true;
+    },
+    methods: {
+			// 送回病房-扫描科室
+			scanDept() {
+			  if (!this.SMFlag) {
+			    return;
+			  }
+			  this.SMFlag = false;
+			  let code = "";
+			  SM().then((ress1) => {
+			    uni.showLoading({
+			      title: "加载中",
+			      mask: true,
+			    });
+			    //检验二维码的有效性
+			    post("/dept/scanning", {
+			      content: ress1,
+			    }).then((result) => {
+			      this.SMFlag = true;
+			      if (result.state == 200 || result.state == 201) {
+			        let ress = result.code;
+			        if (ress) {
+			          code = ress;
+			          // 科室扫描
+			          let postData = {
+			            "type": "query",
+			            "qrCode": code
+			          };
+			          post("/dept/scanChangeDept", postData).then((res) => {
+			            uni.hideLoading();
+			            if (res.status == 200) {
+			              if (res.data) {
+			                if(res.data.deptDTO){
+			                  this.currentStartDept = res.data.deptDTO;
+			                }else{
+			                  this.currentStartDept = res.data;
+			                }
+			                this.buildOrder();
+			              } else {
+			                uni.hideLoading();
+			                uni.showToast({
+			                  icon: "none",
+			                  title: "请扫描正确的科室码！",
+			                });
+			              }
+			            } else {
+			              uni.hideLoading();
+			              uni.showToast({
+			                icon: "none",
+			                title: res.msg || "接口获取数据失败！",
+			              });
+			            }
+			          });
+			        }
+			      } else {
+			        uni.hideLoading();
+			        uni.showToast({
+			          icon: "none",
+			          title: result.info || "接口获取数据失败！",
+			        });
+			      }
+			    });
+			  }).catch(err => {
+			    this.SMFlag = true;
+			  });
+			},
+      // 手动查询-确认
+      patientOk(data) {
+        console.log(data);
+        if (!data.id) {
+          //没有查询到患者
+          uni.showModal({
+            title: '提示',
+            content: "没有查询到患者！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.patientModels.disjunctor = false;
+        this.hand_scanning_common(data.residenceNo, 'hand');
+      },
+      // 手动查询-取消
+      patientCancel() {
+        this.patientModels.disjunctor = false;
+      },
+      // 手动查询弹窗
+      showHandViewDrugsbag() {
+        this.patientModels = {
+          title: '填写患者住院号',
+          disjunctor: true,
+        }
+      },
+      // 手动录入
+      hand_again() {
+        this.showHandViewDrugsbag();
+      },
+      // 核对交接
+      buildOrder(){
+        uni.showModal({
+          title: "提示",
+          content: "您确定建单吗？",
+          success: (res) => {
+            if (res.confirm) {
+              console.log("用户点击确定");
+              uni.showLoading({
+                mask: true,
+                title: '加载中'
+              })
+              let userId = uni.getStorageSync("userData").user.id;
+              let postData = {
+                "workOrder": [],
+              };
+              console.log(this.patientList);
+              this.patientList.forEach(v => {
+                postData.workOrder.push({
+                  sourceId: 4,
+                  "hosId": this.hosId,
+                  "startDept": {
+                    "id": this.currentStartDept.id
+                  },
+                  "createDept": this.currentStartDept.id,
+                  "patient": {
+                    "patientCode": v.patientCode
+                  },
+                  "worker": {
+                    "id": userId
+                  },
+                })
+              })
+              post("/workerOrder/returnSickRoom", postData).then((res) => {
+                console.log(res)
+                uni.hideLoading();
+                if (res.status == 200) {
+                  uni.showToast({
+                    icon: 'success',
+                    title: '建单成功',
+                    duration: 2000,
+                    mask: true,
+                  });
+                  setTimeout(() => {
+                    uni.navigateTo({
+                      url: `/pages/receiptpage/receiptpage`,
+                    });
+                  }, 2000)
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: res.msg || "接口获取数据失败！",
+                  });
+                }
+              })
+            } else if (res.cancel) {
+              console.log("用户点击取消");
+            }
+          },
+        });
+      },
+      // 扫一扫
+      scan(isFlag = false) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((ress1) => {
+          this.hand_scanning_common(ress1, 'scan', isFlag);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      // 手动输入和扫码公共方法
+      hand_scanning_common(ress1, type, isFlag = false) {
+        // ----------------
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //检验二维码的有效性
+        post("/dept/scanning", {
+          content: ress1,
+        }).then((result) => {
+          this.SMFlag = true;
+          if (result.state == 200 || result.state == 201) {
+            let codes = result.code;
+            if (codes) {
+              this.input_common(ress1, type, isFlag);
+            } else {
+              uni.hideLoading();
+            }
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: result.info || "接口获取数据失败！",
+            });
+          }
+        });
+        // ------------------------------
+      },
+      // 将患者添加到患者列表
+      input_common(ress1, type, isFlag = false){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/patient/patientByCode ", { code: ress1 }).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            let flag = this.patientList.find(v => v.id == ress.data.id);
+            if(flag){
+              uni.showToast({
+                icon: "none",
+                title: "患者已存在！",
+              });
+            }else{
+              this.patientList.unshift(ress.data);
+              uni.showToast({
+                icon: "none",
+                title: "添加患者成功！",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: ress.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "options");
+      this.queryObj = options;
+      this.patientList = [{id: options.patientId, patientName: options.patientName, residenceNo: options.patientResidenceNo, patientCode: options.patientCode}]
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .green{
+    color:#49b856;
+  }
+  .Scanning_Result {
+    background: #EBEBEB;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+
+    .Scanning_top {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 63rpx;
+      font-size: 28rpx;
+      font-weight: bold;
+      background-color: #fff;
+      margin-top: 16rpx;
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      .scrollContent{
+        flex: 1;
+        min-height: 0;
+      }
+      .column{
+        padding: 24rpx 64rpx;
+        font-size: 26rpx;
+        margin-top: 16rpx;
+        background-color: #fff;
+        .top,.bottom{
+          height: 50%;
+          display: flex;
+          align-items: center;
+          .name{
+            
+          }
+          .value{
+            flex: 1;
+          }
+        }
+        .top{
+          position: relative;
+          .orders{
+            width: 64rpx;
+            text-align: center;
+            position: absolute;
+            left: -64rpx;
+            top: 50%;
+            transform: translateY(-50%);
+            font-size: 28rpx;
+            font-weight: bold;
+          }
+        }
+        .bottom{
+          margin-top: 16rpx;
+        }
+      }
+    }
+
+    .foot_btn_spe {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 24rpx;
+      font-weight: bold;
+      padding: 24rpx;
+
+      .column{
+        width: 100%;
+        height: 78rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24rpx;
+
+        .btn {
+          height: 100%;
+          flex: 1;
+          background: linear-gradient( 90deg, #6FC073 0%, #3DB197 100%);
+          color: #fff;
+          border-radius: 4rpx;
+          font-size: 30rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+</style>

pages/patientInformationInfo/patientInformationInfo.vue

@@ -1,17 +1,16 @@
 <template>
 	<view class="patientInformationInfo" v-if="Object.keys(infoDATA).length > 0">
 		<view class="page_head">
-			<view class="title">{{ infoDATA.patientName }}</view>
-			<view class="patientCode">{{ infoDATA.residenceNo }}</view>
+			<view class="title">{{ infoDATA.patientName }}<text class="patientCode">{{ infoDATA.residenceNo }}</text></view>
 			<view class="info">
-				<view class="bedNum">
+				<view :class="(infoDATA.careLevel || infoDATA.illnessState)?'bedNum':'waitingCount'">
 					<text class="info_h">床号</text>
-					<text class="info_b">{{ infoDATA.bedNum || "-" }}</text>
+					<text class="info_b">{{ infoDATA.bedNum }}</text>
 				</view>
-				<view :class="infoDATA.careLevel?'bedNum':'waitingCount'">
+				<!-- <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>
@@ -22,26 +21,45 @@
 				</view>
 			</view>
 		</view>
-		<view class="page_item" v-for="item in infoDATA.inspects" :key="item.id">
-			<view class="page_item_info">
-				<view class="page_item_info_title">检查项目：<text>{{ 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">预约时间：<text>{{ item.yyTime || "-" }}</text><button
-						@click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30">修改</button></view>
-				<view class="page_item_info_title">预约叫号：<text>{{ item.reservationNumber || "-" }}</text></view>
-				<view class="page_item_info_title">是否紧急：<text
-						:class="{red:item.priority===1||item.priority==='1'}">{{ (item.priority===1||item.priority==='1')?'是':'否' }}</text>
-				</view>
-			</view>
-		</view>
-		<view v-if="!infoDATA.inspects || infoDATA.inspects.length == 0" class="zwsj">
+    <scroll-view v-if="!isEmpty" scroll-y class="scrollContent">
+      <view class="page_item" v-for="(inspects, key, index) in infoDATA.inspectListMap" :key="key">
+        <view class="splitLine">
+          <view class="splitLineFlex">
+            <view class="splitLineBox"></view>
+          </view>
+          <view>{{key}}</view>
+          <view class="splitLineFlex">
+            <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>
+          </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>
+    </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>
 		<!-- 弹窗 -->
 		<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>
 	</view>
 </template>
 <script>
@@ -54,15 +72,150 @@
 	export default {
 		data() {
 			return {
+        SMFlag: true,
+        isEmpty: true,
 				options: {},
 				infoDATA: {},
 				// 弹窗model1
 				models1: {
 				  disjunctor: false,
 				},
+        // 建单的对象
+        jdItem: {},
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
 			};
 		},
 		methods: {
+      // 建单
+      build(data) {
+        console.log(data);
+        this.jdItem = data;
+        this.models = {
+          disjunctor: true,
+          title: "提示",
+          content: `您即将创建【${data.patientName || ""}】患者前往【${
+          data.execDept ? data.execDept.dept : ""
+        }】进行【${data.inspectName || ""}】检查，您确认吗？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      //建单后知道了
+      know() {
+        this.models.disjunctor = false;
+        this.getInfo(this.jdItem.patientCode);
+      },
+      //建单确定
+      ok() {
+        this.models.disjunctor = false;
+        let postData = {
+          deptId: this.infoDATA.department.id
+        };
+        let taskId;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/nurse/getDeptTaskType", postData).then((result) => {
+          if (result.status == 200) {
+            let obj = result.data.allTaskTypes.filter(
+              (item) => item.associationType.value == "inspect"
+            );
+            if (obj.length) {
+              taskId = obj[0].id;
+              let postData = {
+                workOrder: {
+                  sourceId: 4,
+                  taskType: {
+                    id: taskId,
+                    isHalfInspect: obj[0].isHalfInspect === 1 ? 1 : 0
+                  },
+                  createDept: this.infoDATA.department.id,
+                  startDept: {
+                    id: this.infoDATA.department.id
+                  },
+                  patient: {
+                    patientCode: this.jdItem.patientCode
+                  },
+                  checkList: [{
+                    id: this.jdItem.id
+                  }],
+                  goods: "",
+                  worker: {
+                    id: uni.getStorageSync("userData").user.id
+                  },
+                  workerStartOrderFlag: 1,
+                },
+              };
+              //根据检查的紧急度加急
+              if (this.jdItem.priority === 1 || this.jdItem.priority === '1') {
+                postData.workOrder["urgentDetails"] = {
+                  checkStatus: {
+                    id: 329
+                  },
+                  urgentReason: '系统根据检查信息，自动进行加急',
+                };
+              }
+              post("/api/startOrder", postData).then((res) => {
+                uni.hideLoading();
+                let msg = res.msg;
+                let icon = "error";
+                if (res.status == 200) {
+                  msg = "建单成功";
+                  icon = "success";
+                }
+                this.models = {
+                  disjunctor: true,
+                  content: msg,
+                  icon: icon,
+                  operate: {
+                    know: "知道了",
+                  },
+                };
+              });
+            } else {
+              uni.hideLoading();
+              this.models = {
+                disjunctor: true,
+                content: "建单失败,科室未开通！",
+                icon: "error",
+                operate: {
+                  know: "知道了",
+                },
+              };
+            }
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //建单取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
+      // 扫一扫
+      Scanning(qrcodePrefix = '') {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          this.SMFlag = true;
+          this.getInfo(content);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
 			// 修改预约时间->知道了
 			know1() {
 			  this.models1.disjunctor = false;
@@ -136,16 +289,8 @@
 				}).then((res) => {
 					uni.hideLoading();
 					if (res.status == 200) {
-						if (res.data.inspects && Array.isArray(res.data.inspects)) {
-							res.data.inspects = res.data.inspects.map(v => {
-								if (v.yyTime) {
-									let [date, time] = v.yyTime.split(" ");
-									v.yyTime = new Date(date).Format('yyyy-MM-dd') + " " + time.slice(0, -
-										3);
-								}
-								return v;
-							})
-						}
+            res.data.inspectListMap = res.data.inspectListMap || {};
+            this.isEmpty = Object.keys(res.data.inspectListMap).length === 0;
 						this.infoDATA = res.data;
 					} else {
 						uni.showToast({
@@ -166,13 +311,42 @@
 			webHandle("no", "wx");
 			// #endif
 		},
+    onShow() {
+      this.SMFlag = true;
+    }
 	};
 </script>
-<style lang="less">
-	.patientInformationInfo {
-		padding: 0 20rpx;
+<style lang="less" scoped>
+  .toolbar {
+    margin-bottom: 16rpx;
+    z-index: 999;
+    height: 88rpx;
+    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: #07863c;
+    }
+
+    .toolbar-sao {
+      font-size: 36rpx;
+      color: #333;
+    }
+  }
+	.patientInformationInfo {
+    background-color: #F7F7F7;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
 		.zwsj {
+      flex: 1;
+      min-height: 0;
 			text-align: center;
 
 			.zwsj-img {
@@ -198,9 +372,8 @@
 			}
 
 			.patientCode {
-				padding-bottom: 12rpx;
+				margin-left: 12rpx;
 				font-size: 28rpx;
-				text-align: center;
 			}
 
 			.info {
@@ -245,20 +418,58 @@
 			}
 		}
 
+    .scrollContent{
+      flex: 1;
+      min-height: 0;
+    }
 		.page_item {
-			margin-top: 16rpx;
-			margin-bottom: 16rpx;
-			background: #fff;
+			// margin-bottom: 10rpx;
 			border-radius: 8rpx;
 			overflow: hidden;
-			padding: 0 16rpx;
-			border: 2rpx solid #e5e9ed;
+
+      .splitLine{
+        height: 50rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #8F8F8F;
+        .splitLineFlex{
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .splitLineBox{
+            width: calc(100% - 48rpx);
+            height: 1rpx;
+            background-color: #8F8F8F;
+          }
+        }
+      }
 
 			.page_item_info {
+        margin-top: 10rpx;
 				padding: 20rpx 16rpx;
 				text-align: left;
 				line-height: 60rpx;
 				font-size: 30rpx;
+        background: #fff;
+
+        &.mt0{
+          margin-top: 0;
+        }
+
+        .buildOrder{
+          width: 258rpx;
+          height: 72rpx;
+          background: #49B856;
+          border-radius: 6rpx;
+          margin: 0 auto;
+          color: #FFFFFF;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 30rpx;
+        }
 
 				.page_item_info_title {
 					font-weight: 700;
@@ -273,6 +484,11 @@
 							margin: 0;
 						}
 					}
+          &.row{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          }
 
 					text {
 						font-weight: normal;
@@ -280,6 +496,10 @@
 						&.red {
 							color: red;
 						}
+            
+            &.bold{
+              font-weight: 700;
+            }
 					}
 				}
 			}

pages/patientInformationList/patientInformationList.vue

@@ -241,7 +241,7 @@
         })
         let userId = uni.getStorageSync("userData").user.id;
         let postData = {
-          "workOrder": {
+          "workOrder": [{
             sourceId: 4,
             "hosId": this.hosId,
             "startDept": {
@@ -254,7 +254,7 @@
             "worker": {
               "id": userId
             },
-          },
+          }],
           "inspectMode": this.selectRadio.length > 0 ? this.selectRadio[0] : undefined,
         };
         console.log(postData);

pages/receipt_infopage/receipt_infopage.vue

@@ -355,7 +355,8 @@
       <!-- 如果不是静配，药配，标本配送,标本轮巡,万能交接 -->
       <template
         v-if="((!infoDATA.worker)||(infoDATA.worker&&infoDATA.worker.id == currentUserId))&&infoDATA.gdState.value != 6&&infoDATA.gdState.value != 7&&infoDATA.gdState.value != 11">
-        <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
+        <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
+          (hideInspectScan != 1 || (hideInspectScan == 1 && infoDATA.gdState.value == 4)) &&
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
           infoDATA.taskType.associationType.value != 'drugsBag' &&
@@ -365,15 +366,15 @@
           !(infoDATA.taskType.associationType.value == 'other' && (infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].actionsSwitch || infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch))
         " hover-class="seimin-btn-hover">
           <smallScreen :sData="infoDATA" :sType="1">扫码</smallScreen>
-        </view>
+        </view> -->
         <!-- 其他临床服务-完成工单-待到达 -->
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">确认到达</view>
         <!-- 其他临床服务-完成工单-待送达 -->
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">完成工单</view>
         <!-- 其他临床服务-拍照 -->
-        <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].photoSwitch" class="btn2 page_item_btn" @click="photographToOther(infoDATA, 'start')" hover-class="seimin-btn-hover">拍照</view>
+        <!-- <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].photoSwitch" class="btn2 page_item_btn" @click="photographToOther(infoDATA, 'start')" hover-class="seimin-btn-hover">拍照</view> -->
 
-        <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
+        <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
           infoDATA.taskType.associationType.value != 'jPBag' &&
           infoDATA.taskType.associationType.value != 'drugsBag' &&
           infoDATA.taskType.associationType.value != 'specimen' &&
@@ -381,7 +382,7 @@
           infoDATA.taskType.associationType.value != 'other' &&
           infoDATA.taskType.associationType.value != 'ordinary' &&
           infoDATA.gdState.value == 4
-        " hover-class="seimin-btn-hover">拍照</view>
+        " hover-class="seimin-btn-hover">拍照</view> -->
         <view class="btn3" @click="specialCloseClick()" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
@@ -393,7 +394,7 @@
         " hover-class="seimin-btn-hover">特殊情况关闭</view>
       </template>
       <!-- 如果不是患者陪检或患者转运或其他,万能交接 -->
-      <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
+      <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'patientTransport' &&
           infoDATA.taskType.associationType.value != 'inspect' &&
@@ -401,7 +402,7 @@
           infoDATA.taskType.associationType.value != 'ordinary'
         " hover-class="seimin-btn-hover">
         <smallScreen :sData="infoDATA" :sType="2">扫码</smallScreen>
-      </view>
+      </view> -->
       <!-- 如果是万能交接 -->
       <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']"
         v-if="infoDATA.taskType.associationType.value == 'ordinary'"
@@ -490,6 +491,7 @@
         currentData: {}, //当前小扫描的工单对象
         multiplayerMode: 0,
         handoverOrder: 0,
+        hideInspectScan: 0,
         clinicalMultiplayerMode: 0,
         clinicalTaskIdsFlag: false,
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
@@ -1599,13 +1601,16 @@
             if(result.list && result.list[0]){
               this.multiplayerMode = result.list[0].multiplayerMode;
               this.handoverOrder = result.list[0].handoverOrder;
+              this.hideInspectScan = result.list[0].hideInspectScan;
             }else{
               this.multiplayerMode = 0;
               this.handoverOrder = 0;
+              this.hideInspectScan = 0;
             }
           } else {
             this.multiplayerMode = 0;
             this.handoverOrder = 0;
+            this.hideInspectScan = 0;
           }
         });
       },

pages/receiptpage/receiptpage.vue

@@ -119,7 +119,7 @@
                   预约时间 : {{ item.yyTime | yyTimeFilter
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
-                <view>
+                <view style="font-weight: bold;">
                   患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
                     item.patient ? item.patient.bedNum : "-"
                   }})
@@ -163,7 +163,7 @@
                   预约时间 : {{ item.yyjdTime | yyTimeFilter
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
-                <view>
+                <view style="font-weight: bold;">
                   患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
                     item.patient ? item.patient.bedNum : "-"
                   }})
@@ -294,7 +294,7 @@
                 item.taskType.associationType.value != 'specimenPlan' &&
                 item.taskType.associationType.value != 'ordinary'
               ">
-              <view v-if="!(item.taskType.associationType.value == 'other' && (item.gdState.value == 4 && item.taskType.carryingCourses[0].actionsSwitch || item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch))" class="page_item_btn" hover-class="seimin-btn-hover">
+              <view v-if="(hideInspectScan != 1 || !(hideInspectScan == 1 && item.gdState.value != 4 && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect'))) && !(item.taskType.associationType.value == 'other' && (item.gdState.value == 4 && item.taskType.carryingCourses[0].actionsSwitch || item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch))" class="page_item_btn" hover-class="seimin-btn-hover">
                 <smallScreen :sData="item" :sType="1">扫码</smallScreen>
               </view>
               <!-- 其他临床服务-完成工单-待到达 -->
@@ -303,7 +303,7 @@
               <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch" class="page_item_btn" @click="otherCompleteOrder(item)" hover-class="seimin-btn-hover">完成工单</view>
               <!-- 其他临床服务-拍照 -->
               <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 4 && item.taskType.carryingCourses[0].photoSwitch" class="page_item_btn" @click="photographToOther(item, 'start')" hover-class="seimin-btn-hover">拍照</view>
-              <view v-if="item.taskType.associationType.value != 'other' && item.gdState.value == 4" class="page_item_btn" @click="photograph(item)" hover-class="seimin-btn-hover">拍照</view>
+              <view v-if="(hideInspectScan != 1 || !(hideInspectScan == 1 && item.gdState.value != 4 && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect'))) && item.taskType.associationType.value != 'other' && item.gdState.value == 4" class="page_item_btn" @click="photograph(item)" hover-class="seimin-btn-hover">拍照</view>
               <!-- 其他临床服务-追加 -->
               <view v-if="item.taskType.associationType.value == 'other' && item.worker && item.worker.id && clinicalMultiplayerMode === 1 && showAppendUser === 1 && item.clinicalTaskIdsFlag && !item.copyBy" class="page_item_btn" @click="additionalUser(item)" hover-class="seimin-btn-hover">追加</view>
             </view>
@@ -476,8 +476,10 @@
 				taskData:[], //任务类型数据
         currentId: 0,
         otherAssociationTypeId: null,
+        inspectAssociationTypeId: null,
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
         workState: '1',
+        hideInspectScan: 0,
         clinicalMultiplayerMode: 0,
         showAppendUser: 0,
         signType4: false,
@@ -835,244 +837,7 @@
 				if(!this.isNumberKey){
 					scannerCode = scannerCode.replace('\n','')
 				}
-				if (!this.SMFlag) {
-				  return;
-				}
-				let qrcodePrefix = '';
-				this.SMFlag = false;
-				// SM().then((content) => {
-				  uni.showLoading({
-				    title: "加载中",
-				    mask: true,
-				  });
-				  //检验二维码的有效性(扫码前必须验证)
-				  post("/dept/scanning", {
-						content:scannerCode
-					})
-				    .then((result) => {
-				      this.currentCode = result.code;
-				      this.SMFlag = true;
-				      // 200检测通过，201没有有效期也通过。
-				      if (result.state == 200 || result.state == 201) {
-				        let data = {
-				          code: result.code, //二维码
-				        };
-				        //微信—大扫描（科室码，患者码，标本码，快捷建单码，药包码）
-				        let code = result.code.includes(qrcodePrefix) ? result.code : qrcodePrefix + result.code;
-				        post("/workerOrder/scanCode", { code, hosId: this.hosId })
-				          .then((res) => {
-				            uni.hideLoading();
-				            if (res.status == 200) {
-				              // 扫描标本码
-				              if (res.type == "specimen") {
-				                let infoDATA = {
-				                  stype: res.data.stype,
-				                  scode: res.data.scode,
-				                  patientName: res.data.patientName,
-				                  sickRoom: res.data.sickRoom ?
-				                    res.data.sickRoom.dept : "-",
-				                  checkDept: res.data.checkDept ?
-				                    res.data.checkDept.dept : "-",
-				                  bedNum: res.data.bedNum,
-				                };
-				                uni.navigateTo({
-				                  url: `../scanning_B/scanning_B?res=${encodeURIComponent(
-				                  JSON.stringify(res)
-				                )}&infoDATA=${encodeURIComponent(
-				                  JSON.stringify(infoDATA)
-				                )}`,
-				                });
-				              } else if (res.type == "patient") {
-				                //如果是患者腕带码
-				                // code: data.code //二维码
-				                res.workOrder = res.workOrder ? res.workOrder : []; //liao
-				                uni.navigateTo({
-				                  url: `../scanning_ins/scanning_ins?code=${
-				                  data.code
-				                }&infoDATA=${encodeURIComponent(
-				                  JSON.stringify(res.data)
-				                )}&workData=${encodeURIComponent(
-				                  JSON.stringify(res.workOrder)
-				                )}&patientOrders=${encodeURIComponent(
-				                  JSON.stringify(res.patientOrders)
-				                )}`,
-				                });
-				              } else if (res.type == "quickOrder") {
-				                //快捷建单
-				                if(res.data.isDigitalHandover == 1){
-				                  uni.navigateTo({
-				                    url: `../specimenChecking/specimenChecking?infoDATA=${encodeURIComponent(
-				                    JSON.stringify(res.data)
-				                  )}`,
-				                  });
-				                }else{
-				                  uni.navigateTo({
-				                    url: `../shortcutbuildOrders/shortcutbuildOrders?infoDATA=${encodeURIComponent(
-				                    JSON.stringify(res.data)
-				                  )}`,
-				                  });
-				                }
-				              } else if (res.type == "dept") {
-				                // 扫描科室码
-				                // code: data.code //二维码
-				                let infoDATA = res.data;
-				                console.log(infoDATA)
-				                // 判断是否是标本配送，并且仅仅只有这一种业务类型，默认全选,并跳转到下一步;
-				                // 判断是否是标本轮巡 ，并且仅仅只有这一种业务类型，并且只有一个工单，默认选中,并跳转到下一步;
-				                if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
-				                  this.infoDATA = infoDATA;
-				                  this.workData = infoDATA.specimen || infoDATA.specimenPlan;
-				                  this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
-				                  this.code = data.code;
-				                  this.selectArr = [];
-				                  for (var i = 0; i < this.workData.length; i++) {
-				                    this.selectArr.push(this.workData[i].id);
-				                  }
-				                  this.userId.ids = this.selectArr;
-				                  this.orderDeptHandler(true);
-				                }else if(res.deptHandoverType && res.deptHandoverType.value == 'clinicalWaste'){
-				                  // 医废
-				                  uni.navigateTo({
-				                    url: `/pages/medicalWaste/medicalWasteSignIn/medicalWasteSignIn?code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
-				                  });
-				                }else{
-				                  uni.navigateTo({
-				                    url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
-				                    JSON.stringify(infoDATA)
-				                  )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
-				                  });
-				                }
-				              } else if (res.type == 'drugsBag') {
-				                //扫药包码
-				                uni.navigateTo({
-				                  url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}&drugsBagBatchNo=${res.drugsBagBatchNo}`,
-				                });
-				              } else if (res.type == 'nucleicAcid') {
-				                //扫核酸码
-				                uni.navigateTo({
-				                  url: `/pages/scanning_nucleicAcid/scanning_nucleicAcid?qrcode=${data.code}`,
-				                });
-				              } else if (res.type == 'blood') {
-				                //扫血制品
-				                // 判断size,多个则进入新页面选择
-				                if(res.size > 1){
-				                  uni.navigateTo({
-				                    url: `/pages/bloodSelect/bloodSelect?qrcode=${data.code}&navigateTo=scanning_blood`,
-				                  });
-				                } else {
-				                  uni.navigateTo({
-				                    url: `/pages/scanning_blood/scanning_blood?qrcode=${data.code}`,
-				                  });
-				                }
-				              } else if (res.type == 'receiveOrder') {
-				                //扫快捷接单
-				                uni.showModal({
-				                  title: "提示",
-				                  content: `您本次接单包括${res.names.join('、')}，一共含有${res.data.length}个工单，是否确认接单？`,
-				                  success: function(result) {
-				                    if (result.confirm) {
-				                      uni.showLoading({
-				                        title: "加载中",
-				                        mask: true,
-				                      });
-				                      post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((result) => {
-				                        uni.hideLoading();
-				                        if (result.status == 200) {
-				                          uni.showModal({
-				                            title: "提示",
-				                            content: `本次接单包括${res.names.join('、')}，${res.data.length}个工单已接单完成`,
-				                            showCancel: false,
-				                            success: function(res) {
-				                              if (res.confirm) {
-				                                console.log("用户点击确定");
-				                                uni.redirectTo({
-				                                  url: "../receiptpage/receiptpage",
-				                                });
-				                              } else if (res.cancel) {
-				                                console.log("用户点击取消");
-				                              }
-				                            },
-				                          });
-				                        } else {
-				                          uni.showToast({
-				                            icon: "none",
-				                            title: result.msg || "接口获取数据失败！",
-				                          });
-				                        }
-				                      });
-				                    } else if (result.cancel) {
-				                      console.log("用户点击取消");
-				                    }
-				                  },
-				                });
-				              } else if (res.type == 'bloodTake') {
-				                if(res.data){
-				                  //新血制品-扫科室
-				                  uni.navigateTo({
-				                    url: `/pages/newBlood/startOrderSignBlood/startOrderSignBlood?deptId=${res.deptId}&deptName=${res.deptName}&taskTypeId=${res.taskTypeId}`,
-				                  });
-				                }else{
-				                  // 走type是dept的流程
-				                  // 扫描科室码
-				                  // code: data.code //二维码
-				                  let infoDATA = res.data;
-				                  console.log(infoDATA)
-				                  // 判断是否是标本配送，并且仅仅只有这一种业务类型，默认全选,并跳转到下一步;
-				                  // 判断是否是标本轮巡 ，并且仅仅只有这一种业务类型，并且只有一个工单，默认选中,并跳转到下一步;
-				                  if(Object.keys(infoDATA).length === 1 && (infoDATA.specimen || (infoDATA.specimenPlan && infoDATA.specimenPlan.length === 1))){
-				                    this.infoDATA = infoDATA;
-				                    this.workData = infoDATA.specimen || infoDATA.specimenPlan;
-				                    this.tabType = infoDATA.specimen ? 'specimen' : 'specimenPlan';
-				                    this.code = data.code;
-				                    this.selectArr = [];
-				                    for (var i = 0; i < this.workData.length; i++) {
-				                      this.selectArr.push(this.workData[i].id);
-				                    }
-				                    this.userId.ids = this.selectArr;
-				                    this.orderDeptHandler(true);
-				                  }else{
-				                    uni.navigateTo({
-				                      url: `../scanning_all/scanning_all?infoDATA=${encodeURIComponent(
-				                      JSON.stringify(infoDATA)
-				                    )}&code=${data.code}&deptName=${res.deptName}&deptId=${res.deptId}`,
-				                    });
-				                  }
-				                }
-				              } else if(res.type == 'clinicalWaste'){
-				                // 医废
-				                if(res.wasteDetails){
-				                  uni.navigateTo({
-				                    url: `/pages/medicalWaste/medicalWasteDetail/medicalWasteDetail?qrcode=${res.code}`,
-				                  });
-				                }else{
-				                  uni.navigateTo({
-				                    url: `/pages/medicalWaste/medicalWasteBind/medicalWasteBind?qrcode=${res.code}`,
-				                  });
-				                }
-				              }
-				            } else {
-				              if(res.bigScanSpecialMsg){
-				                uni.navigateTo({
-				                  url: `../scanning_big_Result/scanning_big_Result?msg=${res.msg || ''}&qrcode=${this.currentCode}&bigScanSpecialMsg=${encodeURIComponent(JSON.stringify(res.bigScanSpecialMsg))}`,
-				                });
-				              }else{
-				                uni.navigateTo({
-				                  url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}`,
-				                });
-				              }
-				            }
-				          });
-				      } else {
-				        uni.hideLoading();
-				        uni.showToast({
-				          icon: "none",
-				          title: result.info || "接口获取数据失败！",
-				        });
-				      }
-				    })
-				// }).catch(err => {
-				//   this.SMFlag = true;
-				// });
+        this.$refs.bigscreen.ScanningCommon('', scannerCode);
 			},
 			// 搜索科室
 			searchAdm(){
@@ -1103,8 +868,8 @@
           title: "加载中",
           mask: true,
         });
+        let res = await this.getAssociationTypes();
         //获取其他临床服务业务类型
-        let res = await this.getOtherAssociationTypes();
         let otherAssociationType = res.find(v => v.value === 'other');
         this.otherAssociationTypeId = otherAssociationType ? otherAssociationType.id : null;
         if(this.otherAssociationTypeId){
@@ -1129,6 +894,23 @@
             title: '未设置其他临床服务业务类型！'
           })
         }
+        
+        //获取患者陪检业务类型
+        let inspectAssociationType = res.find(v => v.value === 'inspect');
+        this.inspectAssociationTypeId = inspectAssociationType ? inspectAssociationType.id : null;
+        if(this.inspectAssociationTypeId){
+          // 获取检查页面控制开关
+          let result = await this.getTaskInspectConfig();
+          if (result.status == 200) {
+            if(result.list && result.list[0]){
+              this.hideInspectScan = result.list[0].hideInspectScan;
+            }else{
+              this.hideInspectScan = 0;
+            }
+          } else {
+            this.hideInspectScan = 0;
+          }
+        }
 
         this.getBloodPageConfig()
         this.waitingOrdersGetNum();
@@ -1166,8 +948,8 @@
           this.takeCodeType = {};
         }
       },
-      //获取其他临床服务业务类型
-      getOtherAssociationTypes(){
+      //获取s业务类型
+      getAssociationTypes(){
         return post('/common/common/getDictionary', {
           "type": "list",
           "key": "association_types"
@@ -1184,6 +966,19 @@
             }
         });
       },
+      // 获取检查页面控制开关
+      getTaskInspectConfig(){
+        return post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+              "taskTypeDTO": {
+                "hosId": { id: this.hosId },
+                "associationType": { key: "association_types", value: "inspect" },
+              }
+            }
+        });
+      },
       // 获取血制品页面控制开关
       getTaskBloodConfig(){
         return post("/simple/data/fetchDataList/taskTypeConfig", {

pages/scanning_ins/scanning_ins.vue

@@ -24,8 +24,7 @@
 								  infoDATA.cardNo || "-"
 								}})
 							</text>
-							</text>
-            <button @click="getInspectList()">查看检查</button>
+            </text>
           </view>
           <view v-if="infoDATA.residenceNo">住院号 : {{ infoDATA.residenceNo || "-" }}</view>
 					<view v-if="!infoDATA.residenceNo">身份证号 : {{ infoDATA.identityCardNo || "-" }}</view>
@@ -206,23 +205,17 @@
         </view>
       </view>
 
+      <view class="foot_btn1" v-if="infoDATA.residenceNo && batchCreationAndReturn == 1">
+				<view class="btn3" @click="scanDept('all')">批量送回病房</view>
+				<view class="btn3" @click="getInspectList()">查看检查</view>
+      </view>
       <view class="foot_btn2" v-if="workData && workData.length > 0 && isShow">
-        <!-- <view class="btn1" @click="allStart(typeData)">一键操作</view> -->
         <view class="btn1" :class="(!infoDATA.residenceNo && addService==0)?'btn5':''" @click="getInspectAndPatientTransform(typeData)">一键操作</view>
-        <!-- <view class="btn1" @click="scanDept()">送回病房</view> -->
 				<view class="btn1" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
 				<view class="btn1" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
         <view class="btn2" :class="(!infoDATA.residenceNo && addService==0)?'btn5':''" @click="showAlert">知道了</view>
       </view>
-      <!-- <view class="foot_btn2" v-if="
-          workData && workData.length === 0 && isShow && wechatFocusSwitch == 1
-        "> -->
-      <view class="foot_btn2" v-if="
-          workData && workData.length === 0 && isShow
-        ">
-        <!-- <view class="btn1" @click="help">{{
-          infoDATA.focusPatient == 1 ? "无需帮助" : "需要帮助"
-        }}</view> -->
+      <view class="foot_btn2" v-if="workData && workData.length === 0 && isShow">
         <view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
 				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
         <view class="btn3" :class="(!infoDATA.residenceNo && addService==0)?'btn4':''" @click="showAlert">知道了</view>
@@ -233,9 +226,6 @@
         <view class="btn3" :class="(!infoDATA.residenceNo && addService==0)?'btn4':''" @click="showAlert">知道了</view>
       </view>
     </view>
-    <!-- 弹窗 -->
-    <!-- <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
-      @know="know" :operate="models.operate" @ok="ok" @cancel="cancel"></showModel> -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @know="know" :operate="models.operate"></showModel>
     <!-- 送回病房弹窗 -->
@@ -307,7 +297,8 @@
         animationData: {}, //动画
         isShow: true, //是否显示“一键操作”
         currentStartDept: {}, //扫描的起点科室
-				addService:null //是否开启允许追加服务
+				addService:null, //是否开启允许追加服务
+				batchCreationAndReturn:null //批量建立送回
       };
     },
     methods: {
@@ -505,7 +496,7 @@
         })
         let userId = uni.getStorageSync("userData").user.id;
         let postData = {
-          "workOrder": {
+          "workOrder": [{
             sourceId: 4,
             "hosId": this.hosId,
             "startDept": {
@@ -518,7 +509,7 @@
             "worker": {
               "id": userId
             },
-          },
+          }],
           "inspectMode": this.selectRadio.length > 0 ? this.selectRadio[0] : undefined,
         };
         post("/workerOrder/returnSickRoom", postData).then((res) => {
@@ -565,7 +556,15 @@
 			  });
 			},
       // 送回病房-扫描科室
-      scanDept() {
+      scanDept(type = '') {
+				if(type === 'all'){
+				  // 批量送回
+				  let infoDATA = JSON.parse(this.options.infoDATA);
+				  uni.navigateTo({
+				    url: `/pages/newSendBack/sendBackPatient/sendBackPatient?patientId=${infoDATA.id}&patientName=${infoDATA.patientName}&patientResidenceNo=${infoDATA.residenceNo}&patientCode=${infoDATA.patientCode}`,
+				  });
+					return;
+				}
         this.isInspectAndPatientTransform = false;
         if (!this.SMFlag) {
           return;
@@ -601,16 +600,16 @@
                       }else{
                         this.currentStartDept = res.data;
                       }
-                       this.models3 = {
-                         disjunctor: true,
-                         title: "提示",
-                         content: `您选择的起点科室为【${this.currentStartDept.dept}】，您将从【${this.currentStartDept.dept}】把【${infoDATA.patientName}】送回【${infoDATA.department.dept}】，如您确认请点击“确认建单”。`,
-                         icon: "warn",
-                         operate: {
-                           ok: "确认建单",
-                           cancel: "取消",
-                         },
-                       };
+                      this.models3 = {
+                        disjunctor: true,
+                        title: "提示",
+                        content: `您选择的起点科室为【${this.currentStartDept.dept}】，您将从【${this.currentStartDept.dept}】把【${infoDATA.patientName}】送回【${infoDATA.department.dept}】，如您确认请点击“确认建单”。`,
+                        icon: "warn",
+                        operate: {
+                          ok: "确认建单",
+                          cancel: "取消",
+                        },
+                      };
                     } else {
                       uni.hideLoading();
                       uni.showToast({
@@ -664,13 +663,17 @@
       },
       // 查看检查
       getInspectList() {
+        // uni.navigateTo({
+        //   url: `../inspectList/inspectList?id=${this.infoDATA.department.id}&dept=${this.infoDATA.department.dept}&patientCode=${this.infoDATA.patientCode}`,
+        // });
         uni.navigateTo({
-          url: `../inspectList/inspectList?id=${this.infoDATA.department.id}&dept=${this.infoDATA.department.dept}&patientCode=${this.infoDATA.patientCode}`,
+          url: `../patientInformationInfo/patientInformationInfo?patientCode=${this.infoDATA.patientCode}`,
         });
       },
       // 通知
       notice(info) {
         let postData = {
+          wechatConfigType: "hsms",
           userIds: info.worker.id + "",
           content: `您负责护送的患者${info.patient.patientName}(${info.patient.bedNum})已经检查完毕，请尽快执行工单的下一步。`,
         };
@@ -962,7 +965,8 @@
 			    if (result.status == 200) {
 			      let configs = result.list || [];
 			      if(configs.length){
-			        this.addService = configs[0].addService
+			        this.addService = configs[0].addService;
+			        this.batchCreationAndReturn = configs[0].batchCreationAndReturn;
 			      }
 			    } else {
 			      uni.showToast({
@@ -1073,7 +1077,7 @@
       padding: 0 20rpx;
 
       .Scanning_top {
-        height: 400rpx;
+        // height: 500rpx;
 
         .Scanning_top_icon {
           width: 140rpx;
@@ -1135,7 +1139,7 @@
       }
 
       .page_items {
-        margin-bottom: 110rpx;
+        padding-bottom: 200rpx;
 
         .zwsj {
           margin-top: 180rpx;
@@ -1428,9 +1432,9 @@
         }
       }
 
-      .foot_btn2 {
+      .foot_btn1 {
         position: fixed;
-        bottom: 0;
+        bottom: 84rpx;
         right: 20rpx;
         left: 20rpx;
         line-height: 66rpx;
@@ -1441,33 +1445,45 @@
         justify-content: space-between;
 
         .btn1,
-        .btn2 {
+        .btn2,
+        .btn3,
+        .btn4,
+        .btn5 {
           height: 66rpx;
-          width: 32%;
+          flex: 1;
           background-image: linear-gradient(to right, #72c172, #3bb197);
           color: #fff;
           border-radius: 8rpx;
           font-size: 32rpx;
-          margin-top: 16rpx;
+          margin: 16rpx 1% 0;
           text-align: center;
         }
+      }
+      .foot_btn2 {
+        position: fixed;
+        bottom: 0;
+        right: 20rpx;
+        left: 20rpx;
+        line-height: 66rpx;
+        height: 100rpx;
+        background: #f9fafb;
+        display: flex;
+        justify-content: space-between;
 
-        .btn3 {
+        .btn1,
+        .btn2,
+        .btn3,
+        .btn4,
+        .btn5 {
           height: 66rpx;
-          width: 48%;
+          flex: 1;
           background-image: linear-gradient(to right, #72c172, #3bb197);
           color: #fff;
           border-radius: 8rpx;
           font-size: 32rpx;
-          margin-top: 16rpx;
+          margin: 16rpx 1% 0;
           text-align: center;
         }
-				.btn4{
-					width: 100% !important;
-				}
-				.btn5{
-					width: 48% !important;
-				}
       }
     }
   }

readme.md

@@ -24,4 +24,6 @@
        url('~@/static/font/iconfont.woff?t=1728893186075') format('woff'),
        url('~@/static/font/iconfont.ttf?t=1728893186075') format('truetype');
 }
-```
+```
+
+# 打包安卓apk的时候manifest.json的name字段修改为“病理全流程”

tools/uploadFile.js

@@ -1,4 +1,5 @@
 import { api_uploadAttachment } from "@/http/http.js"
+import Compressor from 'compressorjs';
 /**
  * 压缩
  */
@@ -20,6 +21,24 @@ const newImage = (img) => {
   })
 }
 /**
+	 * 压缩图片
+	 */
+const compressImage = (file) => {
+  return new Promise((resolve,reject) => {
+    new Compressor(file, {
+      quality: 0.6, // 压缩质量，范围从0到1
+      maxWidth: 1500, // 最大宽度
+      maxHeight: 1500, // 最大高度
+      success: (result) => {
+        resolve(result); // 压缩后的图片
+      },
+      error: (err) => {
+        reject(err); // 压缩失败的错误信息
+      }
+    });
+  })
+}
+/**
  * 上传图片
  */
 export const uploadFile = async (imgObj, type, incidentId) => {
@@ -50,7 +69,8 @@ export const uploadFile = async (imgObj, type, incidentId) => {
     await newImage(img)
     ctx.drawImage(img, 0, 0, canvasWidth, canvasHeight)
 
-    const fileSrc = await toBlob(canvas, imgObj)
+    const blob = await toBlob(canvas, imgObj)
+    const fileSrc = await compressImage(blob)
     let tp = window.URL.createObjectURL(fileSrc)
     console.log('压缩后', tp);
     return uni.uploadFile({