送回病房增加选择陪检方式

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.20');
+console.info('v2.4.21');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/patientInformationList/patientInformationList.vue

@@ -73,6 +73,11 @@
     <!-- 送回病房建单弹窗-扫描科室 -->
     <showModel :title="models3.title" :icon="models3.icon" :disjunctor="models3.disjunctor" :content="models3.content"
       :operate="models3.operate" @ok="ok3" @cancel="cancel3"></showModel>
+    <!-- 弹窗 -->
+    <showModel :title="models4.title" :icon="models4.icon" :disjunctor="models4.disjunctor"
+      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @cancel="cancel4"
+      @radioChange="radioChange4" :operate="models4.operate">
+    </showModel>
   </view>
 </template>
 <script>
@@ -87,6 +92,11 @@
   export default {
     data() {
       return {
+        selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
+        // 单选框弹窗model
+        models4: {
+          disjunctor: false,
+        },
         SMFlag:true,
         hosId: uni.getStorageSync("userData").user.currentHospital.id,
         // 选中的患者项
@@ -127,41 +137,71 @@
       bigScreen,
     },
     methods: {
-      ok2() {
-        console.log(this.options)
-        this.models2.disjunctor = false;
-        let currentItem = JSON.parse(this.options.currentItem);
+      // 获取是否需要选择陪检方式
+      getInspectAndPatientTransformSend() {
+        const postData = {
+          "idx": 0,
+          "sum": 1,
+          "taskTypeConfig": {
+            "taskTypeDTO": {
+              "hosId": {
+                "id": this.hosId
+              },
+              "associationType": {
+                "key": "association_types",
+                "value": "inspect",
+              },
+            },
+          },
+        };
         uni.showLoading({
           mask: true,
           title: '加载中'
         })
-        let userId = uni.getStorageSync("userData").user.id;
-        let postData = {
-          "workOrder": {
-            sourceId: 4,
-            "hosId": this.hosId,
-            "startDept": {
-              "id": this.options.did
-            },
-            "createDept": this.options.did,
-            "patient": {
-              "patientCode": this.currentItem.patientCode
-            },
-            "worker": {
-              "id": userId
-            }
-          }
-        };
-        console.log(postData)
-        // return;
-        post("/workerOrder/returnSickRoom", postData).then((res) => {
-          uni.hideLoading();
+        post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
+          console.log(res)
           if (res.status == 200) {
-            uni.showToast({
-              icon: 'success',
-              title: '建单成功',
-            });
+            res.list = res.list || [];
+            if (res.list[0].signTypeIds) {
+              // 如果开启
+              const postData = {
+                "idx": 0,
+                "sum": 9999,
+                "workOrderInspectScore": {
+                  "hosId": this.hosId,
+                },
+              };
+              post("/simple/data/fetchDataList/workOrderInspectScore", postData).then((res) => {
+                console.log(res)
+                uni.hideLoading();
+                if (res.status == 200) {
+                  res.list = res.list || [];
+                  let radioInspectionDistanceItem = res.list.map(v => ({
+                    id: v.id + "__" + v.inspectMode,
+                    inspectMode: v.inspectMode
+                  }));
+                  this.models4 = {
+                    disjunctor: true,
+                    title: "请选择陪检方式",
+                    radioInspectionDistanceItem,
+                    icon: "",
+                    operate: {
+                      ok: "确定",
+                      cancel: "取消",
+                    },
+                  };
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
+              })
+            } else {
+              this.ok3Result();
+            }
           } else {
+            uni.hideLoading();
             uni.showToast({
               icon: "none",
               title: "请求失败！",
@@ -169,12 +209,32 @@
           }
         })
       },
+      // 选中单选框
+      radioChange4(item) {
+        console.log(item);
+        this.selectRadio = item.split("__");
+      },
+      // 确定
+      ok4() {
+        console.log(this.selectRadio);
+        if (!this.selectRadio.length) {
+          return;
+        }
+        this.models4.disjunctor = false;
+        this.ok3Result();
+      },
+      cancel4() {
+        this.models4.disjunctor = false;
+      },
+      ok2() {
+        this.models2.disjunctor = false;
+        this.getInspectAndPatientTransformSend();
+      },
       cancel2() {
         this.models2.disjunctor = false;
       },
-      ok3() {
+      ok3Result() {
         console.log(this.currentItem)
-        this.models3.disjunctor = false;
         uni.showLoading({
           mask: true,
           title: '加载中'
@@ -185,16 +245,17 @@
             sourceId: 4,
             "hosId": this.hosId,
             "startDept": {
-              "id": this.currentStartDept.id
+              "id": this.options.did || this.currentStartDept.id
             },
-            "createDept": this.currentStartDept.id,
+            "createDept": this.options.did || this.currentStartDept.id,
             "patient": {
               "patientCode": this.currentItem.patientCode
             },
             "worker": {
               "id": userId
-            }
-          }
+            },
+          },
+          "inspectMode": this.selectRadio.length > 0 ? this.selectRadio[0] : undefined,
         };
         console.log(postData);
         // return;
@@ -213,6 +274,10 @@
           }
         })
       },
+      ok3() {
+        this.models3.disjunctor = false;
+        this.getInspectAndPatientTransformSend();
+      },
       cancel3() {
         this.models3.disjunctor = false;
       },

pages/scanning_ins/scanning_ins.vue

@@ -236,7 +236,8 @@
       :operate="models3.operate" @ok="ok3" @cancel="cancel3"></showModel>
     <!-- 弹窗 -->
     <showModel :title="models4.title" :icon="models4.icon" :disjunctor="models4.disjunctor"
-      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @cancel="cancel4" @radioChange="radioChange4" :operate="models4.operate">
+      :radioInspectionDistanceItem="models4.radioInspectionDistanceItem" @ok="ok4" @cancel="cancel4"
+      @radioChange="radioChange4" :operate="models4.operate">
     </showModel>
   </view>
 </template>
@@ -251,13 +252,14 @@
   export default {
     data() {
       return {
+        isInspectAndPatientTransform: false, //是否是一键操作
         selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
         // 单选框弹窗model1
         models4: {
           disjunctor: false,
         },
         currentCode: '', //当前小扫描的科室二维码
-        SMFlag:true,
+        SMFlag: true,
         options: {},
         // wechatFocusSwitch: 0,
         hosId: "",
@@ -296,18 +298,94 @@
     },
     methods: {
       // 获取是否需要选择陪检方式
-      getInspectAndPatientTransform(){
+      getInspectAndPatientTransformSend() {
+        let infoDATA = JSON.parse(this.options.infoDATA);
+        const postData = {
+          "idx": 0,
+          "sum": 1,
+          "taskTypeConfig": {
+            "taskTypeDTO": {
+              "hosId": {
+                "id": this.hosId
+              },
+              "associationType": {
+                "key": "association_types",
+                "value": "inspect",
+              },
+            },
+          },
+        };
+        uni.showLoading({
+          mask: true,
+          title: '加载中'
+        })
+        post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
+          console.log(res)
+          if (res.status == 200) {
+            res.list = res.list || [];
+            if (res.list[0].signTypeIds) {
+              // 如果开启
+              const postData = {
+                "idx": 0,
+                "sum": 9999,
+                "workOrderInspectScore": {
+                  "hosId": this.hosId,
+                },
+              };
+              post("/simple/data/fetchDataList/workOrderInspectScore", postData).then((res) => {
+                console.log(res)
+                uni.hideLoading();
+                if (res.status == 200) {
+                  res.list = res.list || [];
+                  let radioInspectionDistanceItem = res.list.map(v => ({
+                    id: v.id + "__" + v.inspectMode,
+                    inspectMode: v.inspectMode
+                  }));
+                  this.models4 = {
+                    disjunctor: true,
+                    title: "请选择陪检方式",
+                    radioInspectionDistanceItem,
+                    icon: "",
+                    operate: {
+                      ok: "确定",
+                      cancel: "取消",
+                    },
+                  };
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
+              })
+            } else {
+              this.ok3Result();
+            }
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        })
+      },
+      // 获取是否需要选择陪检方式
+      getInspectAndPatientTransform() {
+        this.isInspectAndPatientTransform = true;
         console.log(this.typeData);
-        if(this.typeData){
+        if (this.typeData) {
           const postData = {
-            "idx":0,
-            "sum":1,
-            "taskTypeConfig":{
-              "taskTypeDTO":{
-                "hosId": {"id": this.hosId},
+            "idx": 0,
+            "sum": 1,
+            "taskTypeConfig": {
+              "taskTypeDTO": {
+                "hosId": {
+                  "id": this.hosId
+                },
                 "associationType": {
                   "key": "association_types",
-                  "value":"inspect",
+                  "value": "inspect",
                 },
               },
             },
@@ -320,12 +398,12 @@
             console.log(res)
             if (res.status == 200) {
               res.list = res.list || [];
-              if(res.list[0].signTypeIds && this.typeData.gdState.value == 4){
+              if (res.list[0].signTypeIds && this.typeData.gdState.value == 4) {
                 // 如果开启并且工单状态是待到达
                 const postData = {
-                  "idx":0,
-                  "sum":9999,
-                  "workOrderInspectScore":{
+                  "idx": 0,
+                  "sum": 9999,
+                  "workOrderInspectScore": {
                     "hosId": this.hosId,
                   },
                 };
@@ -334,7 +412,10 @@
                   uni.hideLoading();
                   if (res.status == 200) {
                     res.list = res.list || [];
-                    let radioInspectionDistanceItem = res.list.map(v => ({id: v.id + "__" + v.inspectMode, inspectMode: v.inspectMode}));
+                    let radioInspectionDistanceItem = res.list.map(v => ({
+                      id: v.id + "__" + v.inspectMode,
+                      inspectMode: v.inspectMode
+                    }));
                     this.models4 = {
                       disjunctor: true,
                       title: "请选择陪检方式",
@@ -352,7 +433,7 @@
                     });
                   }
                 })
-              }else{
+              } else {
                 this.allStart(this.typeData);
               }
             } else {
@@ -363,7 +444,7 @@
               });
             }
           })
-        }else{
+        } else {
           this.models = {
             disjunctor: true,
             content: "请选择工单",
@@ -386,55 +467,24 @@
           return;
         }
         this.models4.disjunctor = false;
-        this.allStart(this.typeData);
+        // 判断是一键操作还是送回病房
+        if(this.isInspectAndPatientTransform){
+          this.allStart(this.typeData);
+        }else{
+          this.ok3Result();
+        }
       },
       cancel4() {
         this.models4.disjunctor = false;
       },
       ok2() {
         this.models2.disjunctor = false;
-        uni.showLoading({
-          mask: true,
-          title: '加载中'
-        })
-        let userId = uni.getStorageSync("userData").user.id;
-        let postData = {
-          "workOrder": {
-            sourceId: 4,
-            "hosId": this.hosId,
-            "startDept": {
-              "id": this.options.id
-            },
-            "createDept": this.options.id,
-            "patient": {
-              "patientCode": this.infoDATA.patientCode
-            },
-            "worker": {
-              "id": userId
-            }
-          }
-        };
-        post("/workerOrder/returnSickRoom", postData).then((res) => {
-          console.log(res)
-          uni.hideLoading();
-          if (res.status == 200) {
-            uni.showToast({
-              icon: 'success',
-              title: '建单成功',
-            });
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
-          }
-        })
+        this.getInspectAndPatientTransformSend();
       },
       cancel2() {
         this.models2.disjunctor = false;
       },
-      ok3() {
-        this.models3.disjunctor = false;
+      ok3Result() {
         uni.showLoading({
           mask: true,
           title: '加载中'
@@ -445,16 +495,17 @@
             sourceId: 4,
             "hosId": this.hosId,
             "startDept": {
-              "id": this.currentStartDept.id
+              "id": this.options.id || this.currentStartDept.id
             },
-            "createDept": this.currentStartDept.id,
+            "createDept": this.options.id || this.currentStartDept.id,
             "patient": {
               "patientCode": this.infoDATA.patientCode
             },
             "worker": {
               "id": userId
-            }
-          }
+            },
+          },
+          "inspectMode": this.selectRadio.length > 0 ? this.selectRadio[0] : undefined,
         };
         post("/workerOrder/returnSickRoom", postData).then((res) => {
           console.log(res)
@@ -472,6 +523,10 @@
           }
         })
       },
+      ok3() {
+        this.models3.disjunctor = false;
+        this.getInspectAndPatientTransformSend();
+      },
       cancel3() {
         this.models3.disjunctor = false;
       },
@@ -491,6 +546,7 @@
       },
       // 送回病房-扫描科室
       scanDept() {
+        this.isInspectAndPatientTransform = false;
         if (!this.SMFlag) {
           return;
         }
@@ -525,8 +581,8 @@
                 post("/data/fetchDataList/department", postData).then((res) => {
                   uni.hideLoading();
                   if (res.status == 200) {
-                    if(res.totalNum > 0){
-                      this.currentStartDept = res.list[0]; //baba
+                    if (res.totalNum > 0) {
+                      this.currentStartDept = res.list[0];
                       this.models3 = {
                         disjunctor: true,
                         title: "提示",
@@ -536,8 +592,8 @@
                           ok: "确认建单",
                           cancel: "取消",
                         },
-                      };
-                    }else{
+                      };                      
+                    } else {
                       uni.hideLoading();
                       uni.showToast({
                         icon: "none",
@@ -561,7 +617,7 @@
               });
             }
           });
-        }).catch(err=>{
+        }).catch(err => {
           this.SMFlag = true;
         });
       },
@@ -696,7 +752,9 @@
                     var ids = [];
                     ids.push(data.id);
                     type = "orderSign/" + ress;
-                    list = {ids};
+                    list = {
+                      ids
+                    };
                     // 科室签到
                     post("/workerOrder/" + type, list).then((res) => {
                       uni.hideLoading();
@@ -730,7 +788,7 @@
                 }
               });
               // ------------------------------
-            }).catch(err=>{
+            }).catch(err => {
               this.SMFlag = true;
             });
           } else {
@@ -860,7 +918,7 @@
         this.patientOrders = JSON.parse(options.patientOrders);
       }
       this.code = options.code;
-      
+
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif