1

src/api/schedule.js

@@ -1,18 +1,15 @@
 import request from '@/utils/request'
 
-export function getWeekPanels(t,patitionId) {
-  
+export function getWeekPanels(t, patitionId) {
   return request({
-    url: '/api/schedule/weekpanel?data=' + t+"&patitionid="+patitionId,
+    url: '/api/schedule/weekpanel?data=' + t + '&patitionid=' + patitionId,
     method: 'get'
   })
 }
 
-
-export function getWeekPanelsOne(t,patitionId){
-  
+export function getWeekPanelsOne(t, patitionId) {
   return request({
-    url: '/api/schedule/weekpanelone?data=' + t+"&patitionid="+patitionId,
+    url: '/api/schedule/weekpanelone?data=' + t + '&patitionid=' + patitionId,
     method: 'get'
   })
 }
@@ -21,15 +18,15 @@ export function getSchedules(params) {
   return request({
     url: '/api/schedule/schedules',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
-export function getSchedulesOne(params){
+export function getSchedulesOne(params) {
   return request({
     url: '/api/schedule/schedulesone',
     method: 'get',
-    params:params,
+    params: params
   })
 }
 
@@ -72,12 +69,12 @@ export function GetPatientSchedules(id) {
   })
 }
 
-export function GetWeekSchedulePrintInitData(date,type) {
+export function GetWeekSchedulePrintInitData(date, type) {
   return request({
     url: '/api/schedule/print/initdata',
     method: 'get',
     params: {
-      date: date,
+      date: date
     }
   })
 }
@@ -106,24 +103,21 @@ export function getScheduleWeekDay(params) {
   })
 }
 
-
-export function exportSchedule(params,date) {
+export function exportSchedule(params, date) {
   return request({
-    url: '/api/schedule/export?date='+date,
+    url: '/api/schedule/export?date=' + date,
     method: 'Post',
     data: params
   })
 }
 
-
 export function initDate() {
   return request({
     url: '/api/excel_date/init',
-    method: 'Get',
+    method: 'Get'
   })
 }
 
-
 export function exportScheduleTemplate(params) {
   return request({
     url: '/api/schedule_template/export',
@@ -132,110 +126,106 @@ export function exportScheduleTemplate(params) {
   })
 }
 
-
-export function getNextScheduleWeekDay(params){
-  
+export function getNextScheduleWeekDay(params) {
   return request({
-    url:"/api/schedule/getnextscheduleweekday",
-    method:"get",
-    params:params
+    url: '/api/schedule/getnextscheduleweekday',
+    method: 'get',
+    params: params
   })
 }
 
+export function getThreeWeekList(params) {
+  return request({
+    url: '/api/schedule/getthreeweeklist',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getThreeWeekList(params){
-  
+export function getAllZones(params) {
   return request({
-    url:"/api/schedule/getthreeweeklist",
-    method:"get",
-    params:params
+    url: '/api/schedule/getallzones',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAllZones(params){
-  
+export function copyPatientSchedule(params) {
   return request({
-    url:"/api/schedule/getallzones",
-    method:"get",
-    params:params
+    url: '/api/schedule/copypatientschedules',
+    method: 'Get',
+    params: params
   })
 }
 
-export function copyPatientSchedule(params){
+export function saveRemindPrint(params) {
   return request({
-    url:"/api/schedule/copypatientschedules",
-    method:"Get",
-    params:params
+    url: '/api/schedule/saveremindprint',
+    method: 'get',
+    params: params
   })
 }
 
-export function saveRemindPrint(params){
-   return request({
-     url:"/api/schedule/saveremindprint",
-     method:"get",
-     params:params
-   })
+export function getRemindPrintList(params) {
+  return request({
+    url: '/api/schedule/getremindprintlist',
+    method: 'get',
+    params: params
+  })
 }
 
-export function getRemindPrintList(params){
-   
+export function getScheduleList(params) {
   return request({
-    url:"/api/schedule/getremindprintlist",
-    method:"get",
-    params:params
+    url: '/api/schedule/getbloodschedulelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getScheduleList(params){
-  
+export function getPrintList(params) {
   return request({
-    url:"/api/schedule/getbloodschedulelist",
-    method:"get",
-    params:params,
+    url: '/api/schedule/getprintlist',
+    method: 'Get',
+    params: params
   })
 }
 
-export function getPrintList(params){
-   
+export function getAllZoneList(params) {
   return request({
-    url:"/api/schedule/getprintlist",
-    method:"Get",
-    params:params,
+    url: '/api/schedule/getallzonelist',
+    method: 'get',
+    params: params
   })
 }
 
-export function getAllZoneList(params){
-  
+export function getPatientSheduleCount(params) {
   return request({
-    url:"/api/schedule/getallzonelist",
-    method:"get",
-    params:params
+    url: '/api/schedule/getpatientschedulecount',
+    method: 'get',
+    params: params
   })
 }
 
-export function getPatientSheduleCount(params){
-   
+export function postScheduleTemplate(params) {
   return request({
-    url:"/api/schedule/getpatientschedulecount",
-    method:"get",
-    params:params
+    url: '/api/schedule/postscheduletemplate',
+    method: 'get',
+    params: params
   })
 }
 
-export function postScheduleTemplate(params){
-   
+export function getScheduleTemplate(params) {
   return request({
-    url:"/api/schedule/postscheduletemplate",
-    method:"get",
-    params:params
+    url: '/api/schedule/getscheduletemplate',
+    method: 'get',
+    params: params
   })
 }
 
-export function getScheduleTemplate(params){
-  
+export function getNextWeekPanels(params) {
   return request({
-    url:"/api/schedule/getscheduletemplate",
-    method:"get",
-    params:params,
+    url: '/api/schedule/getnextweekpanels',
+    method: 'get',
+    params: params
   })
-}
+}

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -422,7 +422,7 @@
         }
         let searchArray = [];
         PostSearch(key).then(response => {
-          if (response.data.state == 1) {
+          if (response.data.state == 1) {balance_accounts_type
             searchArray = response.data.data.patient;
             cb(searchArray)
           } else {

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -117,15 +117,15 @@
         efs: []
       }
     }, mounted() {
-      getInitData().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.drugways = response.data.data.drugways
-          this.efs = response.data.data.efs
-        }
-      })
+      // getInitData().then(response => {
+      //   if (response.data.state == 0) {
+      //     this.$message.error(response.data.msg)
+      //     return false
+      //   } else {
+      //     this.drugways = response.data.data.drugways
+      //     this.efs = response.data.data.efs
+      //   }
+      // })
     }, methods:  {
 
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2,7 +2,7 @@
     <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.4)">
+    element-loading-background="rgba(0, 0, 0, 0.8)">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
@@ -4252,17 +4252,5 @@
     }
 
     }
-    .el-icon-loading{
-      font-size: 30px;
-    }
-    .el-loading-spinner .el-loading-text{
-      font-size: 30px;
-    }
-    // .outpatientChargesManagement{
-    //   .el-loading-mask{
-    //     z-index: 5000;
-    //   }
-    // }
-    
 </style>
 

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -224,6 +224,12 @@
         let allPrescriptions = [];
         let targetPrescriptions = [];
         let prescriptions = [];
+
+
+
+
+
+
         for (let i = 0; i < this.allPrescription.length; i++) {
           for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
             checkGroup.push(this.allPrescription[i].check_group[a])
@@ -240,6 +246,29 @@
           }
         }
 
+        for (let i = 0; i < targetPrescriptions.length; i++) {
+          var prescription = targetPrescriptions[i];
+          for (let b = 0; b < prescription.doctor_advice.length; b++) {
+            console.log(prescription.doctor_advice[b].drug.is_special_diseases)
+            if (prescription.med_type == "14" && prescription.doctor_advice[b].drug.is_special_diseases != 1) {
+              prescription.doctor_advice.splice(b--,1)
+            }
+          }
+          for (let b = 0; b < prescription.project.length; b++) {
+            if(prescription.project[b].type == 2){
+              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                prescription.project.splice(b--,1)
+              }
+            }else if(prescription.project[b].type == 3){
+              if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                prescription.project.splice(b--,1)
+              }
+            }
+          }
+        }
+
+
+
         if (targetPrescriptions.length > 0) {
           for (let i = 0; i < targetPrescriptions.length; i++) {
             var prescription = targetPrescriptions[i];
@@ -264,6 +293,7 @@
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
                 groupno: index,
+                hosp_appr_flag:"1",
               };
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2185,11 +2185,11 @@
       },
       open(index, isLoading) {
         if (this.dayorMonth == 'day') {
-
           if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
             this.$message.error('请先开处方')
             return
           }
+
         }
 
         if (this.dayorMonth == 'day') {
@@ -2233,6 +2233,13 @@
               }
           }
           if (index == 1) {
+            for(let i =0; i < this.prescriptions.length; i++){
+              if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length == 0) {
+                this.$message.error('处方内容不能为空')
+                return
+              }
+            }
+
             let params = {
               p_type: 2,
               patient_id: this.patientInfo.id,
@@ -2261,7 +2268,6 @@
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
                 this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
 
-
               }
 
               for (let b = 0; b < this.prescriptions[i].project.length; b++) {
@@ -2656,7 +2662,6 @@
       comfirm() {
 
         if (this.curDrugs.length > 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -2664,10 +2669,8 @@
               }
 
             }
-          }
         }
         if (this.teamList.length > 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.teamList.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
@@ -2675,9 +2678,7 @@
               }
 
             }
-          }
 
-          if(this.$store.getters.xt_user.org_id == 10138){
             let arr = this.teamList
             let newArr = []
             arr.map(item => {
@@ -2689,21 +2690,17 @@
               }
             })
             this.teamList = newArr
-          }
         }
 
 
 
         if (this.curDrugs.length == 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
-
             }
-          }
         }
 
         // if (this.curPrescriptions.order_status == 2) {
@@ -2832,7 +2829,8 @@
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b],
-                  groupno: index + temp_index
+                  groupno: index + temp_index,
+                  hosp_appr_flag:"1",
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -297,6 +297,28 @@
           }
         }
 
+        for (let i = 0; i < targetPrescriptions.length; i++) {
+          var prescription = targetPrescriptions[i];
+          for (let b = 0; b < prescription.doctor_advice.length; b++) {
+            console.log(prescription.doctor_advice[b].drug.is_special_diseases)
+            if (prescription.med_type == "14" && prescription.doctor_advice[b].drug.is_special_diseases != 1) {
+              prescription.doctor_advice.splice(b--,1)
+            }
+          }
+          for (let b = 0; b < prescription.project.length; b++) {
+            if(prescription.project[b].type == 2){
+              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                prescription.project.splice(b--,1)
+              }
+            }else if(prescription.project[b].type == 3){
+              if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                prescription.project.splice(b--,1)
+              }
+            }
+          }
+        }
+
+
         if (targetPrescriptions.length > 0) {
           for (let i = 0; i < targetPrescriptions.length; i++) {
             var prescription = targetPrescriptions[i];
@@ -321,6 +343,7 @@
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
                 groupno:index,
+                hosp_appr_flag:"1"
               };
 
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1353,7 +1353,8 @@
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
-                    groupno: prescription.advices[b].groupno
+                    groupno: prescription.advices[b].groupno,
+                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
 
                   }
                   tempAdvice.push(obj)
@@ -1435,6 +1436,29 @@
             } else {
 
               if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
+                for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
+                  var prescription = response.data.data.sch_prescriptions[i];
+                  for (let b = 0; b < prescription.advices.length; b++) {
+                    console.log(prescription.advices[b].drug.is_special_diseases)
+                    if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
+                      prescription.advices.splice(b--,1)
+                    }
+                  }
+                  for (let b = 0; b < prescription.project.length; b++) {
+                    if(prescription.project[b].type == 2){
+                      if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                        prescription.project.splice(b--,1)
+                      }
+                    }else if(prescription.project[b].type == 3){
+                      if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                        prescription.project.splice(b--,1)
+                      }
+                    }
+                  }
+                }
+
+
+
 
                 for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                   var prescription = response.data.data.sch_prescriptions[i]
