qx

qx

1 天以前 9a64e7bb407317603cdbd3529e2732c777042b7f

 src/views/doctor/check/index.vue

@@ -976,7 +976,7 @@
            });
          }
        });
      }else {
      } else {
        if (this.focusrow.proResult != this.focusrow.project.proDefault) {
          const substrings = ["正常", "未见异常", "阴性", "未见明显异常", "无"];
          let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
@@ -1093,7 +1093,7 @@
            });
          }
        });
      }else {
      } else {
        if (this.focusrow.proResult != this.focusrow.project.proDefault) {
          const substrings = ["正常", "未见异常", "阴性", "未见明显异常", "无"];
          let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
@@ -2041,36 +2041,87 @@
            // });
          });

          for (var i = 0; i < this.proParentList.sons.length; i++) {
            //判断新数组是否有这个元素值，没有的话，就把arr[i]给push到新数组newArr中
            if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
              this.radio = this.lastClickedTab.name
              this.$modal.msgError("请检查项目是否填写完成");
              this.minedis = true
              return
            } else if (this.proParentList.sons[i].proResult.includes(" ")) {
              this.$modal.msgError("请检查填写项目中是否有空格");
              this.radio = this.lastClickedTab.name
              this.minedis = true
              return
            } else {
              this.minedis = false
          // for (var i = 0; i < this.proParentList.sons.length; i++) {
          //   //判断新数组是否有这个元素值，没有的话，就把arr[i]给push到新数组newArr中
          //   if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
          //     this.radio = this.lastClickedTab.name
          //     this.$modal.msgError("请检查项目是否填写完成");
          //     this.minedis = true
          //     return
          //   } else if (this.proParentList.sons[i].proResult.includes(" ")) {
          //     this.$modal.msgError("请检查填写项目中是否有空格");
          //     this.radio = this.lastClickedTab.name
          //     this.minedis = true
          //     return
          //   } else {
          //     this.minedis = false
          //     this.tjOrderDetail.push({
          //       proAdvice: this.proParentList.sons[i].proAdvice,
          //       proName: this.proParentList.sons[i].project.proName,
          //       proId: this.proParentList.sons[i].project.proId,
          //       orderDetailId: this.proParentList.sons[i].orderDetailId,
          //       flowingWaterId: this.proParentList.sons[i].flowingWaterId,
          //       proResult: this.proParentList.sons[i].proResult,
          //       tjStatus: 1,
          //       isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
          //       exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
          //       conclusion: this.proParentList.sons[i].conclusion,
          //       rulesList: this.proParentList.sons[i].rulesList,
          //     });
          //   }
          // }
          for (const item of this.proParentList.sons) {
            const { project, proResult } = item;

            // 必填项验证
            if (project.proDefault) {
              console.log('必填项检查:', project.proDefault);

                if (!proResult || proResult.trim() === '') {
                this.$modal.msgError("请检查项目是否填写完成");
                this.minedis = true;
                return;
              } else if (proResult.includes(' ')) {
                this.$modal.msgError("请检查项目是否有空格");
                this.minedis = true;
                return;
              } else {
                this.minedis = false;
                this.tjOrderDetail.push({
                  proAdvice: item.proAdvice,
                  proName: project.proName,
                  proId: project.proId,
                  orderDetailId: item.orderDetailId,
                  flowingWaterId: item.flowingWaterId,
                  proResult: proResult,
                  tjStatus: 1,
                  isReturn: item.isReturn ? 1 : 0,
                  exceptionDesc: item.exceptionDesc ? 1 : 0,
                  conclusion: item.conclusion,
                  rulesList: item.rulesList
                });
              }
            }

            // 非必填项数据处理
            if (!project.proDefault) {
              console.log('非必填项处理:', this.tjOrderDetail);
              this.minedis = false;
              this.tjOrderDetail.push({
                proAdvice: this.proParentList.sons[i].proAdvice,
                proName: this.proParentList.sons[i].project.proName,
                proId: this.proParentList.sons[i].project.proId,
                orderDetailId: this.proParentList.sons[i].orderDetailId,
                flowingWaterId: this.proParentList.sons[i].flowingWaterId,
                proResult: this.proParentList.sons[i].proResult,
                proAdvice: item.proAdvice,
                proName: project.proName,
                proId: project.proId,
                orderDetailId: item.orderDetailId,
                flowingWaterId: item.flowingWaterId,
                proResult: proResult,
                tjStatus: 1,
                isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
                exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
                conclusion: this.proParentList.sons[i].conclusion,
                rulesList: this.proParentList.sons[i].rulesList,
                isReturn: item.isReturn ? 1 : 0,
                exceptionDesc: item.exceptionDesc ? 1 : 0,
                conclusion: item.conclusion,
                rulesList: item.rulesList
              });
            }
          }

          if (this.minedis == false) {
            var data = [{
              tjNumber,
@@ -2097,6 +2148,7 @@
          this.nums = tab.name;
          this.proId = tab.name;
          this.lastClickedTab = tab
          this.minedis = false
          this.getParentIdsss();
          this.getbzlist();
        });
@@ -2128,30 +2180,81 @@
        //   rulesList: item.rulesList,
        // });
      });
      for (var i = 0; i < this.proParentList.sons.length; i++) {
        //判断新数组是否有这个元素值，没有的话，就把arr[i]给push到新数组newArr中
        if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
          this.$modal.msgError("请检查项目是否填写完成");
          this.minedis = true
          return
        } else if (this.proParentList.sons[i].proResult.includes(" ")) {
          this.$modal.msgError("请检查填写项目中是否有空格");
          this.minedis = true
          return
        } else {
          this.minedis = false
      // for (var i = 0; i < this.proParentList.sons.length; i++) {
      //   //判断新数组是否有这个元素值，没有的话，就把arr[i]给push到新数组newArr中
      //   if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) {
      //     this.$modal.msgError("请检查项目是否填写完成");
      //     this.minedis = true
      //     return
      //   } else if (this.proParentList.sons[i].proResult.includes(" ")) {
      //     this.$modal.msgError("请检查填写项目中是否有空格");
      //     this.minedis = true
      //     return
      //   } else {
      //     this.minedis = false
      //     this.tjOrderDetail.push({
      //       proAdvice: this.proParentList.sons[i].proAdvice,
      //       proName: this.proParentList.sons[i].project.proName,
      //       proId: this.proParentList.sons[i].project.proId,
      //       orderDetailId: this.proParentList.sons[i].orderDetailId,
      //       flowingWaterId: this.proParentList.sons[i].flowingWaterId,
      //       proResult: this.proParentList.sons[i].proResult,
      //       tjStatus: 1,
      //       isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
      //       exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
      //       conclusion: this.proParentList.sons[i].conclusion,
      //       rulesList: this.proParentList.sons[i].rulesList,
      //     });
      //   }
      // }
      for (const item of this.proParentList.sons) {
        const { project, proResult } = item;

        // 必填项验证
        if (project.proDefault) {
          console.log('必填项检查:', project.proDefault);
          if (!proResult || proResult.trim() === '') {
            this.$modal.msgError("请检查项目是否填写完成");
            this.minedis = true;
            return;
          } else if (proResult.includes(' ')) {
            this.$modal.msgError("请检查项目是否有空格");
            this.minedis = true;
            return;
          } else {
            this.minedis = false;
            this.tjOrderDetail.push({
              proAdvice: item.proAdvice,
              proName: project.proName,
              proId: project.proId,
              orderDetailId: item.orderDetailId,
              flowingWaterId: item.flowingWaterId,
              proResult: proResult,
              tjStatus: 1,
              isReturn: item.isReturn ? 1 : 0,
              exceptionDesc: item.exceptionDesc ? 1 : 0,
              conclusion: item.conclusion,
              rulesList: item.rulesList
            });
          }
        }

        // 非必填项数据处理
        if (!project.proDefault) {
          console.log('非必填项处理:', this.tjOrderDetail);
          this.minedis = false;
          this.tjOrderDetail.push({
            proAdvice: this.proParentList.sons[i].proAdvice,
            proName: this.proParentList.sons[i].project.proName,
            proId: this.proParentList.sons[i].project.proId,
            orderDetailId: this.proParentList.sons[i].orderDetailId,
            flowingWaterId: this.proParentList.sons[i].flowingWaterId,
            proResult: this.proParentList.sons[i].proResult,
            proAdvice: item.proAdvice,
            proName: project.proName,
            proId: project.proId,
            orderDetailId: item.orderDetailId,
            flowingWaterId: item.flowingWaterId,
            proResult: proResult,
            tjStatus: 1,
            isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
            exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
            conclusion: this.proParentList.sons[i].conclusion,
            rulesList: this.proParentList.sons[i].rulesList,
            isReturn: item.isReturn ? 1 : 0,
            exceptionDesc: item.exceptionDesc ? 1 : 0,
            conclusion: item.conclusion,
            rulesList: item.rulesList
          });
        }
      }