bug

pages/patientInformationList/patientInformationList.vue

@@ -320,20 +320,18 @@
                 code = ress;
                 // 科室扫描
                 let postData = {
-                  "idx": 0,
-                  "sum": 1,
-                  "department": {
-                    "hospital": {
-                      "id": this.hosId
-                    },
-                    "qrcode": code
-                  }
+                  "type": "query",
+                  "qrCode": code
                 };
-                post("/data/fetchDataList/department", postData).then((res) => {
+                post("/dept/scanChangeDept", postData).then((res) => {
                   uni.hideLoading();
                   if (res.status == 200) {
-                    if (res.totalNum > 0) {
-                      this.currentStartDept = res.list[0];
+                    if (res.data) {
+                      if(res.data.deptDTO){
+                        this.currentStartDept = res.data.deptDTO;
+                      }else{
+                        this.currentStartDept = res.data;
+                      }
                       this.models3 = {
                         disjunctor: true,
                         title: "提示",

pages/scanning_ins/scanning_ins.vue

@@ -569,30 +569,28 @@
                 code = ress;
                 // 科室扫描
                 let postData = {
-                  "idx": 0,
-                  "sum": 1,
-                  "department": {
-                    "hospital": {
-                      "id": this.hosId
-                    },
-                    "qrcode": code
-                  }
+                  "type": "query",
+                  "qrCode": code
                 };
-                post("/data/fetchDataList/department", postData).then((res) => {
+                post("/dept/scanChangeDept", postData).then((res) => {
                   uni.hideLoading();
                   if (res.status == 200) {
-                    if (res.totalNum > 0) {
-                      this.currentStartDept = res.list[0];
-                      this.models3 = {
-                        disjunctor: true,
-                        title: "提示",
-                        content: `您选择的起点科室为【${this.currentStartDept.dept}】，您将从【${this.currentStartDept.dept}】把【${infoDATA.patientName}】送回【${infoDATA.department.dept}】，如您确认请点击“确认建单”。`,
-                        icon: "warn",
-                        operate: {
-                          ok: "确认建单",
-                          cancel: "取消",
-                        },
-                      };                      
+                    if (res.data) {
+                      if(res.data.deptDTO){
+                        this.currentStartDept = res.data.deptDTO;
+                      }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: "取消",
+                         },
+                       };                    
                     } else {
                       uni.hideLoading();
                       uni.showToast({