@@ -1460,7 +1484,9 @@
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
                       drug: prescription.advices[b].drug,
-                      groupno: index
+                      groupno: index,
+                      hosp_appr_flag:"1",
+
 
                     }
 
@@ -1625,8 +1651,8 @@
 
                   this.month_prescriptions = []
 
-                  var month_prescriptions = response.data.data.month_prescriptions
-                  this.setMonthPrescription(month_prescriptions)
+                  // var month_prescriptions = response.data.data.month_prescriptions
+                  // this.setMonthPrescription(month_prescriptions)
 
                   this.patientInfo = response.data.data.xt_info
                   this.hisPatientInfo = response.data.data.his_info
@@ -1710,7 +1736,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -1792,6 +1820,28 @@
 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
 
+                      for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
+                        var prescription = response.data.data.sch_prescriptions[i];
+                        for (let b = 0; b < prescription.advices.length; b++) {
+                          console.log(prescription.advices[b].drug.is_special_diseases)
+                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
+                            prescription.advices.splice(b--,1)
+                          }
+                        }
+                        for (let b = 0; b < prescription.project.length; b++) {
+                          if(prescription.project[b].type == 2){
+                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }else if(prescription.project[b].type == 3){
+                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }
+                        }
+                      }
+
+
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
                         let tempAdvice = []
