ui

src/components/follow/AsbitemCriticalValue.vue

@@ -22,9 +22,14 @@
         </el-table-column>
         <el-table-column prop="criticalRangeValue" label="危急值范围" />
         <el-table-column prop="isCriticalValue" label="危急值标志">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.isCriticalValue" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.isCriticalValue"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column
           prop="criticalValueContent"
@@ -32,19 +37,34 @@
           width="150"
         />
         <el-table-column prop="isCriticalValueAudit" label="危急值审核">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.isCriticalValueAudit" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.isCriticalValueAudit"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column prop="isReview" label="复查">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.isReview" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.isReview"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column prop="isFollowUp" label="随访标志">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.isFollowUp" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.isFollowUp"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column prop="itemName" label="项目"> </el-table-column>
         <el-table-column prop="itemResult" label="项目结果"> </el-table-column>
@@ -54,9 +74,14 @@
         <el-table-column prop="itemCriticalRangeValue" label="危急值范围">
         </el-table-column>
         <el-table-column prop="itemIsCriticalValue" label="危急值标志">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.itemIsCriticalValue" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.itemIsCriticalValue"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column
           prop="itemCriticalValueContent"
@@ -65,19 +90,34 @@
         >
         </el-table-column>
         <el-table-column prop="itemIsCriticalValueAudit" label="危急值审核">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.itemIsCriticalValueAudit" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.itemIsCriticalValueAudit"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column prop="itemIsReview" label="复查">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.itemIsReview" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.itemIsReview"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
         <el-table-column prop="itemIsFollowUp" label="随访标志">
