Browse Source

标本优化

seimin 5 months ago
parent
commit
301db8cc2a
3 changed files with 319 additions and 62 deletions
  1. 254 41
      pages/scanning_B/scanning_B.vue
  2. 59 21
      pages/specimenCheckingDetail/specimenCheckingDetail.vue
  3. 6 0
      readme.md

File diff suppressed because it is too large
+ 254 - 41
pages/scanning_B/scanning_B.vue


+ 59 - 21
pages/specimenCheckingDetail/specimenCheckingDetail.vue

@@ -249,36 +249,74 @@
249 249
         console.log(data);
250 250
         this.backParams = data;
251 251
         this.hosModels.disjunctor = false;
252
-        let postData = {
253
-          idx: 0,
254
-          sum: 1,
255
-          hospitalConfig: {
256
-            hosId: uni.getStorageSync("userData").user.currentHospital.id,
257
-            key: "returnSpecimenWhetherHandover",
258
-          },
259
-        };
252
+        // ====================================
260 253
         uni.showLoading({
261 254
           title: "加载中",
262 255
           mask: true,
263 256
         });
264
-        post("/simple/data/fetchDataList/hospitalConfig", postData).then(
265
-          (result) => {
266
-            uni.hideLoading();
267
-            if (result.status == 200) {
268
-              if (result.list[0].value == 1 && this.backParams.reasonForReturn.extra1 == 1) {
269
-                this.backCancel();
270
-                this.showSelectAccount();
271
-              } else {
272
-                this.backHandler(this.backSpecimen, this.workOrderId);
273
-              }
274
-            } else {
257
+        const userData = uni.getStorageSync("userData");
258
+        // 查询标本配送业务
259
+        post("/simple/data/fetchDataList/taskType",{
260
+            "idx": 0,
261
+            "sum": 10,
262
+            "taskType": {
263
+                "simpleQuery": true,
264
+                "hosId": {
265
+                    "id": userData.user.currentHospital.id
266
+                },
267
+                "associationType": {
268
+                    "key": "association_types",
269
+                    "value": "specimen"
270
+                }
271
+            }
272
+        }).then((res) => {
273
+          if (res.status == 200) {
274
+            let taskTypeDTO = res.list[0];
275
+        		if(taskTypeDTO){
276
+              // 查询业务页面控制-标本
277
+              post("/simple/data/fetchDataList/taskTypeConfig",{
278
+                  "idx": 0,
279
+                  "sum": 10,
280
+                  "taskTypeConfig": {
281
+                    taskTypeDTO,
282
+                  }
283
+              }).then((res) => {
284
+                uni.hideLoading();
285
+                if (res.status == 200) {
286
+                  let data = res.list[0];
287
+              		if(data){
288
+                    if (data.returnSpecimenWhetherHandover == 1 && this.backParams.reasonForReturn.extra1 == 1) {
289
+                      this.backCancel();
290
+                      this.showSelectAccount();
291
+                    } else {
292
+                      this.backHandler(this.backSpecimen, this.workOrderId);
293
+                    }
294
+                  }else{
295
+                    this.backHandler(this.backSpecimen, this.workOrderId);
296
+                  }
297
+                } else {
298
+                  uni.showToast({
299
+                    icon: "none",
300
+                    title: res.msg || "接口获取数据失败!",
301
+                  });
302
+                }
303
+              });
304
+            }else{
305
+              uni.hideLoading();
275 306
               uni.showToast({
276 307
                 icon: "none",
277
-                title: result.msg || "接口获取数据失败!",
308
+                title: "未查询到标本配送业务!",
278 309
               });
279 310
             }
311
+          } else {
312
+            uni.hideLoading();
313
+            uni.showToast({
314
+              icon: "none",
315
+              title: res.msg || "接口获取数据失败!",
316
+            });
280 317
           }
281
-        );
318
+        });
319
+        // ====================================
282 320
       },
283 321
       // 退回-取消
284 322
       backCancel() {

+ 6 - 0
readme.md

@@ -1,2 +1,8 @@
1
+# 目录清理
2
+- 新血制品 newBlood
3
+- 医疗废物 medicalWaste
4
+- 门诊 outpatient
5
+- 被服洗涤 quiltWashing
6
+
1 7
 # 宜昌中心医院有二级目录,打包的时候需要修改配置
2 8
 - manifest.json文件需要修改h5.router.base,代码已注释