@@ -1816,7 +1866,9 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
 
                           }
                           console.log('看看数据1：')
@@ -2079,8 +2131,8 @@
 
                   this.month_prescriptions = []
 
-                  var month_prescriptions = response.data.data.month_prescriptions
-                  this.setMonthPrescription(month_prescriptions)
+                  // var month_prescriptions = response.data.data.month_prescriptions
+                  // this.setMonthPrescription(month_prescriptions)
 
                   this.patientInfo = response.data.data.xt_info
                   this.hisPatientInfo = response.data.data.his_info
@@ -2163,7 +2215,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -2237,6 +2291,27 @@
                   } else {
 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
+                      for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
+                        var prescription = response.data.data.sch_prescriptions[i];
+                        for (let b = 0; b < prescription.advices.length; b++) {
+                          console.log(prescription.advices[b].drug.is_special_diseases)
+                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
+                            prescription.advices.splice(b--,1)
+                          }
+                        }
+                        for (let b = 0; b < prescription.project.length; b++) {
+                          if(prescription.project[b].type == 2){
+                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }else if(prescription.project[b].type == 3){
+                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }
+                        }
+                      }
+
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
@@ -2262,7 +2337,10 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
+
 
                           }
                           console.log('看看数据2：')
@@ -2512,8 +2590,8 @@
 
                 this.month_prescriptions = []
 
