8月15日

src/api/advice.js

@@ -42,13 +42,15 @@ export function EditDoctorAdvice(patient, id, advice, mode) {
   })
 }
 
-export function ExecDoctorAdvice(patient, id, time, mode, origin) {
+export function ExecDoctorAdvice(patient, id, time, mode, origin, hisAdviceIds, adviceIds) {
   var params = {
     id: id,
     patient: patient,
     execution_time: time,
     mode: mode,
-    origin: origin
+    origin: origin,
+    hisAdviceIds: hisAdviceIds,
+    adviceIds: adviceIds
   }
 
   return request({
@@ -60,13 +62,14 @@ export function ExecDoctorAdvice(patient, id, time, mode, origin) {
     }
   })
 }
-export function CheckDoctorAdvice(patient, id, mode, origin) {
+export function CheckDoctorAdvice(patient, id, mode, origin, hisAdviceIds, adviceIds) {
   var params = {
     id: id,
     patient: patient,
     mode: mode,
-    origin: origin
-    // execution_time: time,
+    origin: origin,
+    hisAdviceIds: hisAdviceIds,
+    adviceIds: adviceIds
   }
   return request({
     url: '/api/patients/advice/check',
@@ -509,3 +512,10 @@ export function getDoctorAdviceCount(params) {
   })
 }
 
+export function GetOrderDoctorAdvice(params) {
+  return request({
+    url: '/api/schedule/getorderdoctoradvice',
+    method: 'get',
+    params: params
+  })
+}

src/api/dialysis_record.js

@@ -113,6 +113,22 @@ export function getLongAdvice(params) {
   })
 }
 
+export function getLongAdviceOne(params) {
+  return request({
+    url: '/api/dialysis/advice_remind/one',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getLongAdviceTwo(params) {
+  return request({
+    url: '/api/dialysis/advice_remind/two',
+    method: 'Get',
+    params: params
+  })
+}
+
 export function GetSchedualNumber(params) {
   return request({
     url: '/api/schedule/get',

src/api/drug/drug.js

@@ -547,3 +547,19 @@ export function getPurchaseStockQuery(params) {
     params: params
   })
 }
+
+export function getDrugWarehouseOutDetailByPatientId(params) {
+  return request({
+    url: '/api/good/getdrugwarehouseoutdetailbypatientid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugExpiryDateQuery(params) {
+  return request({
+    url: '/api/drug/getdrugexpirydatequery',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -170,6 +170,7 @@ export default {
     drugsExpiryDate: '药品有效期预警',
     drugsSurplus: '药品剩余预警',
     drugsQuery: '库存查询',
+    drugsNewQuery: '库存查询',
     drugsReportLoss: '药品报损',
     drugsAdjustPrice: '药品调价',
     drugsStockCancel: '退库单',

src/router/modules/drugs.js

@@ -18,6 +18,12 @@ export default {
       name: 'drugsQuery',
       meta: { title: 'drugsQuery', noCache: true }
     },
+    {
+      path: '/stock/drugs/drugNewQuery',
+      component: () => import('@/xt_pages/stock/drugs/drugNewQuery'),
+      name: 'drugsNewQuery',
+      meta: { title: 'drugsNewQuery', noCache: true }
+    },
     {
       path: '/stock/drugs/stock/in',
       component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),

src/xt_pages/dialysis/PatientBox.vue

@@ -240,7 +240,7 @@ import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPresc
 import treatmentSummaryDialog from "../dialysis/details/dialog/treatmentSummaryDialog";
 import {
   getDialysisScheduleDetail,
-  getLongAdvice,
+  getLongAdviceOne,
 } from "@/api/dialysis_record";
 
 export default {
@@ -340,6 +340,7 @@ export default {
       type: Array,
     },
     patientStateVal: Number,
+    selected_date:String,
   },
 
   methods: {
@@ -661,10 +662,12 @@ export default {
       });
     },
     getLongAdvice() {
+    
       let params = {
         patient_id: this.patient_id,
+        schedule_date:parseTime(this.selected_date, '{y}-{m}-{d}'),
       };
-      getLongAdvice(params).then((rs) => {
+      getLongAdviceOne(params).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
           var status = parseInt(resp.data.status);
@@ -698,7 +701,9 @@ export default {
               }
 
               this.is_open = resp.data.is_open_remind;
+              
               this.longAdvices = totalAdvice;
+              console.log("长期医嘱22332323232232323",this.longAdvices)
               this.waitUploadAdvices = waitUploadAdvices;
               break;
           }

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -165,7 +165,6 @@
           :disabled="!is_has_exce"
           @click="execAdvice"
           :loading="deleLoading"
-
         >执行医嘱
         </el-button>
         <el-button v-else disabled round @click="execAdvice" :loading="deleLoading">执行医嘱</el-button>
@@ -209,6 +208,7 @@
       <!-- 医嘱列表 -->
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
+      <!-- :span-method="objectSpanMethod" -->
       <el-table
         v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -219,14 +219,13 @@
         ref="advices_list"
         @row-click="cellMouseEnter"
         :row-class-name="tableRowClassName"
-        :span-method="objectSpanMethod"
+        
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
+        @selection-change="handleSelectionChange"
         highlight-current-row
-
       >
-      <!-- @selection-change="handleSelectionChange" -->
-        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
+       <el-table-column type="selection"  width="55" ></el-table-column>
        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -300,8 +299,6 @@
             <span>
               {{getXuserName(scope.row.checker)}}
             </span>
-
-
           </template>
         </el-table-column>
       </el-table>
@@ -321,8 +318,9 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
+        @selection-change="handleSelectionChange"
       >
-        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
+        <el-table-column type="selection"  width="55"></el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -330,13 +328,6 @@
         </el-table-column>
 
 
-        <!--===================================-->
-<!--        <el-table-column prop="date" label="调试" align="center" min-width="26px">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span @click="lili(scope.$index,scope.row)">{{ scope.row.parent_id }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -623,7 +614,8 @@
     EditDoctorAdvice,
     ExecDoctorAdvice,
     getAdviceConfig,
-    GetLastOrNextDoctorAdvice
+    GetLastOrNextDoctorAdvice,
+    GetOrderDoctorAdvice
   } from '@/api/advice'
   import { getDataConfig } from '@/utils/data'
 
@@ -780,6 +772,8 @@
         drug_id: 0,
         src_type:"",
         org_id:0,
+        hisAdviceIds:"",
+        adviceIds:"",
       }
     },
     watch: {
@@ -796,16 +790,50 @@
 
     },
     methods: {
-      handleSelectionChange(){
-
-      },
-
-      //调试
-      lili(index,row){
-        // console.log("==index==",index)
-        // console.log("==row==",row)
-        console.log("==doctor_advices==",this.doctor_advices)
-        console.log("==this.form==",this.form)
+      handleSelectionChange(row){
+        console.log("row3233223232332322323",row)
+       if(row.length >0){
+         this.currentRow = row[0]
+       }
+       var bloodIds= []
+       var hisIds=[]
+       console.log("this.his_is_open ",this.his_is_open )
+       console.log("is_advice_open",this.is_advice_open)
+       for(let i=0;i<row.length;i++){
+        //血透
+         if(this.his_is_open  != 1 && this.is_advice_open!=1){
+            bloodIds.push(row[i].id)
+         }
+         //his
+         if(this.his_is_open == 1 && this.is_advice_open!=1){
+             hisIds.push(row[i].id)
+         }
+         
+         if(this.his_is_open == 1 && this.is_advice_open == 1){
+            if(row[i].origin == 1){
+              bloodIds.push(row[i].id)
+            }
+            if(row[i].origin == 2){
+              hisIds.push(row[i].id)
+            }
+           this.currentRow.origin = 3
+         }
+       }
+      
+       if(this.his_is_open  == 1 || this.is_advice_open == 1){
+         this.is_has_exce = true
+         this.is_has_check = true
+       }
+     
+       if(this.his_is_open!=1 && this.is_advice_open!=1){
+        
+          this.is_has_exce = true
+          this.is_has_check = true
+       }
+        console.log("bloodIds",bloodIds,"hisIds",hisIds)
+       this.adviceIds = bloodIds.join(",")
+       this.hisAdviceIds = hisIds.join(",")
+      
       },
       getContent: function() {
         if (this.sch != null) {
@@ -1242,7 +1270,7 @@
         let mode = '6'
 
 
-        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
+        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin,this.hisAdviceIds,this.adviceIds).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.exceLoading = false
@@ -1254,46 +1282,71 @@
                 type: 'success',
                 duration: 2000
               })
+              
               var msg = response.data.data.msg
               if(msg == 1){
-                var exid = response.data.data.advice.id
-                  if (response.data.data.advice.parent_id > 0) {
-                    exid = response.data.data.advice.parent_id
-                  }
-
-                  this.currentRow.execution_state = 1
-                  this.currentRow.execution_staff =
-                    response.data.data.advice.execution_staff
-                  this.currentRow.execution_time =
-                    response.data.data.advice.execution_time
-                  var alen = this.doctor_advices.length
-
-                  for (var index in this.doctor_advices) {
-                    if (
-                      this.doctor_advices[index].id == exid ||
-                      this.doctor_advices[index].parent_id == exid
-                    ) {
-                      this.doctor_advices[index].execution_state = 1
-                      this.doctor_advices[index].execution_staff =
-                        response.data.data.advice.execution_staff
-                      this.doctor_advices[index].execution_time =
-                        response.data.data.advice.execution_time
-                      // this.doctor_advices[index].checker = response.data.data.advice.checker;
-                      break
-                    }
-                  }
-                  this.execTimeDialogVisible = false
-
-                  return false
+                  let params = {
+                  patient_id: this.patientid,
+                  record_time: this.request_record_date,
+                  type: 1,
+                  advice_date:this.$route.query.date,
+                }
+                this.GetOrderDoctorAdvice(params)
+                this.execTimeDialogVisible = false
               }
+            
+              // if(msg == 1){
+              //   var exid = response.data.data.advice.id
+              //     if (response.data.data.advice.parent_id > 0) {
+              //       exid = response.data.data.advice.parent_id
+              //     }
+
+              //     this.currentRow.execution_state = 1
+              //     this.currentRow.execution_staff =
+              //       response.data.data.advice.execution_staff
+              //     this.currentRow.execution_time =
+              //       response.data.data.advice.execution_time
+              //     var alen = this.doctor_advices.length
+
+              //     for (var index in this.doctor_advices) {
+              //       if (
+              //         this.doctor_advices[index].id == exid ||
+              //         this.doctor_advices[index].parent_id == exid
+              //       ) {
+              //         this.doctor_advices[index].execution_state = 1
+              //         this.doctor_advices[index].execution_staff =
+              //           response.data.data.advice.execution_staff
+              //         this.doctor_advices[index].execution_time =
+              //           response.data.data.advice.execution_time
+              //         break
+              //       }
+              //     }
+              //     this.execTimeDialogVisible = false
+
+              //     return false
+              // }
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
+               let params = {
+                patient_id: this.patientid,
+                record_time: this.request_record_date,
+                type: 1,
+                advice_date:this.$route.query.date,
+              }
+              this.GetOrderDoctorAdvice(params)
                 this.execTimeDialogVisible = false
                 return false
               }
               if(msg == 3){
                 this.$message.error("无库存,请入库")
+               let params = {
+                patient_id: this.patientid,
+                record_time: this.request_record_date,
+                type: 1,
+                advice_date:this.$route.query.date,
+              }
+              this.GetOrderDoctorAdvice(params)
                 this.execTimeDialogVisible = false
                 return false
               }
@@ -1602,7 +1655,7 @@
             this.deleLoading = true
             let mode = '7'
 
-            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin).then(
+            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin,this.hisAdviceIds,this.adviceIds).then(
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1616,33 +1669,37 @@
                     type: 'success',
                     duration: 2000
                   })
-
-                  var exid = response.data.data.advice.id
-                  if (response.data.data.advice.parent_id > 0) {
-                    exid = response.data.data.advice.parent_id
+                   let params = {
+                    patient_id: this.patientid,
+                    record_time: this.request_record_date,
+                    type: 1,
+                    advice_date:this.$route.query.date,
                   }
-                  // if (this.currentRow.parent_id > 0) {
-                  //     exid = this.currentRow.parent_id;
+                console.log("param233223223233232",params)
+                 this.GetOrderDoctorAdvice(params)
+                  // var exid = response.data.data.advice.id
+                  // if (response.data.data.advice.parent_id > 0) {
+                  //   exid = response.data.data.advice.parent_id
+                  // }
+                  // this.currentRow.check_state = 1
+                  // this.currentRow.check_time =
+                  //   response.data.data.advice.check_time
+                  // this.currentRow.checker = response.data.data.advice.checker
+                  // var alen = this.doctor_advices.length
+
+                  // for (var index in this.doctor_advices) {
+                  //   if (
+                  //     this.doctor_advices[index].id == exid ||
+                  //     this.doctor_advices[index].parent_id == exid
+                  //   ) {
+                  //     this.doctor_advices[index].check_state = 1
+                  //     this.doctor_advices[index].check_time =
+                  //       response.data.data.advice.check_time
+                  //     this.doctor_advices[index].checker =
+                  //       response.data.data.advice.checker
+                  //     // break;
+                  //   }
                   // }
-                  this.currentRow.check_state = 1
-                  this.currentRow.check_time =
-                    response.data.data.advice.check_time
-                  this.currentRow.checker = response.data.data.advice.checker
-                  var alen = this.doctor_advices.length
-
-                  for (var index in this.doctor_advices) {
-                    if (
-                      this.doctor_advices[index].id == exid ||
-                      this.doctor_advices[index].parent_id == exid
-                    ) {
-                      this.doctor_advices[index].check_state = 1
-                      this.doctor_advices[index].check_time =
-                        response.data.data.advice.check_time
-                      this.doctor_advices[index].checker =
-                        response.data.data.advice.checker
-                      // break;
-                    }
-                  }
 
                   this.deleLoading = false
                 }
@@ -1736,29 +1793,6 @@
           this.nowExecTime = new Date(group_top_advice.start_time * 1000)
         }
         this.$refs.exec_time.open()
-        // if (this.currentRow == null) {
-        //   this.$message.error("请先选择要执行的医嘱！");
-        //   return false;
-        // }
-        //
-        // if (
-        //   this.currentRow.stop_state == 1 ||
-        //   this.currentRow.execution_state == 1
-        // ) {
-        //   this.$message.error("所选医嘱已停止或执行");
-        //   return false;
-        // }
-        //
-        // if (
-        //   this.currentRow.checker > 0 &&
-        //   this.currentRow.checker == this.$store.getters.xt_user.user.id
-        // ) {
-        //   this.$message.error("核对与执行不能是同一人");
-        //   return false;
-        // }
-        //
-        // this.execTimeDialogVisible = true;
-        // this.deleLoading = true;
       }
       ,
 
@@ -2009,8 +2043,6 @@
       }
       ,
       show(his_is_open,is_advice_open) {
-        console.log("his_is_open233232323232323322323",his_is_open)
-        console.log("is_advice_open233232323232323322323",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
@@ -2116,7 +2148,7 @@
         }
       },
       cellMouseEnter: function(row, column, event) {
-        console.log("row323323322323233232",row)
+       
         this.currentRow = row
         this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {
@@ -2286,11 +2318,11 @@
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
+       
         GetLastOrNextDoctorAdvice(params).then(response => {
           if (response.data.state == 1) {
 
             var doctor_advices = response.data.data.advices
-
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule
@@ -2301,6 +2333,40 @@
         })
 
       },
+      GetOrderDoctorAdvice(params){
+        GetOrderDoctorAdvice(params).then(response=>{
+           if(response.data.state == 1){
+            var doctorAdvice =  response.data.data.doctorAdvice
+            for(let i=0;i<doctorAdvice.lenght;i++){
+               doctorAdvice[i].origin = 1 
+            }
+            
+            var hisDoctorAdvice = response.data.data.hisDoctorAdvice
+            for(let i=0;i<hisDoctorAdvice.length;i++){
+               hisDoctorAdvice[i].origin = 2
+            }
+            this.doctor_advices = []
+            if(this.his_is_open!=1 && this.is_advice_open !=1){
+              
+               this.doctor_advices = doctorAdvice
+            }
+            if(this.his_is_open ==1 && this.is_advice_open!=1){
+              this.doctor_advices = hisDoctorAdvice
+            }
+
+            if(this.his_is_open == 1 &&  this.is_advice_open == 1){
+               for(let i=0;i<doctorAdvice.length;i++){
+                  this.doctor_advices.push(doctorAdvice[i])
+               }
+               for(let i=0;i<hisDoctorAdvice.length;i++){
+                 this.doctor_advices.push(hisDoctorAdvice[i])
+               }
+            }
+           
+           
+           }
+        })
+      },
       getDialysisScheduleDetail() {
         if(this.$route.query.showView && this.$route.query.showView == true){
           return
@@ -2341,7 +2407,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            advice_date:this.$route.query.date,
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2350,7 +2417,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            advice_date:this.$route.query.date,
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2366,7 +2434,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            advice_date:this.$route.query.date,
           }
 
           this.GetLastOrNextDoctorAdvice(params)
@@ -2374,7 +2443,8 @@
           let params = {
             patient_id: this.patientid,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            advice_date:this.$route.query.date,
           }
           this.GetLastOrNextDoctorAdvice(params)
 
@@ -2562,6 +2632,7 @@
      }
     },
     created() {
+      console.log("doctor_advices32323233323322332",this.doctor_advices)
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date
@@ -2571,9 +2642,6 @@
       this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
-
-
-      // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
     },

src/xt_pages/dialysis/details/index.vue

@@ -725,7 +725,7 @@ import TreatmentOf from './treatmentOf'
 import OperationStaff from './operationStaff'
 import {
   getDialysisScheduleDetail,
-  getLongAdvice,
+  getLongAdviceTwo,
   getDialysisRecordInitData,
   getDialysisSchedules,
   getInitPrintData
@@ -1086,9 +1086,10 @@ export default {
     },
     getLongAdvice() {
       const params = {
-        patient_id: this.patient_id
+        patient_id: this.patient_id,
+        schedule_date:this.$route.query.date,
       }
-      getLongAdvice(params).then(rs => {
+      getLongAdviceTwo(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var status = parseInt(resp.data.status)
@@ -1129,6 +1130,7 @@ export default {
                 this.is_open = 1
               }
               this.longAdvices = totalAdvice
+              console.log("长期医嘱汇总 u 公告让你😯23232322332",this.longAdvices)
               this.waitUploadAdvices = waitUploadAdvices
               break
           }
@@ -1410,6 +1412,7 @@ export default {
       )
     },
     printOrderOne(){
+
       this.getInitPrintData()
 
     },
@@ -2164,7 +2167,13 @@ export default {
         })
       },
     getInitPrintData(){
-      this.startVisibility = true
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+       })
+      
        var params = {
          patient_id:this.$route.query.patient_id,
          record_date:this.$route.query.date,
@@ -2177,6 +2186,7 @@ export default {
           this.printList = list
           this.assessmentAfterDislysis = assessmentAfterDislysis
           this.startVisibility = true
+          loading.close()
         }
       })
     }

src/xt_pages/dialysis/schedualPatient.vue

@@ -85,7 +85,7 @@
         <div v-for="zone_schedule in allPatient" :key="zone_schedule.zone_id" class="list clearfix">
           <!-- <h3 style="width:40px;" class="title">{{zone_schedule.zone_name}}</h3> -->
           <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;line-height:30px;">{{zone_schedule.zone_name}}</div>
-          <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' style="flex:1"></patient-box>
+          <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' :selected_date="selected_date" style="flex:1"></patient-box>
         </div>
         
         <div class="NoData" v-show="filtedSchedules.length == 0">
@@ -299,6 +299,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       var patient_state_selected = this.$store.getters.patient_state_selected
       var treat_state_selected = this.$store.getters.treat_state_selected
       var selected_date = this.$store.getters.selected_date
+
       if (schedule_type_selected) {
         this.schedule_type_selected = schedule_type_selected.schedule_type_selected
       }

src/xt_pages/hospitalStation/components/callPrescription.vue

@@ -165,7 +165,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import { getDictionaryDataConfig} from "@/utils/data";
-
+  const moment = require('moment')
   import {
     getCallHisPrescription
   } from '@/api/his/his'
@@ -353,6 +353,7 @@
         this.srcPrescriptions = srcPrescriptions;
         this.start_time  = start_time;
         this.end_time = end_time;
+       
         this.patient_id = id;
         this.name = '处方调用' + '（'+name +'）';
         this.allPrescription = prescriptions;

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2191,7 +2191,7 @@ export default {
         }
         let params = {
           end_time: this.record_date,
-          start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+          start_time:  moment().add(-7, 'd').format("YYYY-MM-DD"),
           patient_id: this.patientInfo.id,
           p_type: 1
         }

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -609,6 +609,29 @@
                   '-' +
                   birth.substr(6, 2)
                 that.form.age = jsGetAge(births, '-')
+              }else  {
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.gender = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.id_card = patient.id_card_no
+
+                var thisLen = that.form.id_card.length
+                var birth = ''
+                if (thisLen == 15) {
+                  birth = '19' + that.form.id_card.substr(6, 6)
+                } else {
+                  birth = that.form.id_card.substr(6, 8)
+                }
+                var births =
+                    birth.substr(0, 4) +
+                    '-' +
+                    birth.substr(4, 2) +
+                    '-' +
+                    birth.substr(6, 2)
+                that.form.age = jsGetAge(births, '-')
               }
               that.$message({message: '读卡成功', type: 'success'})
 

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -165,7 +165,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import { getDictionaryDataConfig} from "@/utils/data";
-
+  const moment = require('moment')
   import {
     getCallHisPrescription
   } from '@/api/his/his'
@@ -192,7 +192,8 @@
           p_type:2,
         };
         this.GetCallHisPrescription(params)
-      },changeEndTime(){
+      },
+      changeEndTime(){
         let params={
           patient_id:this.patient_id,
           start_time: this.start_time,
@@ -203,6 +204,7 @@
         this.GetCallHisPrescription(params)
       },
       GetCallHisPrescription(params){
+        console.log("param222222222",params)
         getCallHisPrescription(params).then(response => {
           if (response.data.state == 1) {
             this.allPrescription = response.data.data.prescriptions;
@@ -371,10 +373,13 @@
           this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
           this.$emit('call', this.srcPrescriptions)
         }
-      },show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
+      },
+      show(name,id,end_time, start_time,srcPrescriptions,prescriptions){
+
         this.srcPrescriptions = srcPrescriptions;
-        this.start_time  = start_time;
+        this.start_time  = start_time
         this.end_time = end_time;
+      
         this.patient_id = id;
         this.name = '处方调用' + '（'+name +'）';
         this.allPrescription = prescriptions;
@@ -382,6 +387,7 @@
           this.allPrescription[i].check_group = []
         }
         this.isLastOrNextVisible = true
+
       },close(){
         this.isLastOrNextVisible = false
       },hide(){

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2183,7 +2183,7 @@
           }
           let params = {
             end_time: this.record_date,
-            start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
+            start_time:  moment().add(-7, 'd').format("YYYY-MM-DD"),
             patient_id: this.patientInfo.id,
             p_type: 2
           }

src/xt_pages/outpatientDoctorStation/modeTemplate.vue

@@ -4,7 +4,7 @@
             <bread-crumb :crumbs='crumbs'></bread-crumb>
             <div style="float:right">
               <el-button type="primary" @click="add">新增</el-button>
-              <el-button type="primary" @click="batchAdd">批量新增</el-button>
+              <!-- <el-button type="primary" @click="batchAdd">批量新增</el-button> -->
             </div>
         </div>
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">

src/xt_pages/stock/drugs/components/drugPatientQuery.vue

@@ -0,0 +1,440 @@
+<template>
+    <div class="main-contain">
+        <div class="app-container">
+         <el-container>
+               <div style="width:27%">
+                <el-row>
+                   时间:
+                    <el-date-picker
+                      size="small"
+                      v-model="start_time"
+                      prefix-icon="el-icon-date"
+                      :editable="false"
+                      style="width:160px;"
+                      type="date"
+                      placeholder="选择日期时间"
+                      align="right"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      @change="startTimeChange"
+                    ></el-date-picker> 
+                      <span>-</span> 
+                      <el-date-picker
+                        size="small"
+                        v-model="end_time"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width:160px;"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        @change="endTimeChange"
+                    ></el-date-picker>
+                </el-row>
+                <el-row></el-row>
+                 <el-row>
+                   <el-col :span="24">
+                      <el-input style="width:200px;margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;<el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   </el-col>
+                  </el-row>
+
+                  <el-row>
+                      <el-table
+                          ref="singleTable"
+                          :data="patientList"
+                          highlight-current-row
+                           border
+                          @current-change="handleCurrentChange"
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="序号"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="姓名"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.name}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                  </el-row>
+               </div>
+
+                 <el-main>
+                  <div class="main newMain">
+                      
+                        
+                  <el-tabs>
+
+                   <el-tab-pane label="患者使用列表">
+                   
+                     <el-table
+                          :data="tableList"
+                          highlight-current-row
+                           border
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="名称"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.row.drug.drug_name}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="生产厂家"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{getManufacturName(scope.row.manufacturer)}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="规格&单位"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.drug.dose}}{{scope.row.drug.dose_unit}} * {{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="数量"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.count}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                      <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :page-sizes="[10, 50, 100,200,500,1000]"
+                        :page-size="10"
+                        background
+                        align="right"
+                        style="margin-top:20px;"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="total"
+                        >
+                      </el-pagination>
+                    </el-tab-pane>
+                   </el-tabs>
+                </div>
+             </el-main>
+          </el-container>
+        </el-container>
+      </el-container>
+      </div>
+    </div>
+
+</template>
+<script>
+import { getGoodPatientList,getDrugWarehouseOutDetailByPatientId } from "@/api/drug/drug"
+export default {
+  data(){
+    return{
+      zoneList:[],
+      zone_id:0,
+      tableData:[],
+      DeviceTypeType:[],
+      device_type:"",
+      forms:{},
+      start_time:"",
+      end_time:"",
+      patientList:[],
+      tableList:[],
+      keyword:"",
+      manufacturerList:[],
+      patient_id:0,
+      patient:{},
+      limit:10,
+      page:1,
+      total:0,
+    }
+  },
+  methods:{
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getDrugWarehouseOutDetailByPatientId()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getDrugWarehouseOutDetailByPatientId()
+    },
+    startTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    endTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    getlist(){
+        var params = {
+          keyword:this.keyword,
+        }
+      getGoodPatientList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.patientList = list
+          this.$refs.singleTable.setCurrentRow(this.patientList[0]);
+          this.handleCurrentChange(this.patientList[0])
+        }
+      })
+    },
+   onSearch(){
+     this.getlist()
+   },
+   handleCurrentChange(val){
+       this.patient = val
+       var params = {
+         patient_id:val.id,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page,
+       }
+     getDrugWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.tableList = list
+          this.total = response.data.data.total
+        }
+     })
+   },
+   getDrugWarehouseOutDetailByPatientId(){
+      var params = {
+         patient_id:this.patient,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page,
+       }
+     getDrugWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.tableList = list
+        }
+     })
+   },
+   getManufacturName(id){
+     var manufacturer_name = ""
+     for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+          manufacturer_name = this.manufacturerList[i].manufacturer_name
+        } 
+     }
+     return manufacturer_name
+   }
+  },
+  created(){
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+     this.getlist()
+  },
+  
+}
+</script>
+
+
+   
+<style lang="scss" scoped>
+    .zone{
+      //  margin-left: 30px;
+      //  text-align: left;
+       width: 70px;
+       display: inline-block;
+       color:#606266;
+    }
+    .disinfect{
+      position: relative;
+      .newButton{
+        // position: absolute;
+        // right: 2%;
+        // top:4px;
+        // z-index: 9;
+        margin-bottom: 10px;
+    margin-left: 90%;
+      }
+    }
+    .disinfectOne{
+      position: relative;
+      .newButtonOne{
+        position: absolute;
+         right: 0;
+         top: -10;
+         z-index: 18;
+      }
+    }
+    .but{
+      width: 200px;
+      height: 50px;
+      // border: solid 1px red;
+      margin-left: 77%;
+    }
+    .clearn{
+      width: 460px;
+      height: 50px;
+      // border:solid 1px red;
+      margin-left:650px;
+    }
+
+  .zClass{
+    width: 200px;
+    height: 200px;
+    // border:solid 1px red;
+    margin-left: 450px;
+    margin-top: 200px;
+  }
+  .warn{
+    color: red;
+    font-size: 14px;
+    width: 100%;
+    display: inline-block;
+    margin-left: 96px;
+  }
+
+  .userbutton{
+       margin-bottom: 10px;
+    margin-left: 82%
+  }
+
+</style>
+<style lang="scss">
+   .a{
+     margin-bottom: 10px;
+      margin-top: 6px;
+
+   }
+
+   .b{
+    .el-button{
+      margin-left: 90%;
+      margin-bottom: 10px;
+    }
+   }
+
+   .stoppage{
+     .el-form-item__label{
+       width:190px;
+     }
+   }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
+   .main{
+     position: relative;
+     .newButtonOne{
+       position:absolute;
+       right: 0;
+       z-index: 2;
+     }
+   }
+
+    .elbutton{
+      // border: solid 1px red;
+      height: 50px;
+      width: 400px;
+      margin-left: 650px;
+    }
+  // .el-form-item__label {
+  //   width: 130px;
+  //   font-size: 14px;
+  // }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
+
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
+.el-main{
+  padding-top: 0px;
+}
+.newMain{
+  .el-form-item__label{
+    width: 104px;
+  }
+}
+.newDisinfectOne{
+  .el-input--prefix .el-input__inner{
+    padding-left: 15px
+  }
+}
+.stoppage{
+  .el-form-item__label{
+    width: 18%;
+  }
+}
+.newItem{
+  .el-form-item__label{
+    width: 130px;
+  }
+}
+.formItem{
+  .el-form-item__label{
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname{
+  .el-form-item__label{
+    width: 60px;
+  }
+}
+::-webkit-scrollbar{
+  height: 20px;
+}
+</style>

src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue

@@ -0,0 +1,532 @@
+<template>
+  <div class="main-contain">
+     <div class="app-container ">
+        <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+         <div>
+          <span>有效期:</span>
+          <el-select v-model="expiry_type" style="width:200px;margin-right:10px;" placeholder="请选择"
+            filterable
+            @change="changeExpriyList">
+              <el-option
+                v-for="item in expriyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+          </el-select>
+          <span>仓库名称:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称或生产厂商" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
+         </div>
+        </div>
+           <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+          >
+            <el-table-column label="药品类型" align="center">
+              <template slot-scope="scope">
+                 {{getDrugTypeName(scope.row.XtBaseDrug.drug_type)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="药品名称" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.XtBaseDrug.drug_name}}
+              </template>
+            </el-table-column>
+            <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.XtBaseDrug.dose}}{{scope.row.XtBaseDrug.dose_unit}}*{{scope.row.XtBaseDrug.min_number}}{{scope.row.XtBaseDrug.min_unit}}/{{scope.row.XtBaseDrug.max_unit}}
+                </template>
+            </el-table-column>
+            <el-table-column label="生产厂商" align="center">
+              <template slot-scope="scope">
+                 {{getManufacturName(scope.row.manufacturer)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="进货价" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.price}}
+              </template>
+            </el-table-column>
+            <el-table-column label="库存" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.stock_max_number}}{{scope.row.XtBaseDrug.max_unit}}{{scope.row.stock_min_number}}{{scope.row.XtBaseDrug.min_unit}}
+              </template>
+            </el-table-column>
+        
+            <el-table-column label="批号" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.batch_number}}
+               </template>
+            </el-table-column>
+          
+            <el-table-column label="有效期" align="center">
+              <template slot-scope="scope">
+                {{getTime(scope.row.expiry_date)}}
+             </template>
+            </el-table-column>
+
+            <el-table-column label="剩余天数" align="center">
+              <template slot-scope="scope">
+                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+              </template>
+            </el-table-column>
+          </el-table>
+           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+            </el-pagination>
+     </div>
+
+
+
+   
+
+  </div>
+</template>
+<script>
+import { getStorehouseList,getDrugExpiryDateQuery } from "@/api/drug/drug"
+import {
+  getStockDrugCount
+} from "@/api/stock";
+import { uParseTime } from '@/utils/tools'
+import moment from 'moment';
+export default {
+
+  data(){
+    return{
+     tableList:[],
+     goodList:[
+      {id:1,name:"全部耗材"},
+      {id:2,name:"库存预警"},
+     ],
+     houseList:[],
+     storehouse_id:0,
+     good_type:1,
+     multipleSelection: [],
+     signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+     manufacturerList:[],
+     limit:10,
+     page:1,
+     total:0,
+     limitone:10,
+     pageone:1,
+     totalone:0,
+     keyword:"",
+     goodTypeList:[],
+     start_time:"",
+     end_time:"",
+     countList:[],
+     outCountList:[],
+     autoCountList:[],
+     cancelCountList:[],
+     org_id:this.$store.getters.xt_user.org_id,
+     dialogVisible:false,
+     start_first_time:"",
+     end_first_time:"",
+     tableData:[],
+     good_id:0,
+     patientList:[],
+     good_name:"",
+     specification_name:"",
+     expiry_type:0,
+     expriyList:[
+      {id:0,name:"全部"},
+      {id:1,name:"已过期"},
+      {id:2,name:"30天内过期"},
+      {id:3,name:"90天内过期"},
+      {id:4,name:"180天内过期"},
+      {id:5,name:"1年内过期"},
+     ],
+     nowtime:0,
+     start_time:"",
+     drugTypeList:[],
+    }
+  
+  },
+  methods:{
+    changeStorehouseName(){
+      this.getlist()
+    },
+    changeGoodName(){
+
+    },
+    getStorehouseList(){
+      getStorehouseList().then(response=>{
+         if(response.data.state == 1){
+           var houseList = response.data.data.list
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList.push(obj)
+           for(let i=0;i<houseList.length;i++){
+             this.houseList.push(houseList[i])
+           }
+           this.manufacturerList = response.data.data.manufacturerList
+           this.goodTypeList = response.data.data.goodTypeList
+           this.patientList = response.data.data.patientList
+         }
+      })
+    },
+    getlist(){
+        var params = {
+          storehouse_id:this.storehouse_id,
+          expiry_type:this.expiry_type,
+          keyword:this.keyword,
+          page:this.page,
+          limit:this.limit,
+          start_time:this.start_time,
+        }
+      getDrugExpiryDateQuery(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            this.tableList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            this.total = response.data.data.total
+            this.nowtime = response.data.data.nowtime
+            this.drugTypeList =  response.data.data.drugTypeList
+         }
+      })
+    },
+    getManufacturName(id){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+        }
+      }
+      return manufacturer_name
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+    handleSizeChangeOne(val) {
+      this.limitone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+    handleCurrentChangeOne(val) {
+      this.pageone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
+   seach(){
+    this.getlist()
+   },
+   getDrugTypeName(id){
+     var name = ""
+     for(let i=0;i<this.drugTypeList.length;i++){
+       if(id == this.drugTypeList[i].value){
+         name = this.drugTypeList[i].name
+       }
+     }
+     return name
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.houseList.length;i++){
+       if(id == this.houseList[i].id){
+         storehouse_name = this.houseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+    getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCountInfo(cancel_stock_info,storehouse_id){
+     var count = 0 
+     if(cancel_stock_info.length >0){
+        for(let i=0;i<cancel_stock_info.length;i++){
+          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+              count += cancel_stock_info[i].count
+          }
+        }
+     }
+     return count
+   },
+   getWareOutInfoCount(warehouse_out_info,storehouse_id){
+     var count = 0
+     if(warehouse_out_info.length > 0){
+       for(let i=0;i<warehouse_out_info.length;i++){
+         if(storehouse_id == warehouse_out_info[i].storehouse_id){
+            count +=warehouse_out_info[i].count
+         }
+       }
+     }
+     return count
+   },
+   getInCount(id){
+      var count= 0
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   startFirstTimeChange(){
+    
+   },
+   endEndTimeChange(){
+
+   },
+  getTime(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d}')
+   }
+   },
+  getName(id){
+    var name = ""
+    for(let i=0;i<this.patientList.length;i++){
+      if(id == this.patientList[i].id){
+        name = this.patientList[i].name
+      }
+    }
+    return name
+  },
+  getDaysBetween(dateString1, dateString2) {
+    let startDate = Date.parse(dateString1);
+    let endDate = Date.parse(dateString2);
+    return (startDate - endDate ) / (1 * 24 * 60 * 60 * 1000);
+  },
+  changeExpriyList(val){
+   
+    if(val ==0){
+     this.start_time = ""
+     this.getlist()
+    }
+    //已过期
+    if(val == 1){
+      this.getlist()
+    }
+    //30天内过期
+    if(val == 2){
+      var time = this.addDate(this.getTime(this.nowtime),30)
+      this.start_time = time
+      this.getlist()
+    }
+    //90天内过期
+    if(val == 3){
+       var time = this.addDate(this.getTime(this.nowtime),90)
+      this.start_time = time
+      this.getlist()
+    }
+    //180天内过期
+    if(val == 4){
+       var time = this.addDate(this.getTime(this.nowtime),180)
+       this.start_time = time
+    }
+    //1年以后
+    if(val == 5){
+       var time = this.addDate(this.getTime(this.nowtime),365)
+       this.start_time = time
+       this.getlist()
+    }
+  
+  },
+  addDate(date, days) {
+    var date = new Date(date);
+    date.setDate(date.getDate() + days);
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var mm = "'" + month + "'";
+    var dd = "'" + day + "'";
+    if(mm.length == 3) {
+      month = "0" + month;
+    }
+    if(dd.length == 3) {
+      day = "0" + day;
+    }
+    var time = year + "-" + month + "-" + day
+    return time;
+  },
+  },
+  created(){
+    this.getStorehouseList()
+    this.getlist()
+  }
+}
+</script>
+

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+     
+    </div>
+     <div class="app-container ">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="库存查询" name="first">
+              <DrugQuery></DrugQuery>
+            </el-tab-pane>
+            <el-tab-pane label="进销存查询" name="second">
+               <PurchaseDrugQuery></PurchaseDrugQuery>
+           </el-tab-pane>
+            <el-tab-pane label="有效期查询" name="third">
+                <ExpiryDateDrugQuery></ExpiryDateDrugQuery>
+            </el-tab-pane>
+            <el-tab-pane label="患者查询" name="fourth">
+                <DrugPatientQuery></DrugPatientQuery>
+            </el-tab-pane>
+        </el-tabs>
+     </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import DrugQuery from "@/xt_pages/stock/drugs/components/drugQuery"
+import ExpiryDateDrugQuery from "@/xt_pages/stock/drugs/components/expiryDateDrugQuery"
+import PurchaseDrugQuery from "@/xt_pages/stock/drugs/components/purchaseDrugQuery"
+import DrugPatientQuery from "@/xt_pages/stock/drugs/components/drugPatientQuery"
+export default {
+  name: "stockNewQuery",
+  
+  components: {
+    BreadCrumb,
+    DrugQuery,
+    ExpiryDateDrugQuery,
+    PurchaseDrugQuery,
+    DrugPatientQuery
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "库存管理" },
+        { path: "/stock/query", name: "库存查询" }
+      ],
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      activeName: 'first'
+    };
+  },
+  methods:{
+    handleClick(){
+        
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+/* 合并表格线样式 */
+
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+  /* height: 44px; */
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+  min-height: 44px;
+}
+.spanClass .cell tr:last-of-type td{
+  border-bottom: none;
+}
+
+</style>

src/xt_pages/stock/query/patientQuery.vue

@@ -130,6 +130,18 @@
                      </el-table-column>
 
                      </el-table>
+                      <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :page-sizes="[10, 50, 100,200,500,1000]"
+                        :page-size="10"
+                        background
+                        align="right"
+                        style="margin-top:20px;"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="total"
+                        >
+                      </el-pagination>
                     </el-tab-pane>
                    </el-tabs>
                 </div>
@@ -160,9 +172,20 @@ export default {
       manufacturerList:[],
       patient_id:0,
       patient:{},
+      limit:10,
+      page:1,
+      total:0,
     }
   },
   methods:{
+   handleSizeChange(val) {
+      this.limit = val;
+      this.getWarehouseOutDetailByPatientId()
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getWarehouseOutDetailByPatientId()
+    },
     startTimeChange(){
       this.handleCurrentChange(this.patient)
     },
@@ -191,15 +214,33 @@ export default {
          patient_id:val.id,
          start_time:this.start_time,
          end_time:this.end_time,
+         limit:this.limit,
+         page:this.page
        }
      getWarehouseOutDetailByPatientId(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+          this.total = response.data.data.total
           this.manufacturerList = response.data.data.manufacturerList
           this.tableList = list
         }
      })
    },
