口头、延迟修改

src/views/platform/bpmn/report/delayReport.vue

@@ -88,51 +88,58 @@
                 </div>
                 <div style="width: 90%;margin: 1% auto;">
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">科室/病区:</van-col>
+                        <van-col span="10" class="leftPopups">申请科室:</van-col>
                         <van-col span="14">{{ oralPopup.bing_qu_==''?'/':oralPopup.bing_qu_==null?'/':oralPopup.bing_qu_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">接收者:</van-col>
+                        <van-col span="10" class="leftPopups">病理号:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.jieshouzhe==''?'/':oralPopup.jieshouzhe==null?'/':oralPopup.jieshouzhe }}</van-col>
+                        >{{ oralPopup.xing_ming_==''?'/':oralPopup.xing_ming_==null?'/':oralPopup.xing_ming_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">病员姓名:</van-col>
+                        <van-col span="10" class="leftPopups">检查类型:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.xing_ming_==''?'/':oralPopup.xing_ming_==null?'/':oralPopup.xing_ming_ }}</van-col>
+                        >{{ oralPopup.jian_cha_lei_xing==''?'/':oralPopup.jian_cha_lei_xing==null?'/':oralPopup.jian_cha_lei_xing }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">审核人:</van-col>
+                        <van-col span="10" class="leftPopups">报告类型:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.shenheren==''?'/':oralPopup.shenheren==null?'/':oralPopup.shenheren }}</van-col>
+                        >{{ oralPopup.bao_gao_lei_xing_==''?'/':oralPopup.bao_gao_lei_xing_==null?'/':oralPopup.bao_gao_lei_xing_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">样品号:</van-col>
+                        <van-col span="10" class="leftPopups">标本类型:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.yang_pin_hao_==''?'/':oralPopup.yang_pin_hao_==null?'/':oralPopup.yang_pin_hao_ }}</van-col>
+                        >{{ oralPopup.biao_ben_lei_xing==''?'/':oralPopup.biao_ben_lei_xing==null?'/':oralPopup.biao_ben_lei_xing }}</van-col>
                     </van-row>
+                    <!-- <van-row class="showPopups">
+                        <van-col span="10" class="leftPopups">审核人:</van-col>
+                        <van-col
+                            span="14"
+                        >{{ oralPopup.shenheren==''?'/':oralPopup.shenheren==null?'/':oralPopup.shenheren }}</van-col>
+                    </van-row> -->
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">编制部门:</van-col>
+                        <van-col span="10" class="leftPopups">报告日期:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.bianzhibumen==''?'/':oralPopup.bianzhibumen==null?'/':oralPopup.bianzhibumen }}</van-col>
+                        >{{ oralPopup.tong_zhi_shi_==''?'/':oralPopup.tong_zhi_shi_==null?'/':oralPopup.tong_zhi_shi_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">检验项目:</van-col>
+                        <van-col span="10" class="leftPopups">报告医师:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.xiang_mu_==''?'/':oralPopup.xiang_mu_==null?'/':oralPopup.xiang_mu_ }}</van-col>
+                        >{{ oralPopup.bao_gao_zhe_==''?'/':oralPopup.bao_gao_zhe_==null?'/':oralPopup.bao_gao_zhe_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">编制人员:</van-col>
+                        <van-col span="10" class="leftPopups">通知方式:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.bianzhiren==''?'/':oralPopup.bianzhiren==null?'/':oralPopup.bianzhiren }}</van-col>
+                        >{{ oralPopup.tong_zhi_fang_shi==''?'/':oralPopup.tong_zhi_fang_shi==null?'/':oralPopup.tong_zhi_fang_shi }}</van-col>
                     </van-row>
+
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">延迟原因:</van-col>
                         <van-col span="14">
@@ -142,7 +149,20 @@
                         </van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">编制日期:</van-col>