-                var month_prescriptions = response.data.data.month_prescriptions
-                this.setMonthPrescription(month_prescriptions)
+                // var month_prescriptions = response.data.data.month_prescriptions
+                // this.setMonthPrescription(month_prescriptions)
 
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
@@ -2596,7 +2674,9 @@
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
-                        groupno: prescription.advices[b].groupno
+                        groupno: prescription.advices[b].groupno,
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                       }
                       tempAdvice.push(obj)
@@ -2670,6 +2750,27 @@
                 } else {
 
                   if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
+                    for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
+                      var prescription = response.data.data.sch_prescriptions[i];
+                      for (let b = 0; b < prescription.advices.length; b++) {
+                        console.log(prescription.advices[b].drug.is_special_diseases)
+                        if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
+                          prescription.advices.splice(b--,1)
+                        }
+                      }
+                      for (let b = 0; b < prescription.project.length; b++) {
+                        if(prescription.project[b].type == 2){
+                          if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                            prescription.project.splice(b--,1)
+                          }
+                        }else if(prescription.project[b].type == 3){
+                          if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                            prescription.project.splice(b--,1)
+                          }
+                        }
+                      }
+                    }
+
 
                     for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                       var prescription = response.data.data.sch_prescriptions[i]
@@ -2695,7 +2796,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: index
+                          groupno: index,
+                          hosp_appr_flag: "1",
+
                         }
                         console.log('看看数据3：')
                         console.log(obj.prescribing_number_unit)
@@ -3090,7 +3193,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -3171,6 +3276,27 @@
                   } else {
 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
+                      for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
+                        var prescription = response.data.data.sch_prescriptions[i];
+                        for (let b = 0; b < prescription.advices.length; b++) {
+                          console.log(prescription.advices[b].drug.is_special_diseases)
+                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
+                            prescription.advices.splice(b--,1)
+                          }
+                        }
+                        for (let b = 0; b < prescription.project.length; b++) {
+                          if(prescription.project[b].type == 2){
+                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }else if(prescription.project[b].type == 3){
+                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }
+                        }
+                      }
+
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
@@ -3196,7 +3322,9 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
                           }
                           console.log('看看数据4：')
                           console.log(obj.prescribing_number_unit)