+   getWarehouseOutDetailByPatientId(){
+     var params = {
+        patient_id:this.patient,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+    getWarehouseOutDetailByPatientId().then(response=>{
+       if(response.data.state == 1){
+        var list = response.data.data.list
+        this.total = response.data.data.total
+        this.manufacturerList = response.data.data.manufacturerList
+        this.tableList = list
+       }
+    })
+   },
    getManufacturName(id){
      var manufacturer_name = ""
      for(let i=0;i<this.manufacturerList.length;i++){

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -196,6 +196,17 @@
                   >
                 </template>
               </el-table-column>
+
+              <el-table-column
+                label="推送截止日期"
+                min-width="80"
+                property="execution_frequency"
+                align="center"
+              >
+               <template slot-scope="scope">
+                 {{scope.row.push_start_time}}
+                </template>
+              </el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -559,6 +570,19 @@
               </el-checkbox-group>
             </el-form-item>
           </el-col>
+
+          <el-col :span="24">
+             <el-form-item label="推送截止日期:">
+                 <el-date-picker
+                   v-model="nameForm.push_start_time"
+                   type="date"
+                   format="yyyy-MM-dd"
+                   value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsOne"
+                  placeholder="推送截止日期">
+                 </el-date-picker>
+              </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -586,10 +610,17 @@ import {
   StopDoctorAdvice
 } from "@/api/advice";
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import { uParseTime } from "@/utils/tools";
 export default {
   name: "EditGroupAdvice",
   data() {
     return {
+      pickerOptionsOne: {
+      // 限制收货时间不让选择今天以前的
+      disabledDate(time) {
+        return time.getTime() < Date.now() - 8.64e7;
+      },
+      },
       weeks: [],
       editRowKey: 0,
       templateFormVisible: false,
@@ -632,7 +663,8 @@ export default {
         way:0,
         drug_id:0,
         src_type:"",
-        drug_name_id:0
+        drug_name_id:0,
+        push_start_time:"",
       },
 
       drugOptions: [],
@@ -898,11 +930,11 @@ export default {
                 groupno: _this.groupForm.groupno,
                 frequency_type: _this.nameForm.frequency_type,
                 day_count: _this.nameForm.day_count.toString(),
-                week_days: this.weeks
-                  .filter(function(s) {
+                week_days: this.weeks.filter(function(s) {
                     return s && s.trim();
-                  })
-                  .join(",")
+                  }).join(","),
+                push_start_time: _this.nameForm.push_start_time,
+                
               };
             } else {
               submitForm = {
@@ -931,6 +963,7 @@ export default {
                 frequency_type: 0,
                 day_count: "0",
                 week_days: "",
+                push_start_time:_this.nameForm.push_start_time
 
               };
             }
@@ -991,9 +1024,10 @@ export default {
                     _this.adviceTableData[index].frequency_type = advice.frequency_type;
                     _this.adviceTableData[index].day_count = advice.day_count;
                     _this.adviceTableData[index].week_day = advice.week_day;
-                    _this.adviceTableData[index].way = advice.way,
-                    _this.adviceTableData[index].drug_id = advice.drug_id,
+                    _this.adviceTableData[index].way = advice.way
+                    _this.adviceTableData[index].drug_id = advice.drug_id
                     _this.adviceTableData[index].drug_name_id = advice.drug_name_id
+                    _this.adviceTableData[index].push_start_time = advice.push_start_time
                     break;
                   }
                 }
@@ -1024,6 +1058,7 @@ export default {
                           _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way
                           _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id
                           _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id
+                          _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time
                           _this.$set(
                             _this.groupForm.adviceNames[index].children,
                             j,
@@ -1053,6 +1088,7 @@ export default {
                       _this.groupForm.adviceNames[index].way = _this.nameForm.way
                       _this.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
                       _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
+                       _this.groupForm.adviceNames[index].push_start_time = _this.nameForm.push_start_time;
                       console.log(_this.weeks);
                       _this.$set(
                         _this.groupForm.adviceNames,
@@ -1091,7 +1127,7 @@ export default {
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
                 groupno: _this.groupForm.groupno,
-
+                push_start_time:_this.groupForm.push_start_time
               };
 
               let mode = "";
@@ -1204,6 +1240,7 @@ export default {
                     drug_id:_this.nameForm.drug_id,
                     way:_this.nameForm.way,
                     drug_name_id:_this.nameForm.drug_name_id,
+                    push_start_time:_this.nameForm.push_start_time,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -1403,7 +1440,8 @@ export default {
         index: 0,
         children: [],
         parent_row: this.groupSelectRow.row_key,
-        id: 0
+        id: 0,
+        push_start_time:"",
       };
       this.isChild = true;
       this.nameFormVisible = true;
@@ -1445,6 +1483,7 @@ export default {
           frequency_type: this.groupSelectRow.frequency_type,
           drug_id:0,
           drug_name_id:0,
+          push_start_time:this.groupSelectRow.push_start_time,
           way:0,
         };
 
@@ -1476,7 +1515,8 @@ export default {
           parent_row: 0,
           day_count: "",
           week_days: "",
-          frequency_type: 0
+          frequency_type: 0,
+          push_start_time:"",
         };
         this.nameFormTitle = "新增医嘱内容";
       }
@@ -2485,6 +2525,16 @@ export default {
 
         cb(results);
       },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
   },
   watch: {
     rowKey: function() {

src/xt_pages/user/doctorAdvice.vue

@@ -426,6 +426,16 @@
           </template>
         </el-table-column>
 
+        <el-table-column
+          label="推送截止日期"
+          width="180"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.push_start_time >0">{{scope.row.push_start_time | parseTime("{y}-{m}-{d}")}}</span>
+          </template>
+        </el-table-column>
+
         <!-- <template v-if="adviceType==3">
                     <el-table-column key="advice_doctor_3" label="开嘱医生" min-width="80"  property="advice_doctor" align="center">
                         <template slot-scope="scope">
@@ -760,6 +770,16 @@
                     >
                   </template>
                 </el-table-column>
+                <el-table-column 
+                 label="推送截止日期"
+                  min-width="80"
+                  align="center"
+                >
+                <template slot-scope="scope">
+                   {{scope.row.push_start_time}}
+                </template>
+                
+                </el-table-column>
               </el-table>
             </el-col>
           </el-row>
@@ -967,7 +987,7 @@
           ref="nameForm"
           :rules="nameRules"
           :model="nameForm"
-          label-width="90px"
+          label-width="120px"
         >
           <el-row>
             <el-col :span="10">
@@ -1130,6 +1150,8 @@
               </el-form-item>
             </el-col>
 
+           
+
             <el-col :span="12" v-if="nameForm.frequency_type == 2">
               <el-form-item prop="day_count">
                 <el-input
@@ -1153,6 +1175,19 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+               <el-form-item label="推送截止日期:">
+                 <el-date-picker
+                   v-model="nameForm.push_start_time"
+                   type="date"
+                   format="yyyy-MM-dd"
+                   value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsOne"
+                  placeholder="推送截止日期">
+                 </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -1196,7 +1231,7 @@
           ref="adviceForm"
           :rules="adviceRules"
           :model="adviceForm"
-          label-width="90px"
+          label-width="120px"
         >
           <el-row>
             <el-col :span="12">
@@ -1396,7 +1431,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+             <el-col :span="24">
+               <el-form-item label="推送截止日期:">
+                 <el-date-picker
+                   v-model="adviceForm.push_start_time"
+                   type="date"
+                   format="yyyy-MM-dd"
+                   value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsOne"
+                  placeholder="推送截止日期">
+                 </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
+
+          
           <el-form-item label="备注 :">
             <el-input type="textarea" v-model="adviceForm.remark"></el-input>
           </el-form-item>
@@ -1404,6 +1454,8 @@
           <el-form-item label="开嘱医生 :">
             <span>{{ adminusername }} </span>
           </el-form-item>
+
+        
         </el-form>
         <div slot="footer" class="dialog-footer">
           <template v-if="isEdit">
@@ -1983,6 +2035,12 @@ export default {
 
   data() {
     return {
+      pickerOptionsOne: {
+        // 限制收货时间不让选择今天以前的
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
       weeks: [],
       is_open_remind: "",
       checkList: [],
@@ -2088,6 +2146,7 @@ export default {
         drug_id:0,
         way:0,
         drug_name_id:0,
+        push_start_time:"",
       },
       nameForm: {
         advice_name: "",
@@ -2104,7 +2163,8 @@ export default {
         isEdit: 0,
         index: 0,
         id: 0,
-        children: []
+        children: [],
+        push_start_time:"",
       },
       groupForm: {
         day_count: "",
@@ -2194,6 +2254,7 @@ export default {
       drug_id: 0,
       src_type:"",
       org_id:0,
+     
     };
   },
   methods: {
@@ -2266,6 +2327,7 @@ export default {
               this.dialogFormVisible = false;
               this.resetForm(formName);
               var advice = response.data.data.advice;
+              
               this.adviceTableData[this.currentIndex].drug_spec =
                 advice.drug_spec;
               this.adviceTableData[this.currentIndex].drug_spec_unit =
@@ -2291,6 +2353,7 @@ export default {
               this.adviceTableData[this.currentIndex].advice_doctor =
                 advice.advice_doctor;
               this.adviceTableData[this.currentIndex].remark = advice.remark;
+               this.adviceTableData[this.currentIndex].push_start_time = advice.push_start_time;
               this.currentIndex = -1;
               return false;
             }
@@ -3005,7 +3068,8 @@ export default {
         doctor: groups[0].advice_doctor,
 
         remark: groups[0].remark,
-        groupno: groupno
+        groupno: groupno,
+        
       };
       console.log("到了",groups[0]);
 
@@ -3049,7 +3113,8 @@ export default {
           children: [],
           parent_row: 0,
           row_key: this.rowKey,
-          table: []
+          table: [],
+          push_start_time:uParseTime(groups[index].push_start_time, "{y}-{m}-{d}")
         };
 
         if (item.id in childMap) {
@@ -3076,7 +3141,8 @@ export default {
               id: childMap[item.id][key].id,
               children: [],
               parent_row: item.row_key,
-              row_key: this.rowKey
+              row_key: this.rowKey,
+              push_start_time:uParseTime(childMap[item.id][key].push_start_time, "{y}-{m}-{d}")
             };
             item.children.push(child);
           }
@@ -3132,7 +3198,8 @@ export default {
         advice_doctor: row.advice_doctor,
         remark: "",
         parent_id: row.parent_id > 0 ? row.parent_id : row.id,
-        drug_id:""
+        drug_id:"",
+        push_start_time:"",
       };
       this.dialogFormVisible = true;
     },
@@ -3386,14 +3453,15 @@ export default {
         single_dose: row.single_dose != 0 ? row.single_dose : "",
         single_dose_unit: row.single_dose_unit,
         prescribing_number:
-          row.prescribing_number != 0 ? row.prescribing_number : "",
+        row.prescribing_number != 0 ? row.prescribing_number : "",
         prescribing_number_unit: row.prescribing_number_unit,
         delivery_way: row.delivery_way,
         execution_frequency: row.execution_frequency,
         advice_doctor: row.advice_doctor,
         remark: row.remark,
         id: row.id,
-        parent_id: row.parent_id
+        parent_id: row.parent_id,
+        push_start_time:uParseTime(row.push_start_time, "{y}-{m}-{d}"),
       };
     },
     getList() {
@@ -4100,6 +4168,7 @@ export default {
                       _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
                       _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
                       _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
+                       _this.groupForm.adviceNames[index].children[j].push_start_time = _this.nameForm.push_start_time;
 
                       _this.$set(
                         _this.groupForm.adviceNames[index].children,
@@ -4114,31 +4183,19 @@ export default {
               }
             } else {
               for (let index = 0; index < ale; index++) {
-                if (
-                  _this.groupSelectRow.row_key ==
-                  _this.groupForm.adviceNames[index].row_key
-                ) {
+                if (_this.groupSelectRow.row_key == _this.groupForm.adviceNames[index].row_key) {
                   _this.groupForm.adviceNames[index].advice_name =_this.nameForm.advice_name;
-                  _this.groupForm.adviceNames[index].advice_desc =
-                    _this.nameForm.advice_desc;
-
-                  _this.groupForm.adviceNames[index].single_dose =
-                    "" + _this.nameForm.single_dose;
-                  _this.groupForm.adviceNames[index].single_dose_unit =
-                    _this.nameForm.single_dose_unit;
-                  _this.groupForm.adviceNames[index].drug_spec =
-                    "" + _this.nameForm.drug_spec;
-                  _this.groupForm.adviceNames[index].drug_spec_unit =
-                    _this.nameForm.drug_spec_unit;
-                  _this.groupForm.adviceNames[index].prescribing_number =
-                    "" + _this.nameForm.prescribing_number;
-                  _this.groupForm.adviceNames[index].prescribing_number_unit =
-                    _this.nameForm.prescribing_number_unit;
-                  _this.groupForm.adviceNames[index].delivery_way =
-                    _this.nameForm.delivery_way;
-                  _this.groupForm.adviceNames[index].execution_frequency =
-                    _this.nameForm.execution_frequency;
-
+                  _this.groupForm.adviceNames[index].advice_desc =_this.nameForm.advice_desc;
+
+                  _this.groupForm.adviceNames[index].single_dose = "" + _this.nameForm.single_dose;
+                  _this.groupForm.adviceNames[index].single_dose_unit =_this.nameForm.single_dose_unit;
+                  _this.groupForm.adviceNames[index].drug_spec = "" + _this.nameForm.drug_spec;
+                  _this.groupForm.adviceNames[index].drug_spec_unit =_this.nameForm.drug_spec_unit;
+                  _this.groupForm.adviceNames[index].prescribing_number = "" + _this.nameForm.prescribing_number;
+                  _this.groupForm.adviceNames[index].prescribing_number_unit = _this.nameForm.prescribing_number_unit;
+                  _this.groupForm.adviceNames[index].delivery_way = _this.nameForm.delivery_way;
+                  _this.groupForm.adviceNames[index].execution_frequency = _this.nameForm.execution_frequency;
+                  _this.groupForm.adviceNames[index].push_start_time = _this.nameForm.push_start_time
                   if (_this.nameForm.frequency_type == 1) {
                     _this.groupForm.adviceNames[index].frequency_type =
                       _this.nameForm.frequency_type;
@@ -4657,7 +4714,17 @@ export default {
         this.nameForm.drug_id = tmp.id
         console.log("isiisisthis.adviceForm",this.adviceForm)
         this.adviceForm.drug_id = tmp.id
-      }
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
   },
   watch: {
     adviceTableData: function() {
@@ -4752,6 +4819,7 @@ export default {
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+
 .printForm {
   width: 960px;
 }