门诊

components/smallScreen/smallScreen.vue

@@ -226,31 +226,48 @@
             uni.hideLoading();
             if (res) {
               if (res.status == 200) {
-                if (
-                  gdStateValue == "4" &&
-                  associationTypeValue == "other"
-                ) {
+                if (gdStateValue == "4" && associationTypeValue == "other") {
                   uni.navigateTo({
                     url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
                   });
                 }
-                if (
-                  gdStateValue == "4" &&
-                  associationTypeValue != "other"
-                ) {
-                  uni.navigateTo({
-                    url: `../../pages/scanning_Result/scanning_Result?type=${
-                    associationTypeValue
-                  }&type1=${res.type}&id=${data.id}&deptCode=${
-                    list.code
-                  }&patient=${res.patient}&patientCode=${
-                    res.patientCode
-                  }&deptName=${res.deptName}&bedNum=${
-                    res.bedNum
-                  }&status=${res.status}&msg=${
-                    res.msg
-                  }&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
-                  });
+                if (gdStateValue == "4" && associationTypeValue != "other") {
+                  if(associationTypeValue == 'patientTransport'){
+                    // 门诊服务点,有orderList
+                    if(res.orderList){
+                      uni.navigateTo({
+                        url: `/pages/outpatient/outpatientStartSignIn/outpatientStartSignIn?model=${encodeURIComponent(JSON.stringify(res))}`,
+                      });
+                    }else{
+                      uni.navigateTo({
+                        url: `../../pages/scanning_Result/scanning_Result?type=${
+                        associationTypeValue
+                      }&type1=${res.type}&id=${data.id}&deptCode=${
+                        list.code
+                      }&patient=${res.patient}&patientCode=${
+                        res.patientCode
+                      }&deptName=${res.deptName}&bedNum=${
+                        res.bedNum
+                      }&status=${res.status}&msg=${
+                        res.msg
+                      }&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                      });
+                    }
+                  }else{
+                    uni.navigateTo({
+                      url: `../../pages/scanning_Result/scanning_Result?type=${
+                      associationTypeValue
+                    }&type1=${res.type}&id=${data.id}&deptCode=${
+                      list.code
+                    }&patient=${res.patient}&patientCode=${
+                      res.patientCode
+                    }&deptName=${res.deptName}&bedNum=${
+                      res.bedNum
+                    }&status=${res.status}&msg=${
+                      res.msg
+                    }&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                    });
+                  }
                 }
                 if (gdStateValue == "8") {
                   uni.navigateTo({

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.50');
+console.info('v2.4.51');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages.json

@@ -540,7 +540,41 @@
           "titleNView": false
         }
       }
-
+    }, {
+      "path": "pages/outpatient/outpatientStartSignIn/outpatientStartSignIn",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }, {
+      "path": "pages/outpatient/outpatientEndSignIn/outpatientEndSignIn",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }, {
+      "path": "pages/outpatient/outpatientEndTaskType/outpatientEndTaskType",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }, {
+      "path": "pages/outpatient/outpatientEndTaskTypeSuccess/outpatientEndTaskTypeSuccess",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }, {
+      "path": "pages/outpatient/outpatientEndComplete/outpatientEndComplete",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }
   ],
   "globalStyle": {

pages/outpatient/outpatientEndComplete/outpatientEndComplete.vue

@@ -0,0 +1,223 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view class="text1"> 服务完成 </view>
+      </view>
+      <view class="Scanning_top_text">
+        <strong class="red">请您确认患者的所有资料物品并完成交接！</strong>
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <view class="Scanning_cont_list_item" v-for="item in orderList" :key="item.id">
+            <view class="name">
+              {{item.taskType ? item.taskType.taskName : ''}}
+            </view>
+            <view class="value">
+              单号：{{item.gdcode}}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goToIndex()"> 知道了 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        infoData: {},
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        orderList: [],
+      };
+    },
+    methods: {
+      goToIndex(){
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`,
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      if(options.model){
+        this.infoData = JSON.parse(options.model);
+        this.orderList = this.infoData.orderList || [];
+      }
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          margin-top: 30rpx;
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 30rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0 45rpx;
+
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+          border: 1rpx solid #E9E9E9;
+        }
+        .Scanning_cont_list_item{
+          height: 63rpx;
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          border-bottom: 2rpx dashed #D3D3D3;
+          border-top: none;
+          margin: 0 18rpx;
+          &:last-of-type{
+            border-bottom: 1rpx dashed #E9E9E9;
+          }
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-top: 1rpx solid #272727;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            font-weight: bold;
+            line-height: 1;
+          }
+          .value {
+            justify-content: flex-end;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 30rpx;
+      flex-shrink: 0;
+      line-height: 88rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/outpatient/outpatientEndSignIn/outpatientEndSignIn.vue

@@ -0,0 +1,320 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view class="text1"> 签到成功 </view>
+      </view>
+      <view class="Scanning_top_text">
+        您已到达<strong class="red">{{deptName}}</strong>，请完成以下服务
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <view class="Scanning_cont_list_item" v-for="item in orderList" :key="item.id">
+            <view class="name">
+              {{item.taskType ? item.taskType.taskName : ''}}
+            </view>
+            <view class="value">
+              单号：{{item.gdcode}}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goToIndex()"> 知道了 </view>
+      <view class="btn" @click="additional()" v-if="taskTypeConfig.addService == 1"> 追加服务 </view>
+      <view class="btn" @click="finish()" v-if="taskTypeConfig.finishService == 1"> 结束服务 </view>
+    </view>
+    <!-- 结束服务弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+      :operate="models.operate" @ok="ok" @cancel="cancel"></showModel>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        // 结束服务弹窗model
+        models: {
+          disjunctor: false,
+        },
+        deptName: '',
+        infoData: {},
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        orderList: [],
+        taskTypeConfig: {},
+      };
+    },
+    methods: {
+      ok() {
+        this.models.disjunctor = false;
+        
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/patient/endService", {
+          patientCode: this.infoData.patientCode,
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            uni.navigateTo({
+              url: `/pages/outpatient/outpatientEndComplete/outpatientEndComplete?model=${encodeURIComponent(JSON.stringify(result))}`,
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      cancel() {
+        this.models.disjunctor = false;
+      },
+      // 结束服务
+      finish(){
+        this.models = {
+          disjunctor: true,
+          title: "提示",
+          content: `您确认要完成服务吗？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };s
+      },
+      // 追加服务
+      additional(){
+        uni.navigateTo({
+          url: `/pages/outpatient/outpatientEndTaskType/outpatientEndTaskType?model=${encodeURIComponent(JSON.stringify(this.infoData))}`,
+        });
+      },
+      // 知道了
+      goToIndex(){
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`,
+        });
+      },
+      // 获取检查页面控制
+      getTaskTypeConfig(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "associationType": {
+                        "key": "association_types",
+                        "value": "inspect"
+                    }
+                }
+            }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            let configs = result.list || [];
+            if(configs.length){
+              this.taskTypeConfig = configs[0];
+            }else{
+              this.taskTypeConfig = {};
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      if(options.model){
+        this.infoData = JSON.parse(options.model);
+        this.orderList = this.infoData.orderList || [];
+        this.deptName = this.infoData.deptName;
+        console.log(this.infoData);
+      }
+      this.getTaskTypeConfig();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          margin-top: 30rpx;
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 30rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0 45rpx;
+
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+          border: 1rpx solid #E9E9E9;
+        }
+        .Scanning_cont_list_item{
+          height: 63rpx;
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          border-bottom: 2rpx dashed #D3D3D3;
+          border-top: none;
+          margin: 0 18rpx;
+          &:last-of-type{
+            border-bottom: 1rpx dashed #E9E9E9;
+          }
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-top: 1rpx solid #272727;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            font-weight: bold;
+            line-height: 1;
+          }
+          .value {
+            justify-content: flex-end;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 30rpx;
+      flex-shrink: 0;
+      line-height: 88rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/outpatient/outpatientEndTaskType/outpatientEndTaskType.vue

@@ -0,0 +1,321 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <image mode="widthFix" class="icon_service" src="../../../static/img/icon_service.png"></image>
+        <view class="text1"> 追加服务 </view>
+      </view>
+      <view class="Scanning_top_text">
+        您已完成<strong class="red">{{taskNames}}</strong>，请继续完成以下追加服务 
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <checkbox-group @change="checkboxChange">
+            <label class="Scanning_cont_list_item" v-for="item in addServiceTasks" :key="item.id">
+              <view class="name">
+                {{item.taskName}}
+              </view>
+              <view class="value">
+                <checkbox :value="item.id" :checked="item.checked" />
+              </view>
+            </label>
+          </checkbox-group>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="ok()" v-if="addServiceTasks.length"> 确认追加 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        taskNames: '',
+        infoData: {},
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        orderList: [],
+        taskTypeConfig: {},
+        addServiceTasks: [],
+      };
+    },
+    methods: {
+      // 追加服务
+      ok(){
+        console.log(this.addServiceTasks);
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {workOrders: []};
+        this.addServiceTasks.forEach(v => {
+          postData.workOrders.push({
+              "sourceId": 4,
+              "taskType": {
+                  "id": v.id
+              },
+              "patient": {
+                  "patientCode": this.infoData.patientCode
+              },
+              "isRemand": 0,
+              "isAccompany": 0
+          });
+        })
+        post("/api/startOrder", postData).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            uni.navigateTo({
+              url: `/pages/outpatient/outpatientEndTaskTypeSuccess/outpatientEndTaskTypeSuccess?model=${encodeURIComponent(JSON.stringify(result))}`,
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      checkboxChange: function (e) {
+        let items = this.addServiceTasks,
+          values = e.detail.value;
+        for (var i = 0, lenI = items.length; i < lenI; ++i) {
+          const item = items[i]
+          if(values.includes(item.value)){
+            this.$set(item,'checked',true)
+          }else{
+            this.$set(item,'checked',false)
+          }
+        }
+      },
+      // 获取检查页面控制
+      getTaskTypeConfig(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/simple/data/fetchDataList/taskTypeConfig", {
+            "idx": 0,
+            "sum": 10,
+            "taskTypeConfig": {
+                "taskTypeDTO": {
+                    "hosId": {
+                        "id": this.hosId
+                    },
+                    "associationType": {
+                        "key": "association_types",
+                        "value": "inspect"
+                    }
+                }
+            }
+        }).then((result) => {
+          uni.hideLoading();
+          if (result.status == 200) {
+            let configs = result.list || [];
+            if(configs.length){
+              this.taskTypeConfig = configs[0];
+              this.addServiceTasks = this.taskTypeConfig.addServiceTasks || [];
+            }else{
+              this.taskTypeConfig = {};
+              this.addServiceTasks = [];
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      if(options.model){
+        this.infoData = JSON.parse(options.model);
+        this.orderList = this.infoData.orderList || [];
+        this.taskNames = this.infoData.taskNames;
+        console.log(this.infoData);
+      }
+      this.getTaskTypeConfig();
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    /deep/ uni-checkbox .uni-checkbox-input{
+      color: #35b34a!important;
+      width: 30rpx!important;
+      height: 30rpx!important;
+    }
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        
+        .icon_service{
+          width: 115rpx;
+        }
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          margin-top: 30rpx;
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 30rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0 45rpx;
+
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+          border: 1rpx solid #E9E9E9;
+        }
+        .Scanning_cont_list_item{
+          height: 63rpx;
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          border-bottom: 2rpx dashed #D3D3D3;
+          border-top: none;
+          margin: 0 18rpx;
+          &:last-of-type{
+            border-bottom: 1rpx dashed #E9E9E9;
+          }
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-top: 1rpx solid #272727;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            font-weight: bold;
+            line-height: 1;
+          }
+          .value {
+            justify-content: flex-end;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 30rpx;
+      flex-shrink: 0;
+      line-height: 88rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/outpatient/outpatientEndTaskTypeSuccess/outpatientEndTaskTypeSuccess.vue

@@ -0,0 +1,225 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view class="text1"> 追加成功 </view>
+      </view>
+      <view class="Scanning_top_text">
+        您已成功追加<strong class="red">{{taskNames}}</strong>，请继续完成以下服务
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <view class="Scanning_cont_list_item" v-for="item in orderList" :key="item.id">
+            <view class="name">
+              {{item.taskType ? item.taskType.taskName : ''}}
+            </view>
+            <view class="value">
+              单号：{{item.gdcode}}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goToIndex()"> 知道了 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        taskNames: '',
+        infoData: {},
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        orderList: [],
+      };
+    },
+    methods: {
+      goToIndex(){
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`,
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      if(options.model){
+        this.infoData = JSON.parse(options.model);
+        this.orderList = this.infoData.orderList || [];
+        this.taskNames = this.infoData.taskNames;
+      }
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          margin-top: 30rpx;
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 30rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0 45rpx;
+
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+          border: 1rpx solid #E9E9E9;
+        }
+        .Scanning_cont_list_item{
+          height: 63rpx;
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          border-bottom: 2rpx dashed #D3D3D3;
+          border-top: none;
+          margin: 0 18rpx;
+          &:last-of-type{
+            border-bottom: 1rpx dashed #E9E9E9;
+          }
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-top: 1rpx solid #272727;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            font-weight: bold;
+            line-height: 1;
+          }
+          .value {
+            justify-content: flex-end;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 30rpx;
+      flex-shrink: 0;
+      line-height: 88rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/outpatient/outpatientStartSignIn/outpatientStartSignIn.vue

@@ -0,0 +1,225 @@
+<template>
+  <view class="Scanning_Result">
+    <view class="Scanning_top">
+      <view class="Scanning_top_icon">
+        <text class="cubeic-ok icon_transport transport-duigou"></text>
+        <view class="text1"> 扫描成功 </view>
+      </view>
+      <view class="Scanning_top_text">
+        您已成功接到<strong class="red">{{patient}}</strong>患者，请完成以下服务
+      </view>
+    </view>
+
+    <view class="Scanning_cont">
+      <view class="Scanning_cont_list">
+        <scroll-view scroll-y="true" class="Scanning_cont_list_scroll">
+          <view class="Scanning_cont_list_item" v-for="item in orderList" :key="item.id">
+            <view class="name">
+              {{item.taskType ? item.taskType.taskName : ''}}
+            </view>
+            <view class="value">
+              单号：{{item.gdcode}}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+
+    <view class="foot_btn">
+      <view class="btn" @click="goToIndex()"> 知道了 </view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    get,
+    post,
+    SM,
+    webHandle
+  } from "../../../http/http.js";
+  export default {
+    data() {
+      return {
+        patient: '',
+        infoData: {},
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        queryObj: {}, //路由传递过来的数据
+        orderList: [],
+      };
+    },
+    methods: {
+      goToIndex(){
+        uni.navigateTo({
+          url: `/pages/receiptpage/receiptpage`,
+        });
+      },
+    },
+    onLoad(options) {
+      console.log(options, "result");
+      this.queryObj = options;
+      if(options.model){
+        this.infoData = JSON.parse(options.model);
+        this.orderList = this.infoData.orderList || [];
+        this.patient = this.infoData.patient;
+      }
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .Scanning_Result {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    .Scanning_top {
+      flex-shrink: 0;
+      .Scanning_top_icon {
+        padding-top: 26rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .cubeic-ok {
+          font-size: 140rpx;
+          color: #35b34a;
+        }
+
+        .text1 {
+          margin-top: 30rpx;
+          font-size: 40rpx;
+          font-weight: bold;
+        }
+      }
+      .Scanning_top_text{
+        text-align: center;
+        font-size: 30rpx;
+        font-weight: bold;
+        padding: 8rpx 0 23rpx 0;
+      }
+    }
+
+    .Scanning_cont {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0 45rpx;
+
+      .Scanning_cont_head{
+        flex-shrink: 0;
+        height: 78rpx;
+        display: flex;
+        border-top: 1rpx solid #EEEEEE;
+        border-bottom: 1rpx solid #EEEEEE;
+        .Scanning_cont_head_item{
+          flex: 1;
+          font-size: 32rpx;
+          font-weight: bold;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          position: relative;
+          &.active{
+            color: #49B856;
+            &::before{
+              content: '';
+              width: 70rpx;
+              height: 10rpx;
+              background-color: #49B856;
+              position: absolute;
+              left: 50%;
+              bottom: 0;
+              transform: translateX(-50%);
+              border-radius: 6rpx;
+            }
+          }
+          &::after{
+            content: '';
+            width: 2rpx;
+            height: 44rpx;
+            background-color: #D1D1D1;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+          }
+          &:last-of-type::after{
+            opacity: 0;
+          }
+        }
+      }
+
+      .Scanning_cont_list{
+        flex: 1;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+        .Scanning_cont_list_scroll{
+          flex: 1;
+          min-height: 0;
+          border: 1rpx solid #E9E9E9;
+        }
+        .Scanning_cont_list_item{
+          height: 63rpx;
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          border-bottom: 2rpx dashed #D3D3D3;
+          border-top: none;
+          margin: 0 18rpx;
+          &:last-of-type{
+            border-bottom: 1rpx dashed #E9E9E9;
+          }
+          &.Scanning_cont_list_head{
+            font-weight: bold;
+            font-size: 28rpx;
+            border-top: 1rpx solid #272727;
+            flex-shrink: 0;
+          }
+          .name,
+          .value{
+            flex: 1;
+            display: flex;
+            align-items: center;
+            height: 100%;
+            font-weight: bold;
+            line-height: 1;
+          }
+          .value {
+            justify-content: flex-end;
+          }
+        }
+      }
+    }
+
+    .foot_btn {
+      margin: 30rpx;
+      flex-shrink: 0;
+      line-height: 88rpx;
+      display: flex;
+      justify-content: center;
+
+      .btn {
+        height: 88rpx;
+        flex: 1;
+        margin-right: 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 34rpx;
+        font-weight: bold;
+        text-align: center;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

pages/receipt_infopage/receipt_infopage.vue

@@ -338,7 +338,7 @@
         </view>
       </view>
     </view>
-    <view class="foot_btn2 footerPadding">
+    <view class="foot_btn2 footerPadding" style="flex-wrap: wrap;">
       <view class="btn2" @click="showAlert" v-if="infoDATA.gdState.value == 2">接单</view>
       <!-- 如果不是静配，药配，标本配送,标本轮巡,万能交接 -->
       <template
@@ -412,6 +412,7 @@
       <view class="btn3" @click="viewBlood(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'ordinary' && infoDATA.taskType.ordinaryField.value == 'blood'" hover-class="seimin-btn-hover">查看血制品</view>
       <view class="btn3" @click="additionalUser(infoDATA)" v-if="(infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport') && infoDATA.worker && infoDATA.worker.id && multiplayerMode === 1" hover-class="seimin-btn-hover">追加陪检人员</view>
       <view class="btn3" @click="additionalUser(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.worker && infoDATA.worker.id && clinicalMultiplayerMode === 1 && clinicalTaskIdsFlag && !infoDATA.copyBy" hover-class="seimin-btn-hover">追加执行人员</view>
+      <view class="btn3" style="flex-basis: 100%;" @click="patientHandover(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'patientTransport' && infoDATA.worker && infoDATA.worker.id && handoverOrder === 1" hover-class="seimin-btn-hover">扫描交接</view>
     </view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
@@ -421,6 +422,9 @@
     <inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor"
       :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :remove="true">
     </inspectRemoveModel>
+    <!-- 弹窗 -->
+    <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
+      :operate="models2.operate" @ok="ok2" @cancel="cancel2"></showModel>
     <!-- 填写交接人工号弹窗 -->
     <selectAccount v-if="hosModels.disjunctor" :disjunctor="hosModels.disjunctor" @ok="hosOk"
       @cancel="hosCancel">
@@ -450,6 +454,8 @@
     },
     data() {
       return {
+        patientHandoverData: {},
+        patientHandoverCode: '',
         other: {
           user: {},
           data: {},
@@ -466,6 +472,7 @@
         currentCode: '', //当前拍照使用的科室二维码
         currentData: {}, //当前小扫描的工单对象
         multiplayerMode: 0,
+        handoverOrder: 0,
         clinicalMultiplayerMode: 0,
         clinicalTaskIdsFlag: false,
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
@@ -480,6 +487,10 @@
         models1: {
           disjunctor: false,
         },
+        // 弹窗model1
+        models2: {
+          disjunctor: false,
+        },
         currentInspect: null,
         showType: "show",
         infoDATA: {},
@@ -519,6 +530,85 @@
       },
     },
     methods: {
+      ok2() {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/patient/patientHandover", {
+          id: this.patientHandoverCode.id,
+          patientCode: this.patientHandoverData.patient.patientCode,
+        }).then((result) => {
+          this.models2.disjunctor = false;
+          if (result.state == 200) {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              mask: true,
+              title: "交接成功！",
+            });
+            setTimeout(() => {
+              uni.navigateTo({
+                url: `/pages/receiptpage/receiptpage`,
+              });
+            },300)
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      cancel2() {
+        this.models2.disjunctor = false;
+      },
+      // 门诊患者交接
+      patientHandover(infoDATA){
+        console.log(infoDATA);
+        this.patientHandoverData = infoDATA;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          //检验二维码的有效性(扫码前必须验证)
+          post("/dept/scanning", {
+              content,
+            })
+            .then((result) => {
+              this.patientHandoverCode = JSON.parse(result.code);
+              this.SMFlag = true;
+              // 200检测通过，201没有有效期也通过。
+              if (result.state == 200 || result.state == 201) {
+                uni.hideLoading();
+                this.models2 = {
+                  disjunctor: true,
+                  title: "提示",
+                  content: `您确认要与<span class="red">${this.patientHandoverCode.name}</span>交接吗？`,
+                  icon: "warn",
+                  operate: {
+                    ok: "确定",
+                    cancel: "取消",
+                  },
+                };
+              } else {
+                uni.hideLoading();
+                uni.showToast({
+                  icon: "none",
+                  title: result.info || "接口获取数据失败！",
+                });
+              }
+            })
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
       // 手动查询-确认
       checkboxOk(bulkCopy) {
         console.log(bulkCopy);
@@ -1429,11 +1519,14 @@
           if (result.status == 200) {
             if(result.list && result.list[0]){
               this.multiplayerMode = result.list[0].multiplayerMode;
+              this.handoverOrder = result.list[0].handoverOrder;
             }else{
               this.multiplayerMode = 0;
+              this.handoverOrder = 0;
             }
           } else {
             this.multiplayerMode = 0;
+            this.handoverOrder = 0;
           }
         });
       },
@@ -1462,7 +1555,7 @@
             this.clinicalTaskIdsFlag = false;
           }
         });
-      }
+      },
     },
     onLoad(options) {
       console.log(options, 'options');
@@ -1868,7 +1961,8 @@
         color: #fff;
         border-radius: 8rpx;
         font-size: 28rpx;
-        margin-top: 16rpx;
+        margin-top: 8rpx;
+        margin-bottom: 8rpx;
         text-align: center;
       }
     }

pages/scanning_Result/scanning_Result.vue

@@ -435,21 +435,69 @@
                     this.type == "inspect" ||
                     this.type == "patientTransport"
                   ) {
-                    uni.redirectTo({
-                      url: `../scanning_Result/scanning_Result?type=${
-                      this.queryObj.type //baba
-                    }&type1=${
-                      this.queryObj.type1
-                    }&infoData=${encodeURIComponent(
-                      JSON.stringify(ress.data)
-                    )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                      this.queryObj.deptCode
-                    }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
-                      JSON.stringify(ress)
-                    )}&patient=${ress.patient}&patientCode=${
-                      ress.patientCode
-                    }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
-                    });
+                    if(this.type == "patientTransport" && this.queryObj.type1 == 'trans-ddd-1'){
+                      // 门诊服务点,有orderList
+                      if(ress.orderList){
+                        uni.navigateTo({
+                          url: `/pages/outpatient/outpatientStartSignIn/outpatientStartSignIn?model=${encodeURIComponent(JSON.stringify(ress))}`,
+                        });
+                      }else{
+                        uni.redirectTo({
+                          url: `../scanning_Result/scanning_Result?type=${
+                          this.queryObj.type
+                        }&type1=${
+                          this.queryObj.type1
+                        }&infoData=${encodeURIComponent(
+                          JSON.stringify(ress.data)
+                        )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                          this.queryObj.deptCode
+                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
+                          JSON.stringify(ress)
+                        )}&patient=${ress.patient}&patientCode=${
+                          ress.patientCode
+                        }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
+                        });
+                      }
+                    }else if(this.type == "patientTransport" && this.queryObj.type1 == 'trans-dsd-1'){
+                      // 门诊服务点,有orderList
+                      if(ress.orderList){
+                        uni.navigateTo({
+                          url: `/pages/outpatient/outpatientEndSignIn/outpatientEndSignIn?model=${encodeURIComponent(JSON.stringify(ress))}`,
+                        });
+                      }else{
+                        uni.redirectTo({
+                          url: `../scanning_Result/scanning_Result?type=${
+                          this.queryObj.type
+                        }&type1=${
+                          this.queryObj.type1
+                        }&infoData=${encodeURIComponent(
+                          JSON.stringify(ress.data)
+                        )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                          this.queryObj.deptCode
+                        }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
+                          JSON.stringify(ress)
+                        )}&patient=${ress.patient}&patientCode=${
+                          ress.patientCode
+                        }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
+                        });
+                      }
+                    }else{
+                      uni.redirectTo({
+                        url: `../scanning_Result/scanning_Result?type=${
+                        this.queryObj.type
+                      }&type1=${
+                        this.queryObj.type1
+                      }&infoData=${encodeURIComponent(
+                        JSON.stringify(ress.data)
+                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                        this.queryObj.deptCode
+                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(
+                        JSON.stringify(ress)
+                      )}&patient=${ress.patient}&patientCode=${
+                        ress.patientCode
+                      }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
+                      });
+                    }
                   } else {
                     uni.redirectTo({
                       url: `../scanning_Result/scanning_Result?type=${

pages/scanning_all/scanning_all.vue

@@ -625,26 +625,35 @@
                               this.tabType == "inspect" ||
                               this.tabType == "patientTransport"
                             ) {
-                              if (res.ids) {
-                                for (var i = 0; i < this.userId.ids.length; i++) {
-                                  if (this.userId.ids[i] == res.ids[0]) {
-                                    this.userId.ids.splice(i, 1);
+                              if(this.tabType === 'patientTransport' && this.infoDATA.patientTransport && this.infoDATA.patientTransport[0].gdState.value == 5){
+                                // 门诊服务点
+                                if(res.orderList){
+                                  uni.navigateTo({
+                                    url: `/pages/outpatient/outpatientEndSignIn/outpatientEndSignIn?model=${encodeURIComponent(JSON.stringify(res))}`,
+                                  });
+                                }else{
+                                  if (res.ids) {
+                                    for (var i = 0; i < this.userId.ids.length; i++) {
+                                      if (this.userId.ids[i] == res.ids[0]) {
+                                        this.userId.ids.splice(i, 1);
+                                      }
+                                    }
                                   }
+                                  uni.navigateTo({
+                                    url: `../scanning_djInfo/scanning_djInfo?type=${
+                                    this.tabType
+                                  }&type1=${res.type}&infoData=${res.data}&status=${
+                                    res.status
+                                  }&msg=${res.msg}&deptCode=${this.code}&dept=${
+                                    res.dept
+                                  }&ids=${encodeURIComponent(
+                                    JSON.stringify(this.userId.ids)
+                                  )}&model=${encodeURIComponent(
+                                    JSON.stringify(res)
+                                  )}`,
+                                  });
                                 }
                               }
-                              uni.navigateTo({
-                                url: `../scanning_djInfo/scanning_djInfo?type=${
-                                this.tabType
-                              }&type1=${res.type}&infoData=${res.data}&status=${
-                                res.status
-                              }&msg=${res.msg}&deptCode=${this.code}&dept=${
-                                res.dept
-                              }&ids=${encodeURIComponent(
-                                JSON.stringify(this.userId.ids)
-                              )}&model=${encodeURIComponent(
-                                JSON.stringify(res)
-                              )}`,
-                              });
                             } else {
                               uni.navigateTo({
                                 url: `../scanning_djEnd/scanning_djEnd?type=${

pages/scanning_code/scanning_code.vue

@@ -911,50 +911,58 @@
                   } else {
                     uni.hideLoading();
                     // --------start----------
-                    // 患者陪检执行中或待送达,患者转运待送达
-                    if (
-                      ress.type == "ins-zxz-1" ||
-                      ress.type == "ins-dsd-1" ||
-                      ress.type == "trans-dsd-1"
-                    ) {
-                      console.log(ress.patientName, "code");
-                      uni.navigateTo({
-                        url: `../scanning_Result/scanning_Result?type=${
-                        this.queryObj.type
-                      }&type1=${
-                        this.queryObj.type1
-                      }&infoData=${encodeURIComponent(
-                        JSON.stringify(ress.data)
-                      )}&status=${ress.status}&msg=${ress.msg}&patient=${
-                        ress.patient
-                      }&patientCode=${ress.patientCode}&deptName=${
-                        ress.deptName
-                      }&bedNum=${ress.bedNum}&deptCode=${
-                        this.queryObj.deptCode
-                      }&dept=${
-                        this.queryObj.dept
-                      }&id=${this.dataId}&model=${encodeURIComponent(
-                        JSON.stringify(ress)
-                      )}`,
-                      });
-                    } else {
-                      uni.navigateTo({
-                        url: `../scanning_Result/scanning_Result?type=${
-                        this.queryObj.type
-                      }&type1=${
-                        this.queryObj.type1
-                      }&infoData=${encodeURIComponent(
-                        JSON.stringify(ress.data)
-                      )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                        this.queryObj.deptCode
-                      }&dept=${
-                        this.queryObj.dept
-                      }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
-                        JSON.stringify(ress)
-                      )}&speNum=${ress.specimenCount}&scanOrHand=${type}`,
-                      });
+                    if(this.infoDATA.taskType.associationType.value == 'patientTransport' && this.infoDATA.gdState.value == 5){
+                      // 门诊服务点,有orderList
+                      if(ress.orderList){
+                        uni.navigateTo({
+                          url: `/pages/outpatient/outpatientEndSignIn/outpatientEndSignIn?model=${encodeURIComponent(JSON.stringify(ress))}`,
+                        });
+                      }else{
+                        // 患者陪检执行中或待送达,患者转运待送达
+                        if (
+                          ress.type == "ins-zxz-1" ||
+                          ress.type == "ins-dsd-1" ||
+                          ress.type == "trans-dsd-1"
+                        ) {
+                          console.log(ress.patientName, "code");
+                          uni.navigateTo({
+                            url: `../scanning_Result/scanning_Result?type=${
+                            this.queryObj.type
+                          }&type1=${
+                            this.queryObj.type1
+                          }&infoData=${encodeURIComponent(
+                            JSON.stringify(ress.data)
+                          )}&status=${ress.status}&msg=${ress.msg}&patient=${
+                            ress.patient
+                          }&patientCode=${ress.patientCode}&deptName=${
+                            ress.deptName
+                          }&bedNum=${ress.bedNum}&deptCode=${
+                            this.queryObj.deptCode
+                          }&dept=${
+                            this.queryObj.dept
+                          }&id=${this.dataId}&model=${encodeURIComponent(
+                            JSON.stringify(ress)
+                          )}`,
+                          });
+                        } else {
+                          uni.navigateTo({
+                            url: `../scanning_Result/scanning_Result?type=${
+                            this.queryObj.type
+                          }&type1=${
+                            this.queryObj.type1
+                          }&infoData=${encodeURIComponent(
+                            JSON.stringify(ress.data)
+                          )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                            this.queryObj.deptCode
+                          }&dept=${
+                            this.queryObj.dept
+                          }&deptId=${this.deptId}&id=${this.dataId}&model=${encodeURIComponent(
+                            JSON.stringify(ress)
+                          )}&speNum=${ress.specimenCount}&scanOrHand=${type}`,
+                          });
+                        }
+                      }
                     }
-
                     // ------------end------------
                   }
                 } else {

pages/scanning_djEnd/scanning_djEnd.vue

@@ -675,24 +675,53 @@
                     }, 500)
                   }
                 }
-                this.speNum = ress.specimenCount;
-                uni.navigateTo({
-                  url: `../scanning_djInfo/scanning_djInfo?type=${
-                  this.queryObj.type
-                }&type1=${
-                  this.queryObj.type1
-                }&infoData=${encodeURIComponent(
-                  JSON.stringify(ress.data)
-                )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                  this.queryObj.code
-                }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
-                  JSON.stringify(this.ids)
-                )}&model=${encodeURIComponent(
-                  JSON.stringify(ress)
-                )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(
-                  JSON.stringify(this.accountObj)
-                )}&deptId=${this.deptId}&scanOrHand=${type}`,
-                });
+                if(this.type === 'patientTransport' && this.queryObj.type1 == 'trans-dsd-1'){
+                  // 门诊服务点
+                  if(ress.orderList){
+                    uni.navigateTo({
+                      url: `/pages/outpatient/outpatientEndSignIn/outpatientEndSignIn?model=${encodeURIComponent(JSON.stringify(ress))}`,
+                    });
+                  }else{
+                    this.speNum = ress.specimenCount;
+                    uni.navigateTo({
+                      url: `../scanning_djInfo/scanning_djInfo?type=${
+                      this.queryObj.type
+                    }&type1=${
+                      this.queryObj.type1
+                    }&infoData=${encodeURIComponent(
+                      JSON.stringify(ress.data)
+                    )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                      this.queryObj.code
+                    }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
+                      JSON.stringify(this.ids)
+                    )}&model=${encodeURIComponent(
+                      JSON.stringify(ress)
+                    )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(
+                      JSON.stringify(this.accountObj)
+                    )}&deptId=${this.deptId}&scanOrHand=${type}`,
+                    });
+                  }
+                }else{
+                  this.speNum = ress.specimenCount;
+                  uni.navigateTo({
+                    url: `../scanning_djInfo/scanning_djInfo?type=${
+                    this.queryObj.type
+                  }&type1=${
+                    this.queryObj.type1
+                  }&infoData=${encodeURIComponent(
+                    JSON.stringify(ress.data)
+                  )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
+                    this.queryObj.code
+                  }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
+                    JSON.stringify(this.ids)
+                  )}&model=${encodeURIComponent(
+                    JSON.stringify(ress)
+                  )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(
+                    JSON.stringify(this.accountObj)
+                  )}&deptId=${this.deptId}&scanOrHand=${type}`,
+                  });
+                }
+                
               } else {
                 uni.navigateTo({
                   url: `../scanning_djInfo/scanning_djInfo?type=${

pages/scanning_ins/scanning_ins.vue

@@ -724,6 +724,7 @@
       },
       //一键操作
       allStart(data) {
+        console.log(data)
         let list = {};
         if (data) {
           let type = "";
@@ -757,17 +758,17 @@
                     post("/workerOrder/" + type, list).then((res) => {
                       uni.hideLoading();
                       if (res.status == 200) {
-                        // model: JSON.stringify(res), //签到返回的信息
-                        // type: data.taskType.associationType.value, //关联类型
-                        // code: ress, //二维码code
-                        // ids //科室ID数组
-                        uni.navigateTo({
-                          url: `../scanning_djEnd/scanning_djEnd?type=${
-                          data.taskType.associationType.value
-                        }&code=${ress}&ids=${ids}&model=${encodeURIComponent(
-                          JSON.stringify(res)
-                        )}`,
-                        });
+                          // model: JSON.stringify(res), //签到返回的信息
+                          // type: data.taskType.associationType.value, //关联类型
+                          // code: ress, //二维码code
+                          // ids //科室ID数组
+                          uni.navigateTo({
+                            url: `../scanning_djEnd/scanning_djEnd?type=${
+                            data.taskType.associationType.value
+                          }&code=${ress}&ids=${ids}&model=${encodeURIComponent(
+                            JSON.stringify(res)
+                          )}`,
+                          });
                       } else {
                         uni.navigateTo({
                           url: `../scanning_djEnd/scanning_djEnd?model=${encodeURIComponent(
@@ -817,11 +818,26 @@
             post("/workerOrder/" + type, list).then((res) => {
               uni.hideLoading();
               if (res.status == 200) {
-                uni.navigateTo({
-                  url: `../scanning_insEnd/scanning_insEnd?type=${
-                  data.taskType.associationType.value
-                }&model=${encodeURIComponent(JSON.stringify(res))}`,
-                });
+                if(data.gdState.value == 4 && data.taskType.associationType.value === 'patientTransport'){
+                  // 门诊服务点
+                  if(res.orderList){
+                    uni.navigateTo({
+                      url: `/pages/outpatient/outpatientStartSignIn/outpatientStartSignIn?model=${encodeURIComponent(JSON.stringify(res))}`,
+                    });
+                  }else{
+                    uni.navigateTo({
+                      url: `../scanning_insEnd/scanning_insEnd?type=${
+                      data.taskType.associationType.value
+                    }&model=${encodeURIComponent(JSON.stringify(res))}`,
+                    });
+                  }
+                }else{
+                  uni.navigateTo({
+                    url: `../scanning_insEnd/scanning_insEnd?type=${
+                    data.taskType.associationType.value
+                  }&model=${encodeURIComponent(JSON.stringify(res))}`,
+                  });
+                }
               } else {
                 uni.navigateTo({
                   url: `../scanning_insEnd/scanning_insEnd?model=${encodeURIComponent(