@@ -3612,7 +3740,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -3693,6 +3823,27 @@
                   } else {
 
                     if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
+                      for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
+                        var prescription = response.data.data.sch_prescriptions[i];
+                        for (let b = 0; b < prescription.advices.length; b++) {
+                          console.log(prescription.advices[b].drug.is_special_diseases)
+                          if (prescription.med_type == "14" && prescription.advices[b].drug.is_special_diseases != 1) {
+                            prescription.advices.splice(b--,1)
+                          }
+                        }
+                        for (let b = 0; b < prescription.project.length; b++) {
+                          if(prescription.project[b].type == 2){
+                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }else if(prescription.project[b].type == 3){
+                            if (prescription.med_type == "14" && prescription.project[b].good_info.is_special_diseases != 1) {
+                              prescription.project.splice(b--,1)
+                            }
+                          }
+                        }
+                      }
+
 
                       for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                         var prescription = response.data.data.sch_prescriptions[i]
@@ -3718,7 +3869,9 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
                           }
                           console.log('看看数据5：')
                           console.log(obj.prescribing_number_unit)

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -551,7 +551,7 @@ export default {
          }
          //第四季度
          if( this.modetype ==0 && this.quarterType == 3){
-             this.startime = moment().month(8).startOf('month').format("YYYY-MM-DD")
+             this.startime = moment().month(9).startOf('month').format("YYYY-MM-DD")
              this.endtime = moment().month(11).endOf('month').format("YYYY-MM-DD")
          }
          

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -394,7 +394,7 @@
         GetNurseWorkloadTableData(params)
           .then(rs => {
             var resp = rs.data
-
+            console.log("resp232323",resp)
             if (resp.state == 1) {
 
               let total_cure = 0

src/xt_pages/user/templateSummary.vue

@@ -672,22 +672,14 @@
               <el-form-item>
                 <span>选择检验检查时间:</span>
                 <div>
-                  <!-- <el-form-item
-                   label="时间:"
-                   prop="startYear"
-                   style="width:100%;"
-                 >
-                 <el-date-picker
-                    @change="changeYear"
-                    v-model="startYear"
-                    class="timePicker"
-                    type="month"
-                    placeholder=""
-                    format="yyyy-MM"
-                    value-format="yyyy-MM">
-	               </el-date-picker>
-                 </el-form-item> -->
-                 <el-form-item>
+                
+                 <el-form-item label="时间:">
+                   <el-radio-group style="padding: 10px;"  v-model="radio" @change="changeRadio">
+                      <el-radio :label="1">月份</el-radio>
+                      <el-radio :label="2">季度</el-radio>
+                    </el-radio-group>
+                 </el-form-item>
+                 <el-form-item v-show="showquarty">
                     <el-select v-model="quartype" placeholder="请选择" @change="changetype">
                       <el-option
                         v-for="item in quarterType"
@@ -697,6 +689,17 @@
                       </el-option>
                     </el-select>
                  </el-form-item>
+                 <el-form-item v-show="showtime">
+                   <el-date-picker
+                      @change="changeYear"
+                      v-model="startYear"
+                      class="timePicker"
+                      type="month"
+                      placeholder=""
+                      format="yyyy-MM"
+                      value-format="yyyy-MM">
+                    </el-date-picker>
+                 </el-form-item>
                  <!-- <el-form-item  label="月份:"
                    prop="startYear"
                    style="width:100%;">
@@ -956,6 +959,9 @@
         { id: 4, name: "第四季度"}
        ],
        quartype:1,
+       radio:1,
+       showtime:true,
+       showquarty:false,
       }
     },
     created() {
@@ -1041,7 +1047,7 @@
 
       },
       changeCurrentRecord(val){
-
+        this.tableData = []
         this.getInspectionDetai(val)
       },
       selectionChangeOne(val){
@@ -1185,25 +1191,35 @@
       },
       //获取大项数据来源
       getInspectionMajor(){
-          console.log("type23232232",this.quartype)
           var start_time = ""
           var end_time = ""
-          if(this.quartype == 1){
-             start_time =  moment().startOf('year').format('YYYY-MM-DD')
-             end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
-          }
-          if(this.quartype == 2){
-            start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
-            end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
+          console.log("radio2332322332",this.radio)
+          if(this.radio == 1){
+            console.log("start_year",this.startYear)
+            console.log("endyaer",this.lastYear)
+            end_time = this.startYear
+            start_time = this.lastYear
           }
-          if(this.quartype == 3){
-            start_time = moment().month(6).startOf('month').format("YYYY-MM-DD")
-            end_time = moment().month(8).endOf('month').format("YYYY-MM-DD")
-          }
-          if(this.quartype == 4){
-             start_time = moment().month(8).startOf('month').format("YYYY-MM-DD")
-             end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
+          if(this.radio == 2){
+            if(this.quartype == 1){
+              start_time =  moment().startOf('year').format('YYYY-MM-DD')
+              end_time = moment().month(2).endOf('month').format("YYYY-MM-DD")
+            }
+            if(this.quartype == 2){
+              start_time = moment().month(3).startOf('month').format("YYYY-MM-DD")   
+              end_time = moment().month(5).endOf('month').format("YYYY-MM-DD")
+            }
+            if(this.quartype == 3){
+              start_time = moment().month(6).startOf('month').format("YYYY-MM-DD")
+              end_time = moment().month(8).endOf('month').format("YYYY-MM-DD")
+            }
+            if(this.quartype == 4){
+              start_time = moment().month(9).startOf('month').format("YYYY-MM-DD")
+              end_time = moment().month(11).endOf('month').format("YYYY-MM-DD")
+            }
           }
+         
+        
           console.log("start_time",start_time)
           console.log("end_time",end_time)
           var params = {
@@ -1224,6 +1240,7 @@
       },
       //获取小项的值
       getInspectionDetai(val){
+        console.log("val2332232",val)
         var params = {
           project_id:val.project_id,
           patient_id:val.patient_id,
@@ -1407,6 +1424,7 @@
         })
       },
       getTemplateSummaryList(){
+        
           var params = {
             patient_id:this.patient_id,
             start_time:this.start_time,
@@ -1556,7 +1574,7 @@
                  this.form.template_summary_id = list.template_summary_id
                }
 
-               this.projectIndate = list.inspect_date
+              //  this.projectIndate = list.inspect_date
                this.projectStr = list.project_id
            }
         })
