口头、延迟修改

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

@@ -7,7 +7,7 @@
                 left-arrow
                 @click-left="$router.push({ name: 'dashboard' })"
             />
-            <van-search v-model="subject" show-action placeholder="请输入搜索关键词" @search="onSearch">
+            <van-search v-model="subject" show-action placeholder="请输入病理号搜索关键词" @search="onSearch">
                 <!-- <template #left>
           <van-icon name="bars" :class="{'ibps-active':$utils.isNotEmpty(typeId)}" class="ibps-pr-5"
             @click="clickType" />
@@ -23,7 +23,7 @@
                     <van-cell
                         v-for="(item,index) in listData"
                         :key="item.id+index"
-                        :title="item.yang_pin_hao_==''?'/':item.yang_pin_hao_==null?'/':item.yang_pin_hao_"
+                        :title="item.xing_ming_==''?'/':item.xing_ming_==null?'/':item.xing_ming_"
                         @click="onClick(item,index)"
                     >
                         <template slot="icon">
@@ -33,12 +33,20 @@
                         <!-- <span>{{ item.bao_gao_shi_jian|bian_zhi_shi_jian }}</span> -->
                         <template #label>
                             <van-row class="delayShow">
-                                <van-col span="6">病员姓名:</van-col>
-                                <van-col span="17">{{ item.xing_ming_==''?'/':item.xing_ming_==null?'/':item.xing_ming_ }}</van-col>
+                                <van-col span="6">申请科室:</van-col>
+                                <van-col span="17">{{ item.bing_qu_==''?'/':item.bing_qu_==null?'/':item.bing_qu_ }}</van-col>
                             </van-row>
                             <van-row class="delayShow">
-                                <van-col span="6">检验项目:</van-col>
-                                <van-col span="17">{{ item.xiang_mu_==''?'/':item.xiang_mu_==null?'/':item.xiang_mu_ }}</van-col>
+                                <van-col span="6">检查类型:</van-col>
+                                <van-col span="17">{{ item.jian_cha_lei_xing==''?'/':item.jian_cha_lei_xing==null?'/':item.jian_cha_lei_xing }}</van-col>
+                            </van-row>
+                            <van-row class="delayShow">
+                                <van-col span="6">报告类型:</van-col>
+                                <van-col span="17">{{ item.bao_gao_lei_xing_==''?'/':item.bao_gao_lei_xing_==null?'/':item.bao_gao_lei_xing_ }}</van-col>
+                            </van-row>
+                            <van-row class="delayShow">
+                                <van-col span="6">标本类型:</van-col>
+                                <van-col span="17">{{ item.yang_pin_lei_xing==''?'/':item.yang_pin_lei_xing==null?'/':item.yang_pin_lei_xing }}</van-col>
                             </van-row>
                             <van-row class="delayShow">
                                 <van-col span="6">延迟原因:</van-col>
@@ -113,7 +121,7 @@
                         <van-col span="10" class="leftPopups">标本类型:</van-col>
                         <van-col
                             span="14"
-                        >{{ oralPopup.biao_ben_lei_xing==''?'/':oralPopup.biao_ben_lei_xing==null?'/':oralPopup.biao_ben_lei_xing }}</van-col>
+                        >{{ oralPopup.yang_pin_lei_xing==''?'/':oralPopup.yang_pin_lei_xing==null?'/':oralPopup.yang_pin_lei_xing }}</van-col>
                     </van-row>
                     <!-- <van-row class="showPopups">
                         <van-col span="10" class="leftPopups">审核人:</van-col>
@@ -309,7 +317,7 @@ export default {
         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`
+      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,y.yang_pin_lei_xing 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_  LEFT JOIN t_yplxb y on t_ycbgjlb.biao_ben_lei_xing = y.id_ where find_in_set(t_ycbgjlb.bian_zhi_bu_men_,'${this.positionObj}') and t_ycbgjlb.xing_ming_ 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) {

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

@@ -33,12 +33,16 @@
                         <!-- <span>{{ item.bao_gao_shi_jian|bian_zhi_shi_jian }}</span> -->
                         <template #label>
                             <van-row>
-                                <van-col span="6">门诊/住院号:</van-col>
-                                <van-col span="17">{{ item.zhu_yuan_hao_==''?'/':item.xing_ming_==null?'/':item.xing_ming_ }}</van-col>
+                                <van-col span="6">科室/病区:</van-col>
+                                <van-col span="17">{{ item.bing_qu_==''?'/':item.bing_qu_==null?'/':item.bing_qu_ }}</van-col>
                             </van-row>
                             <van-row>
-                                <van-col span="6">床号:</van-col>
-                                <van-col span="17">{{ item.chuang_hao_==''?'/':item.chuang_hao_==null?'/':item.chuang_hao_ }}</van-col>
+                                <van-col span="6">登记号:</van-col>
+                                <van-col span="17">{{ item.deng_ji_hao_==''?'/':item.deng_ji_hao_==null?'/':item.deng_ji_hao_ }}</van-col>
+                            </van-row>
+                            <van-row>
+                                <van-col span="6">病理号:</van-col>
+                                <van-col span="17">{{ item.bing_li_hao_==''?'/':item.bing_li_hao_==null?'/':item.bing_li_hao_ }}</van-col>
                             </van-row>
                             <van-row>
                                 <van-col span="6">检验项目:</van-col>