-            <template slot-scope="scope">
-                <el-checkbox v-model="scope.row.itemIsFollowUp" disabled true-label="Y" false-label="N"></el-checkbox>
-            </template>
+          <template slot-scope="scope">
+            <el-checkbox
+              v-model="scope.row.itemIsFollowUp"
+              disabled
+              true-label="Y"
+              false-label="N"
+            ></el-checkbox>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -102,59 +142,63 @@ export default {
     dddw,
     moment,
     getLists() {
-      postapi(
-        "/api/app/PhoneFollowUp/GetAsbitemOrItemCriticalByPatientRegisterId",
-        {
-          patientRegisterId:
-            this.dataTransOpts.tableS.patient_register.patientRegisterId,
+      if (this.dataTransOpts.tableS.patient_register.patientRegisterId) {
+        postapi(
+          "/api/app/PhoneFollowUp/GetAsbitemOrItemCriticalByPatientRegisterId",
+          {
+            patientRegisterId:
+              this.dataTransOpts.tableS.patient_register.patientRegisterId,
+          }
+        ).then((res) => {
+          if (res.code > -1) this.asbitemCriticalValue = res.data;
+        });
+      }else{
+        this.asbitemCriticalValue=[]
+      }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (
+        //if条件判断的是合并那一竖列
+        columnIndex == 0 ||
+        columnIndex == 1 ||
+        columnIndex == 2 ||
+        columnIndex == 3 ||
+        columnIndex == 4 ||
+        columnIndex == 5 ||
+        columnIndex == 6 ||
+        columnIndex == 7
+      ) {
+        const _row = this.flitterData2(this.asbitemCriticalValue).one[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col,
+        };
+      }
+    },
+    flitterData2(arr) {
+      let spanOneArr = [];
+      let concatOne = 0;
+      arr.forEach((item, index) => {
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //name 修改
+          if (item.registerCheckId === arr[index - 1].registerCheckId) {
+            //pid就是判断相同的字段
+            //第一列需合并相同内容的判断条件
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          }
         }
-      ).then((res) => {
-        if (res.code > -1) this.asbitemCriticalValue = res.data;
       });
-    },
-      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    if (
-      //if条件判断的是合并那一竖列
-      columnIndex == 0 ||
-      columnIndex == 1 ||
-      columnIndex == 2 ||
-      columnIndex == 3 ||
-      columnIndex == 4 ||
-      columnIndex == 5 ||
-      columnIndex == 6 ||
-      columnIndex == 7
-    ) {
-      const _row = this.flitterData2(this.asbitemCriticalValue).one[rowIndex];
-      const _col = _row > 0 ? 1 : 0;
       return {
-        rowspan: _row,
-        colspan: _col,
+        one: spanOneArr,
       };
-    }
-  },
-  flitterData2(arr) {
-    let spanOneArr = [];
-    let concatOne = 0;
-    arr.forEach((item, index) => {
-      if (index === 0) {
-        spanOneArr.push(1);
-      } else {
-        //name 修改
-        if (item.registerCheckId === arr[index - 1].registerCheckId) {
-          //pid就是判断相同的字段
-          //第一列需合并相同内容的判断条件
-          spanOneArr[concatOne] += 1;
-          spanOneArr.push(0);
-        } else {
-          spanOneArr.push(1);
-          concatOne = index;
-        }
-      }
-    });
-    return {
-      one: spanOneArr,
-    };
-  },
+    },
   },
   updated() {
     this.$nextTick(() => {
@@ -179,8 +223,8 @@ export default {
 
 <style scoped>
 @import "../../assets/css/global.css";
-::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{
-    background-color: #409EFF;
-    border-color: #409EFF;
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
+  background-color: #409eff;
+  border-color: #409eff;
 }
 </style>

src/components/follow/FollowList.vue

@@ -81,6 +81,14 @@
             <el-table-column prop="mobileTelephone" label="手机号" />
             <el-table-column prop="customerOrgName" label="单位" />
             <el-table-column prop="customerOrgParentName" label="父级单位" />
+            <el-table-column
+              v-for="(item, index) in columnData"
+              :key="index"
+              :prop="item"
+              :label="item"
+              align="left"
+            >
+            </el-table-column>
           </el-table>
           <div style="display: flex; justify-content: space-between">
             <div></div>
@@ -299,6 +307,7 @@ export default {
         },
       },
       LocalConfigInit: {},
+      columnData:[]
     };
   },
 
@@ -729,12 +738,13 @@ export default {
     async Query() {
       // 查询时，清掉明细数据 （滚动时不清）
       this.dataTransOpts.tableS.patient_register.followUpId = "";
+      this.dataTransOpts.tableS.patient_register.patientRegisterId=""
       this.tableDataCurrentRow = {}; // 清除选择
       this.tableData = [];
 
-      // setTimeout(() => {
-      //   this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
-      // }, 10);
+      setTimeout(() => {
+        this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
+      }, 10);
 
       this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit);
       await this.getPrList();
@@ -841,31 +851,21 @@ export default {
         body
       ).then((res) => {
         if (res.code > -1) {
-          let curLoad = res.data;
-          // let oldCount = 0
-          // 处理分组/套餐 排序混乱的问题
-          // curLoad.forEach((e) => {
-          //   if (e.customerOrgId == this.dict.personOrgId) {
-          //     e.groupPack = e.medicalPackageId;
-          //   } else {
-          //     e.groupPack = e.customerOrgGroupId;
-          //   }
-          // });
-
-          if (body.skipCount == 0) {
-            //查询
-            this.tableData = [];
+          let that = this;
+          for(let i=0;i<res.data.length;i++){
+            for(let k = 0; k <res.data[i].phoneFollowUpDetail.length;k++){
+              that.columnData.push("第"+[k+1]+"次"+"随访内容")
+              that.columnData.push("第"+[k+1]+"次"+"回复内容")
+              that.columnData.push("第"+[k+1]+"次"+"随访日期")
+              that.columnData.push("第"+[k+1]+"次"+"随访完成")
+              this.$set(res.data[i],"第"+[k+1]+"次"+"随访内容",res.data[i].phoneFollowUpDetail[k].followUpContent)
+              this.$set(res.data[i],"第"+[k+1]+"次"+"回复内容",res.data[i].phoneFollowUpDetail[k].replyContent)
+              this.$set(res.data[i],"第"+[k+1]+"次"+"随访日期",res.data[i].phoneFollowUpDetail[k].planFollowDate)
+              this.$set(res.data[i],"第"+[k+1]+"次"+"随访完成",res.data[i].phoneFollowUpDetail[k].isComplete)
+            }
           }
-
-          this.tableData = this.tableData.concat(curLoad);
-          // else {
-          //   // 懒加载 ,原数据集不用清空
-          //   oldCount = this.tableData.length
-          // }
-          // curLoad.forEach((e, index) => {
-          //   this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
-          // })
-
+          that.columnData = Array.from(new Set(that.columnData));
+          this.tableData=res.data
           //如果 有选中 记录，则刷新其对应的组合项目
           if (this.dataTransOpts.tableS.patient_register.id) {
             this.dataTransOpts.refresh.register_check_asbitem.M++;

src/components/follow/PhoneFollowUp.vue

@@ -329,11 +329,15 @@ export default {
       });
     },
     getLists() {
-      postapi("/api/app/PhoneFollowUp/GetList", {
+      if(this.dataTransOpts.tableS.patient_register.followUpId){
+              postapi("/api/app/PhoneFollowUp/GetList", {
         followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
       }).then((res) => {
         if (res.code > -1) this.phoneFollowUp = res.data;
       });
+      }else{
+        this.phoneFollowUp=[]
+      }
     },
     addoredit() {
       if (this.title == 1) {

src/components/follow/SmsSend.vue

@@ -241,11 +241,15 @@ export default {
       });
     },
     getLists() {
-      postapi("/api/app/SmsSend/GetList", {
+      if(this.dataTransOpts.tableS.patient_register.followUpId){
+              postapi("/api/app/SmsSend/GetList", {
         followUpId: this.dataTransOpts.tableS.patient_register.followUpId,
       }).then((res) => {
         if (res.code > -1) this.phoneFollowUp = res.data;
       });
+      }else{
+        this.phoneFollowUp=[]
+      }
     },
     rowick(row) {
       this.curRow = { ...row };

src/views/customerReport/detailedIitems.vue

@@ -434,7 +434,7 @@ page-break-before: avoid;}}`, // 去除页眉页脚
       if (this.project.dataAsbitemOCX.length > 0) {
         this.project.dataAsbitemOCX.forEach((e) => {
           asbitemIds.push(e.id);
-          this.columnData.push(e.displayName)
+          // this.columnData.push(e.displayName)
         });
       }
 
@@ -454,8 +454,10 @@ page-break-before: avoid;}}`, // 去除页眉页脚
             for(let i=0;i<res.data.length;i++){
             for(let k=0;k<res.data[i].registerCheckItems.length;k++){
               this.$set(res.data[i],res.data[i].registerCheckItems[k].itemName,res.data[i].registerCheckItems[k].result)
+              this.columnData.push(res.data[i].registerCheckItems[k].itemName)
             }
           }
+          this.columnData = Array.from(new Set(this.columnData));
           this.dataList=[...res.data]
           this.$nextTick(() => {
           this.$refs.dataList.doLayout();
@@ -471,8 +473,10 @@ page-break-before: avoid;}}`, // 去除页眉页脚
             for(let i=0;i<res.data.length;i++){
             for(let k=0;k<res.data[i].registerCheckItems.length;k++){
               this.$set(res.data[i],res.data[i].registerCheckItems[k].itemName,res.data[i].registerCheckItems[k].result)
+              this.columnData.push(res.data[i].registerCheckItems[k].itemName)
             }
           }
+          this.columnData = Array.from(new Set(this.columnData));
           this.dataLists=[...res.data]
           this.$nextTick(() => {
           this.$refs.dataLists.doLayout();