@@ -1859,6 +1877,18 @@
           })
           .catch(() => {
           })
+     },
+     changeRadio(val){
+       if(val == 1){
+         this.showtime = true
+         this.showquarty = false
+         this.getInspectionMajor()
+       }
+       if(val == 2){
+         this.showquarty = true
+         this.showtime = false
+         this.getInspectionMajor()
+       }
      }
 
     },

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -1,6 +1,14 @@
 <template>
   <div>
     <div class="cell clearfix" style="float: right">
+      <el-button
+        style="float: right"
+        size="small"
+        icon="el-icon-printer"
+        @click="signPrint()"
+        type="primary"
+       >标签打印
+      </el-button>
       <el-button
         style="float: right"
         size="small"
@@ -138,26 +146,31 @@
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="org_id!=9987" >
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
-                <span v-if="org_id!=10131">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
-                <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
+                <span v-if="org_id!=10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
+                <span v-if="org_id==10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
+                <!-- <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span> -->
               </span> 
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
           </span>
-          {{scope.row.prescription.dialysis_dialyszers}}
-         <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
+          {{scope.row.dialysissolution.dialysis_dialyszers}}
+         <span v-if="scope.row.dialysissolution.dialysis_dialyszers!='' && scope.row.dialysissolution.dialysis_irrigation!=''">/</span>
+          <span v-if="scope.row.dialysissolution.dialysis_irrigation!=''">{{scope.row.dialysissolution.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
       <el-table-column label="抗凝剂(商品名称)" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 3" >低分子肝素</span>
-          <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
-          <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
-          <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
-          <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 1">无肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 2">普通肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 3" >低分子肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 4">阿加曲班</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 8">伊诺肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
+          <span v-if="scope.row.dialysissolution.anticoagulant === 11">那曲肝素</span>
          <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
@@ -200,6 +213,26 @@
               ? scope.row.prescription.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 8">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+         <span v-if="scope.row.prescription.anticoagulant == 9">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 10">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 11">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
         </template>
       </el-table-column>
 
@@ -337,7 +370,7 @@ export default {
         //   week_type:this.week_type,
         //   week_time:this.week_time,
         // }
-     
+      console.log("params",params)
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
@@ -611,6 +644,24 @@ export default {
     changeZone(val){
       this.zone = val
       this.getNextScheduleWeekDay()
+    },
+    signPrint() {
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
+        this.$router.push({
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+        })
     }
   },
   components: {
@@ -619,10 +670,11 @@ export default {
   created() {
     this.modeOptions = this.$store.getters.treatment_mode;
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
-    this.week_type = new Date().getDay();
-    if (this.week_type == 0) {
-      this.week_type = 7;
-    }
+    // this.week_type = new Date().getDay();
+    // console.log("hhhh23232332",this.week_type)
+    // if (this.week_type == 0) {
+    //   this.week_type = 7;
+    // }
     this.getAllZoneList()
     this.org_id = this.$store.getters.xt_user.org.id
    

src/xt_pages/workforce/components/tableWeeks.vue

@@ -234,56 +234,60 @@
 
             <el-table-column label="抗凝剂(商品名称)" min-width="70" align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 3">低分子肝素</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
-                    <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 1">无肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 2">普通肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 3">低分子肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 4">阿加曲班</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 8">伊诺肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 11">那曲肝素</span>
+                       
+                    <span v-if="scope.row.dialysissolution.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
                 </template>
             </el-table-column>
             <el-table-column label="总量" min-width="100" align="center">
                 <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant == 1">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'mg'
+          <span v-if="scope.row.dialysissolution.anticoagulant == 1">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 2">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 3">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 4">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'mg'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 4">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 5">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'mg'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 5">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'mg'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 6">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
+                    <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + 'iu'
               : ''
           }}</span>
-                    <span v-if="scope.row.prescription.anticoagulant == 7">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + 'iu'
-              : ''
-          }}</span>
-
+            <span v-if="scope.row.dialysissolution.anticoagulant == 7">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 8">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 9">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+            <span v-if="scope.row.dialysissolution.anticoagulant == 10">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
+             <span v-if="scope.row.dialysissolution.anticoagulant == 11">{{scope.row.dialysissolution.anticoagulant_zongliang? scope.row.dialysissolution.anticoagulant_zongliang + 'iu': ''}}</span>
                 </template>
             </el-table-column>
 
@@ -887,7 +891,7 @@
           str = zone.join(",")
         }
         this.$router.push({
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
         })
       }
       ,

