同步

src/views/data/query/adviceSearch.vue

@@ -1,11 +1,8 @@
 <template>
   <div class="dashboard-container">
     <div class="block">
-      <div class="barBtn-title">
-        医嘱查询
-      </div>
-      <div class="bnh">
-      </div>
+      <div class="barBtn-title">医嘱查询</div>
+      <div class="bnh"></div>
       <div class="barBtn">
         <el-form ref="form" :model="formData" label-width="100px">
           <el-form-item v-for="(item, index) in formData.seniorList" :key="index">
@@ -17,17 +14,17 @@
             <span class="pind10"></span>
             <span v-if="item.key == 'YZQX'">
               <el-select class="width150" filterable v-model="item.value" placeholder="请选择">
-                <el-option v-for="(item,index) in YZQXList" :key="index" :label="item.val" :value="item.id"></el-option>
+                <el-option v-for="(item, index) in YZQXList" :key="index" :label="item.val" :value="item.id"></el-option>
               </el-select>
             </span>
             <span v-else-if="item.key == 'KZKS'">
               <el-select class="width150" filterable v-model="item.value" placeholder="请选择">
-                <el-option v-for="(item,index) in KZKSList" :key="index" :label="item.val" :value="item.id"></el-option>
+                <el-option v-for="(item, index) in KZKSList" :key="index" :label="item.val" :value="item.id"></el-option>
               </el-select>
             </span>
             <span v-else-if="item.key == 'BRKS'">
               <el-select class="width150" filterable v-model="item.value" placeholder="请选择">
-                <el-option v-for="(item,index) in BRKSList" :key="index" :label="item.val" :value="item.id"></el-option>
+                <el-option v-for="(item, index) in BRKSList" :key="index" :label="item.val" :value="item.id"></el-option>
               </el-select>
             </span>
             <span v-else>
@@ -39,7 +36,7 @@
             <!-- 增减重置选项按钮开始 -->
             <span>
               <el-button :disabled="formData.seniorList.length == 1" v-if="index != 0" type="primary" icon="el-icon-minus" @click="funDel(index)"></el-button>
-              <el-button  type="primary" icon="el-icon-plus" @click="funAdd" v-if="index == formData.seniorList.length-1"></el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="funAdd" v-if="index == formData.seniorList.length - 1"></el-button>
             </span>
             <!-- 增减重置选项按钮结束 -->
           </el-form-item>
@@ -50,11 +47,8 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="fBtn" style="position: relative" >
+      <div class="fBtn" style="position: relative">
         <el-button class="btn1" style="position: absolute; right: 270px" @click="reset">重置条件</el-button>
-        <!-- <el-select style="position: absolute; right: 30px" v-model="formData" @change="funSetList()" placeholder="检索历史">
-          <el-option v-for="(item,index) in setList" :key="index" :label="item" :value="item"></el-option>
-        </el-select> -->
         <el-button class="btn2" @click="seachFunQuery">检索</el-button>
       </div>
     </div>
@@ -64,29 +58,34 @@
           <div class="h-title">
             <span class="blue"></span>
             <span class="text">病案医嘱列表</span>
-            <span class="titleName" v-if="paginationData.total!=0">例数:<span class="title-left-span">{{paginationData.total }}</span>例</span>
+            <span class="titleName" v-if="paginationData.total != 0">
+              例数:
+              <span class="title-left-span">{{ paginationData.total }}</span>
+              例
+            </span>
           </div>
-          <el-button class="title-left-btn"  @click="funExport()">导出Excel</el-button>
+          <el-button class="title-left-btn" @click="funExport()">导出Excel</el-button>
         </div>
       </div>
 
-      <div class="conter" style="border: none" >
+      <div class="conter" style="border: none">
         <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
-          <!-- <el-table-column type="selection" width="55"></el-table-column> -->
           <el-table-column type="index" :index="indexAdd" label="序号" width="70px"></el-table-column>
           <el-table-column prop="AAA28" label="病案号">
-              <!-- <template slot-scope="scope">
-                <span class="blue" @click="funGoto(scope.row.MED_REC_ID)">
-                  <template>
-                    <div>
-                      {{ scope.row.AAA28 }}
-                    </div>
-                  </template>
-                </span>
-            </template> -->
+            <template slot-scope="scope">
+              <span class="blue" @click="funGoto(scope.row.ZYH)">
+                <template>
+                  <div>
+                    {{ scope.row.AAA28 }}
+                  </div>
+                </template>
+              </span>
+            </template>
           </el-table-column>
           <el-table-column prop="AAB01" label="入院时间"></el-table-column>
           <el-table-column prop="YZMC" label="医嘱名称"></el-table-column>