+                        <van-col span="10" class="leftPopups">编制部门:</van-col>
+                        <van-col
+                            span="14"
+                        >{{ oralPopup.bianzhibumen==''?'/':oralPopup.bianzhibumen==null?'/':oralPopup.bianzhibumen }}</van-col>
+                    </van-row>
+                    <van-row class="showPopups">
+                        <van-col span="10" class="leftPopups">报告者:</van-col>
+                        <van-col
+                            span="14"
+                        >{{ oralPopup.bianzhiren==''?'/':oralPopup.bianzhiren==null?'/':oralPopup.bianzhiren }}</van-col>
+                    </van-row>
+
+                    <van-row class="showPopups">
+                        <van-col span="10" class="leftPopups">登记日期:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.bian_zhi_shi_jian==''?'/':oralPopup.bian_zhi_shi_jian==null?'/':oralPopup.bian_zhi_shi_jian }}</van-col>
@@ -200,289 +220,289 @@ import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
 
 export default {
-    components: {
-        IbpsMoreSearch,
-        IbpsTypeTree,
-        IbpsAvatar,
-        IbpsToolbar,
-        IbpsListResultPage,
-        IbpsBpmnFormrenderDialog
-    },
-    mixins: [random, bpmnStatus],
-    data() {
-        return {
-            footText: false,
-            noData: false,
-            oralPopup: '',
-            ReachBottomShow: false,
-            stateActive: false,
-            moreSearchPopup: false,
-            typeTreePopup: false,
-            searchForms: {
-                forms: [
-                    { prop: 'Q^subject_^SL', label: '事务名称', fieldType: 'text' },
-                    // { prop: 'Q^proc_def_name_^SL', label: '事务说明', fieldType: 'text' },
-                    { prop: 'Q^inst.subject_^SL', label: '事务说明', fieldType: 'text' },
-                    { prop: ['Q^create_time_^DL', 'Q^create_time_^DG'], label: '创建时间', fieldType: 'dateRange', options: { datefmt: 'yyyy-MM-dd' }}
-                ]
-            },
+  components: {
+    IbpsMoreSearch,
+    IbpsTypeTree,
+    IbpsAvatar,
+    IbpsToolbar,
+    IbpsListResultPage,
+    IbpsBpmnFormrenderDialog
+  },
+  mixins: [random, bpmnStatus],
+  data() {
+    return {
+      footText: false,
+      noData: false,
+      oralPopup: '',
+      ReachBottomShow: false,
+      stateActive: false,
+      moreSearchPopup: false,
+      typeTreePopup: false,
+      searchForms: {
+        forms: [
+          { prop: 'Q^subject_^SL', label: '事务名称', fieldType: 'text' },
+          // { prop: 'Q^proc_def_name_^SL', label: '事务说明', fieldType: 'text' },
+          { prop: 'Q^inst.subject_^SL', label: '事务说明', fieldType: 'text' },
+          { prop: ['Q^create_time_^DL', 'Q^create_time_^DG'], label: '创建时间', fieldType: 'dateRange', options: { datefmt: 'yyyy-MM-dd' }}
+        ]
+      },
 
-            subject: '',
-            typeId: '',
-            moreParams: {},
+      subject: '',
+      typeId: '',
+      moreParams: {},
 
-            listData: [],
-            pagination: {},
-            sorts: {},
+      listData: [],
+      pagination: {},
+      sorts: {},
 
-            loading: false,
-            finished: false,
-            refreshing: false,
-            resultType: 'init',
-            errorType: null,
-            resultMessage: null,
+      loading: false,
+      finished: false,
+      refreshing: false,
+      resultType: 'init',
+      errorType: null,
+      resultMessage: null,
 
-            checkMode: false,
-            checkedIds: [],
-            mainActions: [{
-                'name': this.$t('common.button.remove'),
-                'type': 'danger',
-                'callback': this.onRemove
-            }],
+      checkMode: false,
+      checkedIds: [],
+      mainActions: [{
+        'name': this.$t('common.button.remove'),
+        'type': 'danger',
+        'callback': this.onRemove
+      }],
 
-            proInstId: '',
-            defId: '',
-            formrenderVisible: false,
-            formrenderTitle: '',
-            current: 0
-        }
-    },
+      proInstId: '',
+      defId: '',
+      formrenderVisible: false,
+      formrenderTitle: '',
+      current: 0
+    }
+  },
 
-    computed: {
-        ...mapState('ibps/user', [
-            'info'
-        ]),
-        rightText() {
-            return this.checkMode ? this.$t('common.button.cancel') : this.$t('common.button.manage')
-        },
-        selectedIds() {
-            return this.checkedIds.join(',')
-        }
+  computed: {
+    ...mapState('ibps/user', [
+      'info'
+    ]),
+    rightText() {
+      return this.checkMode ? this.$t('common.button.cancel') : this.$t('common.button.manage')
+    },
+    selectedIds() {
+      return this.checkedIds.join(',')
+    }
+  },
+  methods: {
+    generateTitle(name, title) { // generateTitle by vue-i18n
+      return i18n.generateTitle(name, title)
     },
-    methods: {
-        generateTitle(name, title) { // generateTitle by vue-i18n
-            return i18n.generateTitle(name, title)
-        },
-        /**
+    /**
        * 加载数据
        *
       */
-        async loadData() {
-            this.loading = true
-            this.noData = false
-            this.footText = false
-            await this.getPositionobj()
-            let page = 0
-            if (this.current === 0) {
-                page = 0
-            } else {
-                page = this.current * 10
-            }
-            const key = this.subject
-            const sql = `select t_ycbgjlb.*,(case t_ycbgjlb.fu_jian_ when '' then '空' else t_ycbgjlb.fu_jian_ END) as aa,g.bianzhibumen,g.bianzhiren,g.shenheren,g.jieshouzhe from t_ycbgjlb LEFT JOIN (select e.*,f.jieshouzhe from (select c.*,d.shenheren from (select a.*,b.bianzhiren from (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ycbgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN (select t.id_ ,u.NAME_ as bianzhiren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c LEFT JOIN (select t.id_ ,u.NAME_ as shenheren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.shen_he_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as d on c.id_ = d.id_) as e LEFT JOIN (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.jie_shou_zhe_)) as jieshouzhe from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.jie_shou_zhe_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as f on e.id_ = f.id_)as g on t_ycbgjlb.id_ =g.id_ where find_in_set(t_ycbgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ycbgjlb.yang_pin_hao_ like'%` + key + `%' ORDER BY t_ycbgjlb.create_time_ DESC LIMIT ${page},10`
-            this.$common.request('sql', sql).then(res => {
-                if (res.variables.data.length === 0) {
-                    if (this.current === 0) {
-                        this.noData = true
-                    } else {
-                        this.footText = true
-                    }
-                    this.finished = true
-                    this.loading = false
-                    this.refreshing = false
-                    return
-                }
-                this.listData.push(...res.variables.data)
-                // 判断是否还有更多数据
-                if ((this.listData.length) % 10 !== 0) {
-                    this.footText = true
-                    this.finished = true
-                } else {
-                    this.current++
-                }
+    async loadData() {
+      this.loading = true
+      this.noData = false
+      this.footText = false
+      await this.getPositionobj()
+      let page = 0
+      if (this.current === 0) {
+        page = 0
+      } else {
+        page = this.current * 10
+      }
+      const key = this.subject
+      const sql = `select t_ycbgjlb.*,(case t_ycbgjlb.fu_jian_ when '' then '空' else t_ycbgjlb.fu_jian_ END) as aa,g.bianzhibumen,g.bianzhiren,g.shenheren,g.jieshouzhe from t_ycbgjlb LEFT JOIN (select e.*,f.jieshouzhe from (select c.*,d.shenheren from (select a.*,b.bianzhiren from (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ycbgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN (select t.id_ ,u.NAME_ as bianzhiren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c LEFT JOIN (select t.id_ ,u.NAME_ as shenheren from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.shen_he_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as d on c.id_ = d.id_) as e LEFT JOIN (select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.jie_shou_zhe_)) as jieshouzhe from t_ycbgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.jie_shou_zhe_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as f on e.id_ = f.id_)as g on t_ycbgjlb.id_ =g.id_ where find_in_set(t_ycbgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ycbgjlb.yang_pin_hao_ like'%` + key + `%' ORDER BY t_ycbgjlb.create_time_ DESC LIMIT ${page},10`
+      this.$common.request('sql', sql).then(res => {
+        if (res.variables.data.length === 0) {
+          if (this.current === 0) {
+            this.noData = true
+          } else {
+            this.footText = true
+          }
+          this.finished = true
+          this.loading = false
+          this.refreshing = false
+          return
+        }
+        this.listData.push(...res.variables.data)
+        // 判断是否还有更多数据
+        if ((this.listData.length) % 10 !== 0) {
+          this.footText = true
+          this.finished = true
+        } else {
+          this.current++
+        }
 
-                this.loading = false
-                this.refreshing = false
-            })
-        },
-        // 获取positionobj数据
-        async getPositionobj() {
-            if (this.info && this.info.positions && this.info.positions.length > 0) {
-                let posiList = []
-                this.info.positions.forEach(item => {
-                    const obj = `${item.id}.`
-                    const objList = item.path.split(obj)
-                    objList.forEach(it => {
-                        posiList.push(it)
-                    })
-                })
-                const position = this.info.positions.map(item => {
-                    return item.id
-                })
-                let posiSql = ``
-                position.forEach((item, index) => {
-                    if (index === 0) {
-                        const obj = `path_ like '%${item}%'`
-                        posiSql += obj
-                    } else {
-                        const obj = `or path_ like '%${item}%'`
-                        posiSql += obj
-                    }
-                })
-                const sql = `select * from ibps_party_entity where party_type_ = 'position' and (${posiSql})`
-                await this.$common.request('sql', sql).then(res => {
-                    if (res.state === 200) {
-                        const data = res.variables.data
-                        if (data.length > 0) {
-                            data.forEach(item => {
-                                posiList.push(item.ID_)
-                            })
-                            // 数组去空值
-                            posiList = posiList.filter(item => item)
-                            // 部门上下级的id去重
-                            const positionSet = Array.from(new Set(posiList))
-                            this.positionObj = positionSet.join(',')
-                        } else {
-                            this.positionObj = ''
-                        }
-                    }
-                })
+        this.loading = false
+        this.refreshing = false
+      })
+    },
+    // 获取positionobj数据
+    async getPositionobj() {
+      if (this.info && this.info.positions && this.info.positions.length > 0) {
+        let posiList = []
+        this.info.positions.forEach(item => {
+          const obj = `${item.id}.`
+          const objList = item.path.split(obj)
+          objList.forEach(it => {
+            posiList.push(it)
+          })
+        })
+        const position = this.info.positions.map(item => {
+          return item.id
+        })
+        let posiSql = ``
+        position.forEach((item, index) => {
+          if (index === 0) {
+            const obj = `path_ like '%${item}%'`
+            posiSql += obj
+          } else {
+            const obj = `or path_ like '%${item}%'`
+            posiSql += obj
+          }
+        })
+        const sql = `select * from ibps_party_entity where party_type_ = 'position' and (${posiSql})`
+        await this.$common.request('sql', sql).then(res => {
+          if (res.state === 200) {
+            const data = res.variables.data
+            if (data.length > 0) {
+              data.forEach(item => {
+                posiList.push(item.ID_)
+              })
+              // 数组去空值
+              posiList = posiList.filter(item => item)
+              // 部门上下级的id去重
+              const positionSet = Array.from(new Set(posiList))
+              this.positionObj = positionSet.join(',')
             } else {
-                this.positionObj = ''
+              this.positionObj = ''
             }
-        },
-        /**
+          }
+        })
+      } else {
+        this.positionObj = ''
+      }
+    },
+    /**
        * 获取格式化参数
        */
-        getSearcFormData() {
-            let params = {}
-            if (this.$utils.isNotEmpty(this.subject)) {
-                params['Q^subject_^SL'] = this.subject
-            }
-            if (this.$utils.isNotEmpty(this.moreParams)) {
-                params = Object.assign(params, this.moreParams)
-            }
-            return ActionUtils.formatParams(
-                params,
-                this.pagination,
-                this.sorts)
-        },
-        /**
+    getSearcFormData() {
+      let params = {}
+      if (this.$utils.isNotEmpty(this.subject)) {
+        params['Q^subject_^SL'] = this.subject
+      }
+      if (this.$utils.isNotEmpty(this.moreParams)) {
+        params = Object.assign(params, this.moreParams)
+      }
+      return ActionUtils.formatParams(
+        params,
+        this.pagination,
+        this.sorts)
+    },
+    /**
        * 下拉刷新
        */
-        onRefresh() {
-            this.footText = false
-            this.refreshing = true
-            this.finished = false
-            this.loading = true
-            this.onSearch()
-        },
-        /**
+    onRefresh() {
+      this.footText = false
+      this.refreshing = true
+      this.finished = false
+      this.loading = true
+      this.onSearch()
+    },
+    /**
        * 查询
        */
-        onSearch() {
-            this.stateActive = false
-            ActionUtils.initListData(this)
-            this.loadData()
-        },
-        /**
+    onSearch() {
+      this.stateActive = false
+      ActionUtils.initListData(this)
+      this.loadData()
+    },
+    /**
        * 高级查询
        */
-        onMoreSearch(params) {
-            if (this.$utils.isNotEmpty(this.typeId)) {
-                params['Q^type_id_^SL'] = this.typeId
-            }
-            this.moreParams = params
-            this.onSearch()
-            if (this.$utils.isNotEmpty(params)) {
-                this.stateActive = true
-            }
-        },
-        /**
+    onMoreSearch(params) {
+      if (this.$utils.isNotEmpty(this.typeId)) {
+        params['Q^type_id_^SL'] = this.typeId
+      }
+      this.moreParams = params
+      this.onSearch()
+      if (this.$utils.isNotEmpty(params)) {
+        this.stateActive = true
+      }
+    },
+    /**
        * 弹窗更多查询条件
        */
-        clickMoreSearch() {
-            this.moreSearchPopup = true
-            this.stateActive = false
-        },
-        /**
+    clickMoreSearch() {
+      this.moreSearchPopup = true
+      this.stateActive = false
+    },
+    /**
        * 重置表单
        */
-        resetForm() {
-            this.typeId = ''
-        },
-        getTaskDesc(v) {
-            if (!v.includes('#')) {
-                return ''
-            }
-            return v.split('#')[1] || ''
-        },
-        // 点击左边显示
-        clickType() {
-            this.typeTreePopup = true
-        },
-        clickTypeNode(data) {
-            this.typeId = data.id
-            this.onMoreSearch({})
-        },
-        onClick(item, index) {
-            this.ReachBottomShow = true
-            this.oralPopup = item
-        },
-        onRefreshPage() {
-            this.checkedIds = []
-            this.checkMode = false
-            this.onRefresh()
-        },
-        toCheckMode() {
-            if (this.$utils.isEmpty(this.listData)) {
-                return
-            }
-            if (this.checkMode) {
-                // this.show = true
-                this.checkedIds = []
-            }
-            this.checkMode = !this.checkMode
-        },
-        onRemove() {
-            if (this.checkedIds.length === 0) {
-                this.$notify({
-                    type: 'warning',
-                    message: this.$t('common.dialog.selectedRecords')
-                })
-                return
-            }
-            this.$dialog.confirm({
-                title: this.$t('common.dialog.warn'),
-                message: this.$t('common.operate.makeSure')
-            }).then(() => {
-                removeDraft({ ids: this.selectedIds }).then(response => {
-                    this.$notify({
-                        type: 'success',
-                        message: '删除草稿成功！'
-                    })
-                    this.onRefreshPage()
-                }).catch((e) => {
-                    console.error(e)
-                })
-            })
-        },
-        onClose() {
-            this.ReachBottomShow = false
-        }
-
+    resetForm() {
+      this.typeId = ''
+    },
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
+    // 点击左边显示
+    clickType() {
+      this.typeTreePopup = true
+    },
+    clickTypeNode(data) {
+      this.typeId = data.id
+      this.onMoreSearch({})
+    },
+    onClick(item, index) {
+      this.ReachBottomShow = true
+      this.oralPopup = item
+    },
+    onRefreshPage() {
+      this.checkedIds = []
+      this.checkMode = false
+      this.onRefresh()
+    },
+    toCheckMode() {
+      if (this.$utils.isEmpty(this.listData)) {
+        return
+      }
+      if (this.checkMode) {
+        // this.show = true
+        this.checkedIds = []
+      }
+      this.checkMode = !this.checkMode
+    },
+    onRemove() {
+      if (this.checkedIds.length === 0) {
+        this.$notify({
+          type: 'warning',
+          message: this.$t('common.dialog.selectedRecords')
+        })
+        return
+      }
+      this.$dialog.confirm({
+        title: this.$t('common.dialog.warn'),
+        message: this.$t('common.operate.makeSure')
+      }).then(() => {
+        removeDraft({ ids: this.selectedIds }).then(response => {
+          this.$notify({
+            type: 'success',
+            message: '删除草稿成功！'
+          })
+          this.onRefreshPage()
+        }).catch((e) => {
+          console.error(e)
+        })
+      })
+    },
+    onClose() {
+      this.ReachBottomShow = false
     }
 
+  }
+
 }
 </script>
 <style lang="scss" scoped>

src/views/platform/bpmn/report/oralReport.vue

@@ -87,7 +87,7 @@
 
                 <div style="width: 90%;margin: 1% auto;">
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">病员姓名:</van-col>
+                        <van-col span="10" class="leftPopups">姓名:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.xing_ming_==''?'/':oralPopup.xing_ming_==null?'/':oralPopup.xing_ming_ }}</van-col>
@@ -103,17 +103,29 @@
                         <van-col span="14">{{ oralPopup.bing_qu_==''?'/':oralPopup.bing_qu_==null?'/':oralPopup.bing_qu_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">门诊/住院部:</van-col>
+                        <van-col span="10" class="leftPopups">登记号:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.zhu_yuan_hao_==''?'/':oralPopup.zhu_yuan_hao_==null?'/':oralPopup.zhu_yuan_hao_ }}</van-col>
+                        >{{ oralPopup.deng_ji_hao_==''?'/':oralPopup.deng_ji_hao_==null?'/':oralPopup.deng_ji_hao_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
+                        <van-col span="10" class="leftPopups">病理号:</van-col>
+                        <van-col
+                            span="14"
+                        >{{ oralPopup.bing_li_hao_==''?'/':oralPopup.bing_li_hao_==null?'/':oralPopup.bing_li_hao_ }}</van-col>
+                    </van-row>
+                    <!-- <van-row class="showPopups">
+                        <van-col span="10" class="leftPopups">门诊/住院部:</van-col>
+                        <van-col
+                            span="14"
+                        >{{ oralPopup.zhu_yuan_hao_==''?'/':oralPopup.zhu_yuan_hao_==null?'/':oralPopup.zhu_yuan_hao_ }}</van-col>
+                    </van-row> -->
+                    <!-- <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">床号:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.chuang_hao_==''?'/':oralPopup.chuang_hao_==null?'/':oralPopup.chuang_hao_ }}</van-col>
-                    </van-row>
+                    </van-row> -->
                     <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">接听者:</van-col>
                         <van-col
@@ -121,13 +133,13 @@
                         >{{ oralPopup.jie_ting_zhe_==''?'/':oralPopup.jie_ting_zhe_==null?'/':oralPopup.jie_ting_zhe_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">补发书面报告时间:</van-col>
+                        <van-col span="10" class="leftPopups">补发报告时间:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.bao_gao_shi_jian_==''?'/':oralPopup.bao_gao_shi_jian_==null?'/':oralPopup.bao_gao_shi_jian_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">补发书面报告编号:</van-col>
+                        <van-col span="10" class="leftPopups">补发报告编号:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.bao_gao_bian_hao_==''?'/':oralPopup.bao_gao_bian_hao_==null?'/':oralPopup.bao_gao_bian_hao_ }}</van-col>
@@ -146,7 +158,7 @@
                         >{{ oralPopup.jian_ce_jie_guo_==''?'/':oralPopup.jian_ce_jie_guo_==null?'/':oralPopup.jian_ce_jie_guo_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">复查结果:</van-col>
+                        <van-col span="10" class="leftPopups">复述结果:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.fu_cha_jie_guo_==''?'/':oralPopup.fu_cha_jie_guo_==null?'/':oralPopup.fu_cha_jie_guo_ }}</van-col>
@@ -164,7 +176,7 @@
                         >{{ oralPopup.shuo_ming_==''?'/':oralPopup.shuo_ming_==null?'/':oralPopup.shuo_ming_ }}</van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">编制人员:</van-col>
+                        <van-col span="10" class="leftPopups">报告人:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.bianzhiren==''?'/':oralPopup.bianzhiren==null?'/':oralPopup.bianzhiren }}</van-col>
@@ -190,7 +202,7 @@
                         </van-col>
                     </van-row>
                     <van-row class="showPopups">
-                        <van-col span="10" class="leftPopups">编制日期:</van-col>
+                        <van-col span="10" class="leftPopups">报告时间:</van-col>
                         <van-col
                             span="14"
                         >{{ oralPopup.bian_zhi_shi_jian==''?'/':oralPopup.bian_zhi_shi_jian==null?'/':oralPopup.bian_zhi_shi_jian }}</van-col>
@@ -225,322 +237,322 @@ import IbpsListResultPage from '@/components/ibps-list-result-page'
 import IbpsBpmnFormrenderDialog from '@/business/platform/bpmn/form/dialog'
 
 export default {
-    components: {
-        IbpsMoreSearch,
-        IbpsTypeTree,
-        IbpsAvatar,
-        IbpsToolbar,
-        IbpsListResultPage,
-        IbpsBpmnFormrenderDialog,
-        IbpsUploader
-    },
-    mixins: [random, bpmnStatus],
-    data() {
-        return {
-            id: '',
-            footText: false,
-            noData: false,
-            oralPopup: '',
-            ReachBottomShow: false,
-            stateActive: false,
-            moreSearchPopup: false,
-            typeTreePopup: false,
-            searchForms: {
-                forms: [
-                    { prop: 'Q^subject_^SL', label: '事务名称', fieldType: 'text' },
-                    // { prop: 'Q^proc_def_name_^SL', label: '事务说明', fieldType: 'text' },
-                    { prop: 'Q^inst.subject_^SL', label: '事务说明', fieldType: 'text' },
-                    { prop: ['Q^create_time_^DL', 'Q^create_time_^DG'], label: '创建时间', fieldType: 'dateRange', options: { datefmt: 'yyyy-MM-dd' }}
-                ]
-            },
+  components: {
+    IbpsMoreSearch,
+    IbpsTypeTree,
+    IbpsAvatar,
+    IbpsToolbar,
+    IbpsListResultPage,
+    IbpsBpmnFormrenderDialog,
+    IbpsUploader
+  },
+  mixins: [random, bpmnStatus],
+  data() {
+    return {
+      id: '',
+      footText: false,
+      noData: false,
+      oralPopup: '',
+      ReachBottomShow: false,
+      stateActive: false,
+      moreSearchPopup: false,
+      typeTreePopup: false,
+      searchForms: {
+        forms: [
+          { prop: 'Q^subject_^SL', label: '事务名称', fieldType: 'text' },
+          // { prop: 'Q^proc_def_name_^SL', label: '事务说明', fieldType: 'text' },
+          { prop: 'Q^inst.subject_^SL', label: '事务说明', fieldType: 'text' },
+          { prop: ['Q^create_time_^DL', 'Q^create_time_^DG'], label: '创建时间', fieldType: 'dateRange', options: { datefmt: 'yyyy-MM-dd' }}
+        ]
+      },
 
-            subject: '',
-            typeId: '',
-            moreParams: {},
+      subject: '',
+      typeId: '',
+      moreParams: {},
 
-            listData: [],
-            pagination: {},
-            sorts: {},
+      listData: [],
+      pagination: {},
+      sorts: {},
 
-            loading: false,
-            finished: false,
-            refreshing: false,
-            resultType: 'init',
-            errorType: null,
-            resultMessage: null,
+      loading: false,
+      finished: false,
+      refreshing: false,
+      resultType: 'init',
+      errorType: null,
+      resultMessage: null,
 
-            checkMode: false,
-            checkedIds: [],
-            mainActions: [{
-                'name': this.$t('common.button.remove'),
-                'type': 'danger',
-                'callback': this.onRemove
-            }],
+      checkMode: false,
+      checkedIds: [],
+      mainActions: [{
+        'name': this.$t('common.button.remove'),
+        'type': 'danger',
+        'callback': this.onRemove
+      }],
 
-            proInstId: '',
-            defId: '',
-            formrenderVisible: false,
-            formrenderTitle: '',
-            current: 0
-        }
-    },
+      proInstId: '',
+      defId: '',
+      formrenderVisible: false,
+      formrenderTitle: '',
+      current: 0
+    }
+  },
 
-    computed: {
-        ...mapState('ibps/user', [
-            'info'
-        ]),
-        rightText() {
-            return this.checkMode ? this.$t('common.button.cancel') : this.$t('common.button.manage')
-        },
-        selectedIds() {
-            return this.checkedIds.join(',')
-        }
+  computed: {
+    ...mapState('ibps/user', [
+      'info'
+    ]),
+    rightText() {
+      return this.checkMode ? this.$t('common.button.cancel') : this.$t('common.button.manage')
     },
-    methods: {
-        generateTitle(name, title) { // generateTitle by vue-i18n
-            return i18n.generateTitle(name, title)
-        },
-        /**
+    selectedIds() {
+      return this.checkedIds.join(',')
+    }
+  },
+  methods: {
+    generateTitle(name, title) { // generateTitle by vue-i18n
+      return i18n.generateTitle(name, title)
+    },
+    /**
        * 加载数据
        *
       */
-        async loadData() {
-            this.loading = true
-            this.noData = false
-            this.footText = false
-            await this.getPositionobj()
-            let page = 0
-            if (this.current === 0) {
-                page = 0
-            } else {
-                page = this.current * 10
-            }
-            const key = this.subject
-            const sql = `select t_ktbglcjgjlb.*,(case t_ktbglcjgjlb.fu_jian_ when '' then '空' else t_ktbglcjgjlb.fu_jian_ END) as aa,c.bianzhibumen,c.bianzhiren from t_ktbglcjgjlb LEFT JOIN (select a.*,b.bianzhiren from(select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ktbglcjgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN(select t.id_ ,u.NAME_ as bianzhiren from t_ktbglcjgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c on c.id_ =t_ktbglcjgjlb.id_ where find_in_set(t_ktbglcjgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ktbglcjgjlb.xing_ming_ like'%` + key + `%' ORDER BY  t_ktbglcjgjlb.create_time_ DESC LIMIT ${page},10`
-            this.$common.request('sql', sql).then(res => {
-                if (res.variables.data.length === 0) {
-                    if (this.current === 0) {
-                        this.noData = true
-                    } else {
-                        this.footText = true
-                    }
-                    this.finished = true
-                    this.loading = false
-                    this.refreshing = false
-                    return
-                }
+    async loadData() {
+      this.loading = true
+      this.noData = false
+      this.footText = false
+      await this.getPositionobj()
+      let page = 0
+      if (this.current === 0) {
+        page = 0
+      } else {
+        page = this.current * 10
+      }
+      const key = this.subject
+      const sql = `select t_ktbglcjgjlb.*,(case t_ktbglcjgjlb.fu_jian_ when '' then '空' else t_ktbglcjgjlb.fu_jian_ END) as aa,c.bianzhibumen,c.bianzhiren from t_ktbglcjgjlb LEFT JOIN (select a.*,b.bianzhiren from(select t.id_ ,group_concat(u.name_ order by find_in_set(u.id_,t.bian_zhi_bu_men_)) as bianzhibumen  from t_ktbglcjgjlb as t inner join ibps_party_position as u on find_in_set(u.id_,t.bian_zhi_bu_men_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as a LEFT JOIN(select t.id_ ,u.NAME_ as bianzhiren from t_ktbglcjgjlb as t inner join ibps_party_employee as u on find_in_set(u.id_,t.bian_zhi_ren_)>0 group by t.id_ ORDER BY  t.create_time_ DESC) as b on a.id_ = b.id_) as c on c.id_ =t_ktbglcjgjlb.id_ where find_in_set(t_ktbglcjgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ktbglcjgjlb.xing_ming_ like'%` + key + `%' ORDER BY  t_ktbglcjgjlb.create_time_ DESC LIMIT ${page},10`
+      this.$common.request('sql', sql).then(res => {
+        if (res.variables.data.length === 0) {
+          if (this.current === 0) {
+            this.noData = true
+          } else {
+            this.footText = true
+          }
+          this.finished = true
+          this.loading = false
+          this.refreshing = false
+          return
+        }
 
-                this.listData.push(...res.variables.data)
+        this.listData.push(...res.variables.data)
 
-                // 判断是否还有更多数据
-                if ((this.listData.length) % 10 !== 0) {
-                    this.footText = true
-                    this.finished = true
-                } else {
-                    this.current++
-                }
+        // 判断是否还有更多数据
+        if ((this.listData.length) % 10 !== 0) {
+          this.footText = true
+          this.finished = true
+        } else {
+          this.current++
+        }
 
-                this.loading = false
-                this.refreshing = false
-            })
-        },
-        // 获取positionobj数据
-        async getPositionobj() {
-            if (this.info && this.info.positions && this.info.positions.length > 0) {
-                let posiList = []
-                this.info.positions.forEach(item => {
-                    const obj = `${item.id}.`
-                    const objList = item.path.split(obj)
-                    objList.forEach(it => {
-                        posiList.push(it)
-                    })
-                })
-                const position = this.info.positions.map(item => {
-                    return item.id
-                })
-                let posiSql = ``
-                position.forEach((item, index) => {
-                    if (index === 0) {
-                        const obj = `path_ like '%${item}%'`
-                        posiSql += obj
-                    } else {
-                        const obj = `or path_ like '%${item}%'`
-                        posiSql += obj
-                    }
-                })
-                const sql = `select * from ibps_party_entity where party_type_ = 'position' and (${posiSql})`
-                await this.$common.request('sql', sql).then(res => {
-                    if (res.state === 200) {
-                        const data = res.variables.data
-                        if (data.length > 0) {
-                            data.forEach(item => {
-                                posiList.push(item.ID_)
-                            })
-                            // 数组去空值
-                            posiList = posiList.filter(item => item)
-                            // 部门上下级的id去重
-                            const positionSet = Array.from(new Set(posiList))
-                            this.positionObj = positionSet.join(',')
-                        } else {
-                            this.positionObj = ''
-                        }
-                    }
-                })
+        this.loading = false
+        this.refreshing = false
+      })
+    },
+    // 获取positionobj数据
+    async getPositionobj() {
+      if (this.info && this.info.positions && this.info.positions.length > 0) {
+        let posiList = []
+        this.info.positions.forEach(item => {
+          const obj = `${item.id}.`
+          const objList = item.path.split(obj)
+          objList.forEach(it => {
+            posiList.push(it)
+          })
+        })
+        const position = this.info.positions.map(item => {
+          return item.id
+        })
+        let posiSql = ``
+        position.forEach((item, index) => {
+          if (index === 0) {
+            const obj = `path_ like '%${item}%'`
+            posiSql += obj
+          } else {
+            const obj = `or path_ like '%${item}%'`
+            posiSql += obj
+          }
+        })
+        const sql = `select * from ibps_party_entity where party_type_ = 'position' and (${posiSql})`
+        await this.$common.request('sql', sql).then(res => {
+          if (res.state === 200) {
+            const data = res.variables.data
+            if (data.length > 0) {
+              data.forEach(item => {
+                posiList.push(item.ID_)
+              })
+              // 数组去空值
+              posiList = posiList.filter(item => item)
+              // 部门上下级的id去重
+              const positionSet = Array.from(new Set(posiList))
+              this.positionObj = positionSet.join(',')
             } else {
-                this.positionObj = ''
+              this.positionObj = ''
             }
-        },
-        /**
+          }
+        })
+      } else {
+        this.positionObj = ''
+      }
+    },
+    /**
        * 获取格式化参数
        */
-        getSearcFormData() {
-            let params = {}
-            if (this.$utils.isNotEmpty(this.subject)) {
-                params['Q^subject_^SL'] = this.subject
-            }
-            if (this.$utils.isNotEmpty(this.moreParams)) {
-                params = Object.assign(params, this.moreParams)
-            }
-            return ActionUtils.formatParams(
-                params,
-                this.pagination,
-                this.sorts)
-        },
-        /**
+    getSearcFormData() {
+      let params = {}
+      if (this.$utils.isNotEmpty(this.subject)) {
+        params['Q^subject_^SL'] = this.subject
+      }
+      if (this.$utils.isNotEmpty(this.moreParams)) {
+        params = Object.assign(params, this.moreParams)
+      }
+      return ActionUtils.formatParams(
+        params,
+        this.pagination,
+        this.sorts)
+    },
+    /**
        * 下拉刷新
        */
-        onRefresh() {
-            this.footText = false
-            this.refreshing = true
-            this.finished = false
-            this.loading = true
-            this.onSearch()
-        },
-        /**
+    onRefresh() {
+      this.footText = false
+      this.refreshing = true
+      this.finished = false
+      this.loading = true
+      this.onSearch()
+    },
+    /**
        * 查询
        */
-        onSearch() {
-            this.stateActive = false
-            ActionUtils.initListData(this)
-            this.loadData()
-        },
-        /**
+    onSearch() {
+      this.stateActive = false
+      ActionUtils.initListData(this)
+      this.loadData()
+    },
+    /**
        * 高级查询
        */
-        onMoreSearch(params) {
-            if (this.$utils.isNotEmpty(this.typeId)) {
-                params['Q^type_id_^SL'] = this.typeId
-            }
-            this.moreParams = params
-            this.onSearch()
-            if (this.$utils.isNotEmpty(params)) {
-                this.stateActive = true
-            }
-        },
-        /**
+    onMoreSearch(params) {
+      if (this.$utils.isNotEmpty(this.typeId)) {
+        params['Q^type_id_^SL'] = this.typeId
+      }
+      this.moreParams = params
+      this.onSearch()
+      if (this.$utils.isNotEmpty(params)) {
+        this.stateActive = true
+      }
+    },
+    /**
        * 弹窗更多查询条件
        */
-        clickMoreSearch() {
-            this.moreSearchPopup = true
-            this.stateActive = false
-        },
-        /**
+    clickMoreSearch() {
+      this.moreSearchPopup = true
+      this.stateActive = false
+    },
+    /**
        * 重置表单
        */
-        resetForm() {
-            this.typeId = ''
-        },
-        getTaskDesc(v) {
-            if (!v.includes('#')) {
-                return ''
-            }
-            return v.split('#')[1] || ''
-        },
-        // 点击左边显示
-        clickType() {
-            this.typeTreePopup = true
-        },
-        clickTypeNode(data) {
-            this.typeId = data.id
-            this.onMoreSearch({})
-        },
-        onClick(item, index) {
-            this.id = item.id_
-            this.ReachBottomShow = true
-            this.oralPopup = item
-        },
-        onRefreshPage() {
-            this.checkedIds = []
-            this.checkMode = false
-            this.onRefresh()
-        },
-        toCheckMode() {
-            if (this.$utils.isEmpty(this.listData)) {
-                return
-            }
-            if (this.checkMode) {
-                // this.show = true
-                this.checkedIds = []
-            }
-            this.checkMode = !this.checkMode
-        },
-        onRemove() {
-            if (this.checkedIds.length === 0) {
-                this.$notify({
-                    type: 'warning',
-                    message: this.$t('common.dialog.selectedRecords')
-                })
-                return
-            }
-            this.$dialog.confirm({
-                title: this.$t('common.dialog.warn'),
-                message: this.$t('common.operate.makeSure')
-            }).then(() => {
-                removeDraft({ ids: this.selectedIds }).then(response => {
-                    this.$notify({
-                        type: 'success',
-                        message: '删除草稿成功！'
-                    })
-                    this.onRefreshPage()
-                }).catch((e) => {
-                    console.error(e)
-                })
-            })
-        },
-        onClose() {
-            this.ReachBottomShow = false
-        }
+    resetForm() {
+      this.typeId = ''
+    },
+    getTaskDesc(v) {
+      if (!v.includes('#')) {
+        return ''
+      }
+      return v.split('#')[1] || ''
+    },
+    // 点击左边显示
+    clickType() {
+      this.typeTreePopup = true
+    },
+    clickTypeNode(data) {
+      this.typeId = data.id
+      this.onMoreSearch({})
+    },
+    onClick(item, index) {
+      this.id = item.id_
+      this.ReachBottomShow = true
+      this.oralPopup = item
+    },
+    onRefreshPage() {
+      this.checkedIds = []
+      this.checkMode = false
+      this.onRefresh()
+    },
+    toCheckMode() {
+      if (this.$utils.isEmpty(this.listData)) {
+        return
+      }
+      if (this.checkMode) {
+        // this.show = true
+        this.checkedIds = []
+      }
+      this.checkMode = !this.checkMode
+    },
+    onRemove() {
+      if (this.checkedIds.length === 0) {
+        this.$notify({
+          type: 'warning',
+          message: this.$t('common.dialog.selectedRecords')
+        })
+        return
+      }
+      this.$dialog.confirm({
+        title: this.$t('common.dialog.warn'),
+        message: this.$t('common.operate.makeSure')
+      }).then(() => {
+        removeDraft({ ids: this.selectedIds }).then(response => {
+          this.$notify({
+            type: 'success',
+            message: '删除草稿成功！'
+          })
+          this.onRefreshPage()
+        }).catch((e) => {
+          console.error(e)
+        })
+      })
+    },
+    onClose() {
+      this.ReachBottomShow = false
+    }
 
-        //   lookPosition(str) {
-        //     return new Promise((resolve, reject) => {
-        //       let sql = `select * from ibps_party_entity where find_in_set(ID_,'${str}') order by DEPTH_`
-        //       this.$getCommon.getRepust('sql', sql).then(res => {
-        //         const data = res.data.variables.data
-        //         if (data.length > 0) {
-        //           data.forEach(item => {
-        //             item.id = item.ID_
-        //             item.name = item.NAME_
-        //             item.path = item.PATH_
-        //             item.text = item.NAME_
-        //           })
-        //           uni.setStorageSync('mainPosition', data[0])
-        //           uni.setStorageSync('positionList', data)
-        //           this.getPosition(data).then(res => {
-        //             console.log("获得什么数据啊data", data);
-        //             resolve(data)
-        //           })
+    //   lookPosition(str) {
+    //     return new Promise((resolve, reject) => {
+    //       let sql = `select * from ibps_party_entity where find_in_set(ID_,'${str}') order by DEPTH_`
+    //       this.$getCommon.getRepust('sql', sql).then(res => {
+    //         const data = res.data.variables.data
+    //         if (data.length > 0) {
+    //           data.forEach(item => {
+    //             item.id = item.ID_
+    //             item.name = item.NAME_
+    //             item.path = item.PATH_
+    //             item.text = item.NAME_
+    //           })
+    //           uni.setStorageSync('mainPosition', data[0])
+    //           uni.setStorageSync('positionList', data)
+    //           this.getPosition(data).then(res => {
+    //             console.log("获得什么数据啊data", data);
+    //             resolve(data)
+    //           })
 
-        //         } else {
-        //           resolve(data)
-        //         }
+    //         } else {
+    //           resolve(data)
+    //         }
 
-        //       }).catch(err => {
-        //         reject(err)
-        //       })
-        //     })
+    //       }).catch(err => {
+    //         reject(err)
+    //       })
+    //     })
 
-        //   },
-    }
+    //   },
+  }
 
 }
 </script>