src/xt_pages/workforce/next_remind_print.vue

@@ -64,8 +64,8 @@
                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
-                         <!-- <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
+                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
+                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
@@ -81,16 +81,20 @@
                   </span>
                 </td>
                 <td :width="td_1_width"  v-if="printObj.anticoagulant_zongliang == 1">
-                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
-                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
-                  <span style="white-space: pre" v-if="main_collection.doctor_advice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
+                  <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
                 </td>
               </tr>

src/xt_pages/workforce/remind.vue

@@ -24,11 +24,12 @@
 </template>
 
 <script>
-import {getWeekPanels} from '@/api/schedule';
+import {getWeekPanels,getNextWeekPanels} from '@/api/schedule';
 import tableWeeks from './components/tableWeeks'
 import nextTableWeeks from './components/nextTableWeeks'
 import tablePush from './components/tablePush'
 import BreadCrumb from '../components/bread-crumb'
+const moment = require('moment')
 export default {
     name:'remind',
      data() {
@@ -69,10 +70,25 @@ export default {
       },
       changeActiveName(val){
         this.activeName = val
+      },
+      getNextWeekPanels(){
+        var parasms = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+        }
+        console.log("params222",parasms)
+       getNextWeekPanels(parasms).then(response=>{
+          if(response.data.state ==1){
+            var schedule =  response.data.data.schedule
+            console.log("schedule",schedule)
+            this.theWeek.nextWeek = schedule.length
+          }
+       })
       }
     },
     created(){
         this.getWeekPanels();
+        this.getNextWeekPanels()
     },
     watch:{
       activeName:function(val){

src/xt_pages/workforce/remind_print.vue

@@ -74,7 +74,7 @@
 
                 </td>
                 <td :width="td_1_width" v-if="printObj.anticoagulant == 1">
-                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
+                  {{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}
                   <span v-if="main_collection.prescription.antioxidant_commodity_name!=''">
                     (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
                   </span>
@@ -87,6 +87,10 @@
                   <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                   <span v-if="main_collection.prescription.anticoagulant == 8">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                    <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                     <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                      <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>

src/xt_pages/workforce/remind_print_setting.vue

@@ -21,7 +21,10 @@
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
               <div class="signPrint">
                 <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
-                <div>姓名:{{main_collection.patient.name}}</div> 
+                <div>姓名:
+                  <span v-if="type ==1">{{main_collection.patient.name}} </span> 
+                  <span v-if="type ==2">{{main_collection.patient}} </span> 
+                </div> 
                 <div>抗凝剂: 
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
@@ -51,7 +54,7 @@
 </template>
 
 <script>
-  import { getScheduleList,getPrintList } from '@/api/schedule'
+  import { getScheduleList,getPrintList,getNextScheduleWeekDay } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -81,24 +84,29 @@
         now_time:0,
         zone:"",
         pre_status:0,
-        printObj:{}
+        printObj:{},
+        type:1,
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+      console.log("type2323233223232",this.$route.query.type)  
+     this.type = this.$route.query.type
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
    
-      this.modeOptions = this.$store.getters.treatment_mode
-      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
-      this.week_type = this.$route.query.week_type
-      this.week_time  = this.$route.query.week_time
-      this.zone = this.$route.query.zone
-      this.pre_status = this.$route.query.prestatus
-     const params = {
+     this.modeOptions = this.$store.getters.treatment_mode
+     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    this.week_type = this.$route.query.week_type
+    this.week_time  = this.$route.query.week_time
+    this.zone = this.$route.query.zone
+    this.pre_status = this.$route.query.prestatus
+    
+    if(parseInt(this.$route.query.type) == 1){
+      const params = {
           week_type:this.week_type,
           week_time:this.week_time,
           zone:this.zone,
@@ -152,6 +160,11 @@
       var now_time = parseInt(this.week_type) * 86400 + this.start_time
       console.log("now",now_time)
       this.now_time = now_time
+    }
+    if(parseInt(this.$route.query.type) == 2){
+       this.getNextScheduleWeekDay()
+    }
+    
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -305,6 +318,63 @@
            this.printObj = list
          }
       })
+     },
+    getNextScheduleWeekDay() {
+        const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
+        const end = moment().weekday(7).format('YYYY-MM-DD')
+        var zone = this.zone
+        // var newArr = []
+        // for(let i=0;i<this.zoneList.length;i++){
+        //    newArr.push(this.zoneList[i].id)
+        // }
+        // var arr = newArr.join(",")
+        // var str = ""
+        // if(this.zone == 0){
+        //    str = arr  
+        // }
+        // if(zone != 0){
+        //   str = zone.join(",")
+        // }
+        const params = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:this.zone,
+        }
+        // const params = {
+        //   start_time:1609603200,
+        //   end_time:1610208000,
+        //   week_type:this.week_type,
+        //   week_time:this.week_time,
+        // }
+      console.log("params",params)
+      getNextScheduleWeekDay(params).then(response => {
+        this.scheduleData = [];
+        if (response.data.state == 1) {
+          var scheduleData = response.data.data.schedule;
+      
+          for(let i=0;i<scheduleData.length;i++){
+              scheduleData[i].sort = scheduleData[i].number.sort
+          }
+            var arr =   scheduleData.sort(this.compare('sort'))
+            console.log("元旦快乐",arr)
+            this.scheduleData = arr
+          
+            // var newList = []
+            // for(let i=0;i<scheduleData.length;i++){
+            //   if(scheduleData.prescription.id > 0){
+            //      newList.push(scheduleData[i])
+            //   } 
+            // }
+            // var arr =   newList.sort(this.compare('sort'))
+            // console.log("元旦快乐",arr)
+            // this.scheduleData = arr 
+        } else {
+          this.$message.error("网络错误");
+          return false;
+        }
+      });
      }
     }
   }