+          <el-table-column prop="YCJL" label="剂量"></el-table-column>
+          <el-table-column prop="SYPC" label="用法"></el-table-column>
           <el-table-column prop="BRKS" label="病人科室"></el-table-column>
           <el-table-column prop="KZKS" label="开嘱科室"></el-table-column>
           <el-table-column prop="YZQX" label="医嘱期效"></el-table-column>
@@ -95,17 +94,17 @@
         <!-- 分页控制 -->
       </div>
       <el-pagination
-          v-if="tableData && tableData.length !== 0"
-          @size-change="SizeChangeEvent"
-          @current-change="pageHasChanged"
-          :total="paginationData.total"
-          background
-          class="table-pagination"
-          style="margin: 15px 0px"
-          :page-size="paginationData.pageSize"
-          :current-page.sync="paginationData.currentPage"
-          layout="total, sizes, prev, pager, next, jumper"
-        ></el-pagination>
+        v-if="tableData && tableData.length !== 0"
+        @size-change="SizeChangeEvent"
+        @current-change="pageHasChanged"
+        :total="paginationData.total"
+        background
+        class="table-pagination"
+        style="margin: 15px 0px"
+        :page-size="paginationData.pageSize"
+        :current-page.sync="paginationData.currentPage"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -126,7 +125,6 @@ export default {
     ...mapGetters(['name']),
   },
   data() {
-
     return {
       choice: 0,
       formData: {
@@ -139,7 +137,6 @@ export default {
             type: '0',
           },
         ],
-
       },
       tableData: [],
       paginationData: {
@@ -150,16 +147,13 @@ export default {
       fieldList: [],
       multipleSelection: [],
       setList: [],
-      YZQXList:[],//医嘱起效列表
-      KZKSList:[],//开嘱科室列表
-      BRKSList:[],//病人列表
+      YZQXList: [], //医嘱起效列表
+      KZKSList: [], //开嘱科室列表
+      BRKSList: [], //病人列表
     };
   },
   mounted() {
-
-
-    this.funQuery()
-
+    this.funQuery();
   },
   created() {
     this.searchCondition();
@@ -167,23 +161,19 @@ export default {
   methods: {
     funGoto(val) {
       this.storageSet('getData', val);
-      this.goto('/caseViews')
+      this.$router.push({ path: '/caseViews' })
     },
-    indexAdd(index){
-      return index + 1 + (this.paginationData.currentPage - 1) * this.paginationData.pageSize
-      // this.paginationData.pageSize*( this.paginationData.currentPage-1)+index
+    indexAdd(index) {
+      return index + 1 + (this.paginationData.currentPage - 1) * this.paginationData.pageSize;
     },
-    funSelect(index){
-      this.formData.seniorList[index].value = ''
+    funSelect(index) {
+      this.formData.seniorList[index].value = '';
     },
 
-    funSetList() {
-     // this.formData0.input = String(this.formData0.input1);
-    },
+    funSetList() {},
 
     handleSelectionChange(val) {
       this.multipleSelection = val;
-      console.log(this.multipleSelection);
     },
     SizeChangeEvent(val) {
       this.paginationData.pageSize = val;
@@ -192,8 +182,8 @@ export default {
     pageHasChanged() {
       this.funQuery();
     },
-    seachFunQuery(){
-      this. paginationData.currentPage = 1;
+    seachFunQuery() {
+      this.paginationData.currentPage = 1;
       this.funQuery();
     },
     funDel(i) {
@@ -213,90 +203,67 @@ export default {
       });
     },
     funQuery() {
-      console.log(this.formData.seniorList)
-
       let pramse = {
         limit: this.paginationData.pageSize,
         page: this.paginationData.currentPage, //是当前页数 默认是0 。普通检索的参数是
       };
-      this.formData.seniorList.forEach((item)=>{
-        if(item.key == 'AAA28'){
-          pramse.AAA28 = item.value
+      this.formData.seniorList.forEach(item => {
+        if (item.key == 'AAA28') {
+          pramse.AAA28 = item.value;
         }
-        if(item.key == 'YZQX'){
-          pramse.YZQX = item.value
+        if (item.key == 'YZQX') {
+          pramse.YZQX = item.value;
         }
-        if(item.key == 'BRKS'){
-          pramse.BRKS = item.value
+        if (item.key == 'BRKS') {
+          pramse.BRKS = item.value;
         }
-        if(item.key == 'KZKS'){
-          pramse.KZKS = item.value
+        if (item.key == 'KZKS') {
+          pramse.KZKS = item.value;
         }
-        if(item.key == 'YZMC'){
-          pramse.YZMC = item.value
+        if (item.key == 'YZMC') {
+          pramse.YZMC = item.value;
         }
+      });
 
-      })
-
-      //pramse.field = this.formData.seniorList;
       pramse.start = this.formData.startTime;
       pramse.end = this.formData.endTime;
 
       this.$axios.post('/getDoctorAdvice', pramse).then(res => {
-        this.tableData = res.data.list||[];
+        this.tableData = res.data.list || [];
         this.paginationData.total = res.data.total;
-        console.log(this.paginationData.total)
-        // if (this.choice == '0'&&this.formData0.input) {
-        //   this.setList.push(String(this.formData0.input));
-        //   console.log( this.setList)
-        //   let listSetto = Array.from(new Set(this.setList));
-        //   console.log(listSetto)
-        //   this.setList = listSetto
-        //   this.storageSet('setList', JSON.stringify(this.setList));
-
-        // }
-
       });
     },
 
     reset() {
       // 重置数据
-        this. paginationData.currentPage = 1;
-        Object.assign(this.$data.formData, this.$options.data().formData);
-        this.funQuery();
-
+      this.paginationData.currentPage = 1;
+      Object.assign(this.$data.formData, this.$options.data().formData);
+      this.funQuery();
     },
-    searchCondition(){
+    searchCondition() {
       this.$axios.post('/doctorAdviceSelect').then(res => {
-         console.log('doctorAdviceSelect',res)
-         res.data.forEach((item,index)=>{
+        res.data.forEach((item, index) => {
           item.id = item.key;
-          if(item.key == 'YZQX'){
+          if (item.key == 'YZQX') {
             let YZQXArr = Object.keys(item.value);
-            YZQXArr.forEach((jitem,index)=>{
-              this.YZQXList.push({id:jitem,val:item.value[jitem]})
-            })
-
-            console.log(this.YZQXList)
+            YZQXArr.forEach((jitem, index) => {
+              this.YZQXList.push({ id: jitem, val: item.value[jitem] });
+            });
           }
-          if(item.key == 'KZKS'){
+          if (item.key == 'KZKS') {
             let KZKSArr = Object.keys(item.value);
-            KZKSArr.forEach((jitem,index)=>{
-              this.KZKSList.push({id:jitem,val:item.value[jitem]})
-            })
-            console.log(this.KZKSList)
+            KZKSArr.forEach((jitem, index) => {
+              this.KZKSList.push({ id: jitem, val: item.value[jitem] });
+            });
           }
-          if(item.key == 'BRKS'){
+          if (item.key == 'BRKS') {
             let BRKSArr = Object.keys(item.value);
-            BRKSArr.forEach((jitem,index)=>{
-              this.BRKSList.push({id:jitem,val:item.value[jitem]})
-            })
-            console.log(this.BRKSList)
+            BRKSArr.forEach((jitem, index) => {
+              this.BRKSList.push({ id: jitem, val: item.value[jitem] });
+            });
           }
-
-         })
-         this.fieldList = res.data
-
+        });
+        this.fieldList = res.data;
       });
     },
 
@@ -306,29 +273,28 @@ export default {
         limit: this.paginationData.pageSize,
         page: this.paginationData.currentPage, //是当前页数 默认是0 。普通检索的参数是
       };
-      this.formData.seniorList.forEach((item)=>{
-        if(item.key == 'AAA28'){
-          pramse.AAA28 = item.value
+      this.formData.seniorList.forEach(item => {
+        if (item.key == 'AAA28') {
+          pramse.AAA28 = item.value;
         }
-        if(item.key == 'YZQX'){
-          pramse.YZQX = item.value
+        if (item.key == 'YZQX') {
+          pramse.YZQX = item.value;
         }
-        if(item.key == 'BRKS'){
-          pramse.BRKS = item.value
+        if (item.key == 'BRKS') {
+          pramse.BRKS = item.value;
         }
-        if(item.key == 'KZKS'){
-          pramse.KZKS = item.value
+        if (item.key == 'KZKS') {
+          pramse.KZKS = item.value;
         }
-        if(item.key == 'YZMC'){
-          pramse.YZMC = item.value
+        if (item.key == 'YZMC') {
+          pramse.YZMC = item.value;
         }
-
-      })
+      });
       pramse.start = this.formData.startTime;
       pramse.end = this.formData.endTime;
 
-      let fileName = '医嘱列表'
-      let httpUrl = '/doctorAdviceExport'
+      let fileName = '医嘱列表';
+      let httpUrl = '/doctorAdviceExport';
 
       this.funExeclPost(fileName, pramse, httpUrl, 'xlsx');
     },
@@ -342,7 +308,7 @@ export default {
   },
 };
 </script>
-  <style scoped>
+<style scoped>
 ::v-deep.el-pagination.is-background .btn-next,
 ::v-deep.el-pagination.is-background .btn-prev,
 ::v-deep.el-pagination.is-background .el-pager li {
@@ -373,7 +339,7 @@ export default {
   border-bottom: 0px;
 }
 </style>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 .tableBox {
   background: #fff;
   padding: 19px;
@@ -387,7 +353,7 @@ export default {
   padding: 20px 30px;
   margin-bottom: 20px;
   .fBtn {
-    margin-bottom:20px ;
+    margin-bottom: 20px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -414,7 +380,7 @@ export default {
     align-items: center;
     justify-content: center;
   }
-  .barBtn-title{
+  .barBtn-title {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -522,7 +488,6 @@ export default {
 .conter {
   position: relative;
   margin: 20px 0;
-  padding: 20px 50px;
   border: 1px solid skyblue;
 }
 .conter-title {
@@ -611,15 +576,15 @@ export default {
   top: 21px;
   left: 30px;
 }
-.bule{
+.bule {
   background: #3195ff !important;
   color: #fff !important;
 }
-.titleName{
-  margin-left:30px;
+.titleName {
+  margin-left: 30px;
   // margin-top:3px;
 }
-.marginLeft{
-  margin-left:-110px ;
+.marginLeft {
+  margin-left: -110px;
 }
 </style>

src/views/data/query/index.vue

@@ -665,8 +665,15 @@ export default {
     },
     funGoto(val) {
       this.storageSet('getData', val);
-      // this.goto('/details');
-      this.$router.push('/details');
+      const { path } = this.$route
+      let toPath
+      if (path === '/hospital-search') {
+        toPath = '/hospital-details'
+      } else {
+        toPath = '/details'
+      }
+      // status = 1 代表不能复制文本
+      this.$router.push({ path: toPath })
 
     },
     funBlur() {
@@ -750,6 +757,7 @@ export default {
           ORG_STATE: this.formData0.medicalRecord || null, //全部病案
           page: this.paginationData.currentPage, //页码
           limit: this.paginationData.pageSize, //条数
+          is_tm: 1
         };
         sessionStorage.setItem('Zkpramse', JSON.stringify(pramse));
         sessionStorage.setItem('ZkChoice', this.choice);
@@ -768,6 +776,7 @@ export default {
           field: this.formData1.seniorList || null, //字段条件
           page: this.paginationData.currentPage, //页码
           limit: this.paginationData.pageSize, //条数
+          is_tm: 1
         };
         sessionStorage.setItem('Zkpramse', JSON.stringify(pramse));
         sessionStorage.setItem('ZkChoice', this.choice);

src/views/searchSystem/components/BLSearch.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 同views/search/index 一致 -->
   <div class="dashboard-container">
     <div class="block">
       <div class="barBtn">
@@ -519,7 +520,9 @@ export default {
   methods: {
     normalDownload(name) {
       const params = {
-        keyword: this.formData0.input
+        keyword: this.formData0.input,
+        AAC01_start: this.formData1.startTime,
+        AAC01_end: this.formData1.endTime
       }
       bassNormalSearchDownload(params).then(res => {
         const content = res.data // 后台返回二进制数据

src/views/searchSystem/components/CaseHomeSearch.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 同views/data/query 一致 -->
   <div class="dashboard-container">
     <div class="block">
       <div class="barBtn">

src/views/searchSystem/components/DoctorOrderSearch.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 同views/query/adviceSearch 一致 -->
   <div class="dashboard-container">
     <div class="block">
       <div class="barBtn-title">医嘱查询</div>