Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/utils/request.js

 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 30000, // request timeout
+  timeout: 60000, // request timeout
   withCredentials: true
 })
 

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):'耗材'}}</template>
+        <template slot-scope="scope">{{scope.row.statistical_classification}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/hospitalStation/components/inquiriesDetail.vue

                   unit:prescription.project[b].project.unit,
                 };
                 if(prescription.project[b].type == 2){
-                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['statistical_classification'] =  prescription.project[b].team.project_team
                   obj['medical_code'] =  prescription.project[b].project.medical_code
                   obj['project_name'] =  prescription.project[b].project.project_name
                   obj['type'] =  2
 
 
                 }else if(prescription.project[b].type == 3){
-                  obj['statistical_classification'] = ""
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
                   obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
                   obj['project_name'] =  prescription.project[b].good_info.good_name
                   obj['type'] =  3

src/xt_pages/hospitalStation/components/newPrescriptionTable.vue

       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
-          <div>{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</div>
+          <div>{{scope.row.statistical_classification}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

 
                 }
                 if (prescription.project[b].type == 2) {
-                  obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
                   obj['medical_code'] = prescription.project[b].project.medical_code
                   obj['project_name'] = prescription.project[b].project.project_name
                   obj['spec'] = ""
                   obj['name_id'] = 0
 
                 } else if (prescription.project[b].type == 3) {
-                  obj['statistical_classification'] = ''
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                   obj['project_name'] = prescription.project[b].good_info.good_name
                   obj['spec'] = prescription.project[b].good_info.specification_name
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['type'] = 2
                 }
 
                 if (prescription.project[b].type == 2) {
-                  obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
                   obj['medical_code'] = prescription.project[b].project.medical_code
                   obj['project_name'] = prescription.project[b].project.project_name
                   obj['spec'] = ""
 
 
                 } else if (prescription.project[b].type == 3) {
-                  obj['statistical_classification'] = ''
+                  obj['statistical_classification'] = prescription.project[b].team.project_team
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                   obj['project_name'] = prescription.project[b].good_info.good_name
                   obj['spec'] = prescription.project[b].good_info.specification_name

src/xt_pages/hospitalStation/print.vue

             <div v-if="org_id != 10138">
                 <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
                 <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
-                <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
+                <printFive v-if="org_id == 10215 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
             </div>
             <div v-else>
                 <printThree v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
     .dialysisPage::-webkit-scrollbar {
         height: 15px;
     }
-    
-    
+
+
 
     .el-date-editor{
     .el-input__inner{

src/xt_pages/hospitalStation/template/printFive.vue

   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
-          <div class="printTitle"  v-if="prescriptions[0].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
-          <div class="printTitle" v-if="prescriptions[0].med_type != '1111' && prescriptions[0].med_type != '1112'">{{orgname}}处方笺</div>
-          <div class="NoCell">
-              <div><span style="font-size:20px;font-weight:bold;">No</span><div class="underLine" style="width:120px;">{{ (item.prescription_number + (index + 1)).substring(item.prescription_number.length-6) }}</div></div>
-              <div style="display:flex;">
-                  <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
-              </div>
+        <div  style="float: right" v-if="item.med_type == '1111'">精一</div>
+        <div  style="float: right" v-if="item.med_type == '1112'">精二</div>
+        <div  style="float: right"
+             v-if="item.med_type != '1111' && item.med_type != '1112'">普通
+        </div>
+
+        <div class="printTitle">{{ orgname }}处方笺</div>
+        <div class="NoCell">
+          <div><span style="font-size:20px;font-weight:bold;">No</span>
+            <div class="underLine" style="width:120px;">
+              {{ (item.prescription_number + (index + 1)).substring(item.prescription_number.length - 6) }}
+            </div>
           </div>
-          <div class="basicCell">
-              <span>透析号</span>
-              <span class="underLine" style="width:100px;">{{ item.patient.dialysis_no ? item.patient.dialysis_no : '' }}</span>
-              <span>治疗区</span>
-              <span class="underLine" style="width:100px;">{{item.info?getDepart(item.info.departments):''}}</span>
-              <span>费别</span>
-              <span class="underLine" style="width:100px;"></span>
+          <div style="display:flex;">
+            <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
+            <div class="underLine" style="width:60px;">
+              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(0, 4) : '' }}
+            </div>
+            <div style="display: flex;flex-direction: column-reverse;">年</div>
+            <div class="underLine" style="width:60px;">
+              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(5, 7) : '' }}
+            </div>
+            <div style="display: flex;flex-direction: column-reverse;">月</div>
+            <div class="underLine" style="width:60px;">
+              {{ getTime(item.ctime) ? getTime(item.ctime).split(' ')[0].slice(8, 11) : '' }}
+            </div>
+            <div style="display: flex;flex-direction: column-reverse;">日</div>
           </div>
-          <div class="basicCell">
-              <span>姓名</span>
-              <span class="underLine" style="width:100px;">{{item.patient.name?item.patient.name:""}}</span>
-              <span>性别</span>
-              <span class="underLine" style="width:60px;">
+        </div>
+        <div class="basicCell">
+          <span>透析号</span>
+          <span class="underLine" style="width:100px;">{{
+              item.patient.dialysis_no ? item.patient.dialysis_no : ''
+            }}</span>
+          <span>治疗区</span>
+          <span class="underLine" style="width:100px;">{{ item.info ? getDepart(item.info.departments) : '' }}</span>
+          <span>费别</span>
+          <span class="underLine" style="width:100px;"></span>
+        </div>
+        <div class="basicCell">
+          <span>姓名</span>
+          <span class="underLine" style="width:100px;">{{ item.patient.name ? item.patient.name : '' }}</span>
+          <span>性别</span>
+          <span class="underLine" style="width:60px;">
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </span>
-              <span>年龄</span>
-              <span class="underLine" style="width:60px;">{{getAge(item.patient)?getAge(item.patient):""}}岁</span>
-              <span>电话</span>
-              <span class="underLine" style="width:120px;">{{item.patient.phone}}</span>
+          <span>年龄</span>
+          <span class="underLine" style="width:60px;">{{ getAge(item.patient) ? getAge(item.patient) : '' }}岁</span>
+          <span>电话</span>
+          <span class="underLine" style="width:120px;">{{ item.patient.phone }}</span>
+        </div>
+        <div class="basicCell" style="margin-bottom:30px;">
+          <span>临床诊断</span>
+          <span class="underLine"
+                style="width:100%;flex:1;text-align:left;padding-left:10px;">{{ getDiagnosis(item.info.diagnosis) }}</span>
+        </div>
+        <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
+          <div class="Rp">Rp:</div>
+          <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <div class="drugsOne"><span style="font-weight:bold;">{{
+                index + 1 + '.'
+              }}</span>{{ it.advice_name ? it.advice_name : '' }}&nbsp;&nbsp;<span
+                v-if="it.drug.min_unit != it.drug.dose_unit">{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span>{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{ it.drug.max_unit }}&nbsp;×&nbsp;
+              {{ it.prescribing_number }}{{ it.prescribing_number_unit }}
+            </div>
+            <div style="margin-left:100px;">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.execution_frequency }}&nbsp;{{ it.delivery_way }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
           </div>
-          <div class="basicCell" style="margin-bottom:30px;">
-              <span>临床诊断</span>
-              <span class="underLine" style="width:100%;flex:1;text-align:left;padding-left:10px;">{{getDiagnosis(item.info.diagnosis)}}</span>
+          <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+            <div class="drugsOne">{{ it.item_name ? it.item_name : '' }}:&nbsp;{{ it.price }}元/{{ it.count }}次</div>
           </div>
-          <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
-              <div class="Rp">Rp:</div>
-              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
-               </div>
-
-              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-              </div>
-              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
-               </div>
-               <div style="text-align:center;" >(以下空白)</div>
 
+          <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+            <div class="drugsOne"><span style="font-weight:bold;">{{
+                index + 1 + '.'
+              }}</span>{{ it.type == 2 ? getProjectName(it.project_id) ? getProjectName(it.project_id) : '' : it.good_info.good_name }}&nbsp;&nbsp;{{ it.single_dose }}{{ it.single_dose_unit }}&nbsp;×&nbsp;
+              {{ it.count }}{{ unit }}
+            </div>
+            <div style="margin-left:100px;">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.delivery_way }}</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+          </div>
+          <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+            <div class="drugsOne">
+              {{ it.project_id ? it.project_id : '' }}:&nbsp;{{ it.price.toFixed(2) }}元/{{ it.count }}次
+            </div>
+          </div>
+          <div style="text-align:center;">(以下空白)</div>
+
+        </div>
+        <div class="NoCell" style="margin-top:20px;">
+          <div style="display:flex;">
+            <span>医师</span>
+            <span class="underLine" style="width:100px;">{{ item.doctor ? item.doctor : '' }}</span>
+          </div>
+          <div style="display:flex;">
+            <span>金额</span>
+            <span class="underLine" style="width:100px;"></span>
           </div>
-          <div class="NoCell" style="margin-top:20px;">
-              <div style="display:flex;">
-                <span>医师</span>
-                <span class="underLine" style="width:100px;">{{item.doctor?item.doctor:""}}</span>
-              </div>
-              <div style="display:flex;">
-                <span>金额</span>
-                <span class="underLine" style="width:100px;"></span>
-              </div>
+        </div>
+        <div class="NoCell">
+          <div style="display:flex;">
+            <span>药师（审核、核对、发药）</span>
+            <span class="underLine" style="width:100px;"></span>
           </div>
-          <div class="NoCell">
-              <div style="display:flex;">
-                <span>药师（审核、核对、发药）</span>
-                <span class="underLine" style="width:100px;"></span>
-              </div>
-              <div style="display:flex;">
-                <span>调配</span>
-                <span class="underLine" style="width:100px;"></span>
-              </div>
+          <div style="display:flex;">
+            <span>调配</span>
+            <span class="underLine" style="width:100px;"></span>
           </div>
-          <div style="page-break-after:always"></div>
+        </div>
+        <div style="page-break-after:always"></div>
       </div>
     </div>
 
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
-import {getInitData} from "@/api/his/his"
+import { getAllDoctorList, getHisPatientDetail, getPrescriptionPrint } from '@/api/project/project'
+import { getInitData } from '@/api/his/his'
+
 export default {
-    props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String
+  },
+  data() {
+    return {
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      orgname: '',
+      diagnoses: [],
+      org_id: 0
+    }
+  },
+  methods: {
+    getAge(patient) {
+      var thisLen = patient.id_card_no.length
+      var birth = ''
+      if (thisLen == 15) {
+        birth = '19' + patient.id_card_no.substr(6, 6)
+      } else {
+        birth = patient.id_card_no.substr(6, 8)
+      }
+      var births =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+      return jsGetAge(births, '-')
+
     },
-    data(){
-      return {
-        doctorList:[],
-        advicePrint:{},
-        patient:{},
-        tableData:[],
-        prescriptionInfo:[],
-        hisPatient:{},
-        department:[],
-        prescriptions:[],
-        projectList:[],
-        orgname:"",
-        diagnoses:[],
-        org_id: 0
+
+    getAllDoctorList() {
+      getAllDoctorList().then(response => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor
+
+          this.doctorList = doctor
+        }
+      })
+    },
+
+    getDoctor(id) {
+      var name = ''
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name
+        }
       }
+      return name
     },
-   methods:{
-     getAge(patient){
-       var thisLen = patient.id_card_no.length
-       var birth = ''
-       if (thisLen == 15) {
-         birth = '19' + patient.id_card_no.substr(6, 6)
-       } else {
-         birth = patient.id_card_no.substr(6, 8)
-       }
-       var births =
-         birth.substr(0, 4) +
-         '-' +
-         birth.substr(4, 2) +
-         '-' +
-         birth.substr(6, 2)
-       return jsGetAge(births, '-')
-
-     },
-
-     getAllDoctorList(){
-      getAllDoctorList().then(response=>{
-        if(response.data.state == 1){
-               var doctor =  response.data.data.doctor
-
-               this.doctorList = doctor
-             }
-         })
-     },
-
-      getDoctor(id){
-        var name = ""
-        for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-              name = this.doctorList[i].user_name
-          }
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    },
+    getPrescriptionPrint() {
+      var params = {
+        // patient_id:this.patient_id,
+        // record_date:this.record_date,
+        // prescription_id:this.prescription_id,
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids
+      }
+      console.log('params', params)
+      getPrescriptionPrint(params).then(response => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint
+          console.log('adviceprint9999', advicePrint)
+          this.advicePrint = advicePrint
+          this.prescriptions = advicePrint
+          console.log('处方222222', this.prescriptions)
+          var hisPatient = response.data.data.hisPatient
+          console.log('hisPatient', hisPatient)
+          this.hisPatient = hisPatient
+          var projectlist = response.data.data.projectlist
+          console.log('所有项目列表', projectlist)
+          this.projectList = projectlist
         }
-        return name
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-            return uParseTime(value, temp)
+      })
+    },
+    getHisPatientDetail() {
+      const params = {
+        patient_id: this.patient_id
+      }
+      getHisPatientDetail(params).then(response => {
+        if (response.data.state == 1) {
+          var hisPatient = response.data.data.hisPatient
+          console.log('挂号病人', hisPatient)
+          this.hisPatient = hisPatient
         }
-        return ''
-     },
-       getPrescriptionPrint(){
-         var params = {
-          // patient_id:this.patient_id,
-          // record_date:this.record_date,
-          // prescription_id:this.prescription_id,
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
-          ids:this.ids
+      })
+    },
+    getInitData() {
+      getInitData().then(response => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department
+          this.diagnoses = response.data.data.diagnose
+          console.log('争端', this.diagnoses)
         }
-        console.log("params",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint9999",advicePrint)
-            this.advicePrint = advicePrint
-            this.prescriptions = advicePrint
-            console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
-            console.log("hisPatient",hisPatient)
-            this.hisPatient = hisPatient
-            var projectlist =  response.data.data.projectlist
-            console.log("所有项目列表",projectlist)
-            this.projectList = projectlist
-          }
-       })
-     },
-     getHisPatientDetail(){
-          const params = {
-              patient_id:this.patient_id
-          }
-       getHisPatientDetail(params).then(response=>{
-          if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
-             console.log("挂号病人",hisPatient)
-             this.hisPatient = hisPatient
-          }
-       })
-     },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
-            console.log("争端",this.diagnoses)
-          }
-       })
-     },
-     getDepart(id){
-         var name = ""
-       for(let i=0;i<this.department.length;i++){
-           if(id == this.department[i].id){
-               name = this.department[i].name
-           }
-       }
-       return name
-     },
+      })
+    },
+    getDepart(id) {
+      var name = ''
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name
+        }
+      }
+      return name
+    },
     getTotalOne(id) {
 
-        var total = 0
-        var addtotal = 0
-        for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].project != null) {
-              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
-                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
-              }
+      var total = 0
+      var addtotal = 0
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+              addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100
         }
 
-       }
+      }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
-          if(id == this.prescriptions[i].id){
-            if (this.prescriptions[i].advices != null) {
-              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
-                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
-              }
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
             }
+          }
 
-            if (this.prescriptions[i].additionalcharge != null) {
-              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
-                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
-              }
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+              addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
             }
-              addtotal =  Math.floor(addtotal * 100) / 100
+          }
+          addtotal = Math.floor(addtotal * 100) / 100
         }
-       }
+      }
 
-        return total + addtotal
-      },
+      return total + addtotal
+    },
 
-     getProjectName(id){
-        var project_name = ""
-        for(let i=0;i<this.projectList.length;i++){
-           if(id == this.projectList[i].id){
-               project_name = this.projectList[i].project_name
-           }
+    getProjectName(id) {
+      var project_name = ''
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name
         }
-        return project_name
-     },
-
-     getDiagnosis(id){
-        let arr = id.split(',')
-        var name = ""
-        for(let i=0;i<this.diagnoses.length;i++){
-          if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
-             name += this.diagnoses[i].class_name + ' '
-          }
+      }
+      return project_name
+    },
+
+    getDiagnosis(id) {
+      let arr = id.split(',')
+      var name = ''
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+          name += this.diagnoses[i].class_name + ' '
         }
-        return name
-     }
+      }
+      return name
+    }
 
-   },
-   created(){
-      this.getAllDoctorList()
-      this.getInitData()
-      this.getPrescriptionPrint()
-      this.getHisPatientDetail()
-      var xtuser = this.$store.getters.xt_user;
-      this.orgname = xtuser.org.org_name;
-      this.org_id = xtuser.org.id
-   },
-   watch:{
-     ids:function(val){
+  },
+  created() {
+    this.getAllDoctorList()
+    this.getInitData()
+    this.getPrescriptionPrint()
+    this.getHisPatientDetail()
+    var xtuser = this.$store.getters.xt_user
+    this.orgname = xtuser.org.org_name
+    this.org_id = xtuser.org.id
+  },
+  watch: {
+    ids: function(val) {
       this.ids = val
       this.getPrescriptionPrint()
     }
-   }
+  }
 }
 </script>
 
 
 <style lang="scss" scoped>
-.prescription-print{
+.prescription-print {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-    margin-bottom: 20px;
-    padding:20px 10px;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
 }
-.printTitle{
-    font-size: 22px;
-    text-align: center;
-    font-weight: bold;
+
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
 }
-.infoTitle{
-    display: flex;
-    border-bottom: 2px solid #000;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
+
+.infoTitle {
+  display: flex;
+  border-bottom: 2px solid #000;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.infoTitle p{
-    width: 200px;
+
+.infoTitle p {
+  width: 200px;
 }
-.infoMain{
-    display: flex;
-    flex-wrap: wrap;
-    border-bottom: 2px solid #000;
-    padding:0 10px;
+
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
 }
-.infoMain div{
-    width: 50%;
-    line-height: 24px;
+
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
 }
-.prescriptionBox{
-    padding:0 10px;
-    min-height:450px;
+
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 450px;
 }
-.Rp{
-    font-size: 22px;
-    font-weight: bold;
+
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
+}
+
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
+}
+
+.drugsBox div {
+  line-height: 20px;
+}
+
+.drugsOne {
+  line-height: 24px;
+}
+
+.drugsOne span {
+  margin-right: 20px;
 }
-.drugsBox{
-    padding-left: 40px;
-    margin-bottom: 10px;
+
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
 }
-.drugsBox div{
-    line-height: 20px;
+
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
 }
-.drugsOne{
-    line-height: 24px;
+
+.actionBar p {
+  width: 150px;
 }
-.drugsOne span{
-    margin-right: 20px;
+
+.NoCell {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
 }
-.doctorBox{
-    display: flex;
-    justify-content: space-between;
-    padding:0 10px;
-    line-height: 24px;
-    border-bottom: 2px solid #000;
+
+.underLine {
+  display: inline-block;
+  border-bottom: 1px solid #000;
+  text-align: center;
+  line-height: 24px;
 }
-.actionBar{
-    display: flex;
-    justify-content: space-between;
-    line-height: 24px;
-    padding:0 10px;
+
+.basicCell {
+  display: flex;
 }
-.actionBar p{
-    width:150px;
+
+.basicCell span {
+  line-height: 24px;
+  margin-bottom: 10px;
 }
-.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}
-.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}
-.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}
 </style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

   import { uParseTime } from '@/utils/tools'
   import NextOrLastPrescription from './nextOrLastPrescription'
   import CallPrescription from './callPrescription'
-  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'    
+  import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
 
   const moment = require('moment')
 
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
 
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] = project_month_prescriptions.project[a].project
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['project'] = prescription.project[b].project
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      if(prescription.project[b].team_id > 0){
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
+                      }
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['good_info'] =  prescription.project[b].good_info
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = prescription.project[b].team.project_team
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['project'] = prescription.project[b].project
 
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      if(prescription.project[b].team_id > 0){
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
+                      }
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['good_info'] = prescription.project[b].good_info
                   id: 0,
                   project_id: temp2[b].id,
                   project_name: temp2[b].project_name,
-                  statistical_classification: temp2[b].statistical_classification,
+                  statistical_classification: '',
                   single_dose: temp2[b].single_dose.toString(),
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
               let obj = {
                 id: project[i].id,
                 project_name: project[i].project_name,
-                statistical_classification: project[i].statistical_classification,
+                statistical_classification: '',
                 single_dose: project[i].single_dose,
                 delivery_way: project[i].delivery_way,
                 execution_frequency: project[i].execution_frequency,
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
-                statistical_classification: 0,
+                statistical_classification: '',
                 single_dose: good_info[i].specification_name,
                 delivery_way: '',
                 execution_frequency: '',
                   let obj = {
                     id: project[i].project_id,
                     project_name: project[i].project.project_name,
-                    statistical_classification: project[i].project.statistical_classification,
+                    statistical_classification: '',
                     single_dose: project[i].project.single_dose,
                     delivery_way: project[i].project.delivery_way,
                     execution_frequency: project[i].project.execution_frequency,

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

                 </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-                <template slot-scope="scope">{{scope.row.type ==
-                    2?getGroup(scope.row.statistical_classification):'耗材'}}
+                <template slot-scope="scope">{{scope.row.statistical_classification}}
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="80" label="单次用量">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
               if (project_month_prescriptions.project[a].type == 2) {
-                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['statistical_classification'] = ''
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['project_name'] = project_month_prescriptions.project[a].project.project_name
                 obj['project'] =  project_month_prescriptions.project[a].project
                     id: prescription.project[b].id,
                     project_id: prescription.project[b].project_id,
                     project_name: prescription.project[b].project.project_name,
-                    statistical_classification: prescription.project[b].project.statistical_classification,
+                    // statistical_classification: prescription.project[b].project.statistical_classification,
                     single_dose: prescription.project[b].single_dose,
                     delivery_way: prescription.project[b].delivery_way,
                     execution_frequency: prescription.project[b].execution_frequency,
                   }
 
                   if (prescription.project[b].type == 2) {
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                    obj['statistical_classification'] = prescription.project[b].team.project_team
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
                       id: 0,
                       project_id: prescription.project[b].project_id,
                       project_name: prescription.project[b].project.project_name,
-                      statistical_classification: prescription.project[b].project.statistical_classification,
+                      // statistical_classification: prescription.project[b].team.project_team,
                       single_dose: prescription.project[b].single_dose,
                       delivery_way: prescription.project[b].delivery_way,
                       execution_frequency: prescription.project[b].execution_frequency,
                     }
 
                     if (prescription.project[b].type == 2) {
-                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['statistical_classification'] = ""
                       obj['medical_code'] = prescription.project[b].project.medical_code
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['price'] = prescription.project[b].project.price
                       obj['project'] =  prescription.project[b].project
 
                     } else if (prescription.project[b].type == 3) {
-                      obj['statistical_classification'] = ''
+                      obj['statistical_classification'] = ""
                       obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['price'] = prescription.project[b].good_info.packing_price
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] =  prescription.project[b].project
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] =  prescription.project[b].project
 
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] =  prescription.project[b].good_info
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project_id,
                         project_name: prescription.project[b].project.project_name,
-                        statistical_classification: prescription.project[b].project.statistical_classification,
                         single_dose: prescription.project[b].single_dose,
                         delivery_way: prescription.project[b].delivery_way,
                         execution_frequency: prescription.project[b].execution_frequency,
                       }
 
                       if (prescription.project[b].type == 2) {
-                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['statistical_classification'] = prescription.project[b].team.project_team
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
                         obj['project'] =  prescription.project[b].project
 
 
                       } else if (prescription.project[b].type == 3) {
-                        obj['statistical_classification'] = ''
+                        if(prescription.project[b].team_id > 0){
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
+                        }
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
                         obj['good_info'] =  prescription.project[b].good_info
                           id: 0,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = ""
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['price'] = prescription.project[b].project.price
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] =  prescription.project[b].project
 
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] =  prescription.project[b].good_info
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price
                           id: prescription.project[b].id,
                           project_id: prescription.project[b].project_id,
                           project_name: prescription.project[b].project.project_name,
-                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          // statistical_classification: prescription.project[b].project.statistical_classification,
                           single_dose: prescription.project[b].single_dose,
                           delivery_way: prescription.project[b].delivery_way,
                           execution_frequency: prescription.project[b].execution_frequency,
                         }
 
                         if (prescription.project[b].type == 2) {
-                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['statistical_classification'] = prescription.project[b].team.project_team
                           obj['medical_code'] = prescription.project[b].project.medical_code
                           obj['project_name'] = prescription.project[b].project.project_name
                           obj['project'] =  prescription.project[b].project
 
 
                         } else if (prescription.project[b].type == 3) {
-                          obj['statistical_classification'] = ''
+                          if(prescription.project[b].team_id > 0){
+                            obj['statistical_classification'] = prescription.project[b].team.project_team
+                          }
                           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                           obj['project_name'] = prescription.project[b].good_info.good_name
                           obj['good_info'] =  prescription.project[b].good_info
                             id: 0,
                             project_id: prescription.project[b].project_id,
                             project_name: prescription.project[b].project.project_name,
-                            statistical_classification: prescription.project[b].project.statistical_classification,
+                            // statistical_classification: prescription.project[b].project.statistical_classification,
                             single_dose: prescription.project[b].single_dose,
                             delivery_way: prescription.project[b].delivery_way,
                             execution_frequency: prescription.project[b].execution_frequency,
                           }
 
                           if (prescription.project[b].type == 2) {
-                            obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                            obj['statistical_classification'] = ""
                             obj['medical_code'] = prescription.project[b].project.medical_code
                             obj['project_name'] = prescription.project[b].project.project_name
                             obj['price'] = prescription.project[b].project.price

src/xt_pages/outpatientRecord/outpatientRecord.vue

                             <span @click="putOnRecord(1,scope.row)">备案</span>
                         </el-button>
 
-<!--                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >-->
-<!--                            <span @click="putOnRecord(2,scope.row)">撤消</span>-->
-<!--                        </el-button>-->
+                        <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
+                            <span @click="putOnRecord(2,scope.row)">撤消</span>
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

     <div class="cell clearfix">
       <el-form :inline="true" :model="listQuery">
         <el-form-item label>
-         
+
            <el-autocomplete
              class="checkSearch"
              popper-class="my-autocomplete"
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
         <div><el-button type="primary" @click="exportList">导出</el-button></div>
-        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
+        <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
           <el-table-column prop="name" label="姓名" width="140">
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
-      }, 
+      },
       patient_id:0,
       modeIdCount:[],
     };
       } else {
         this.getDialysisList()
       }
-      
+
     },
     changeEndTime(val) {
       var time =
          if(response.data.state === 1){
           var list = response.data.data.list
           var totallist  =  response.data.data.totallist
-          this.total = totallist  
+          this.total = totallist
           var prescriptionList = response.data.data.prescriptionList
-         
+
           this.getModeId(prescriptionList)
           var count = response.data.data.count
           this.DialysisCount = count
-          
+
           var modeIdCount = response.data.data.modeIdCount
           console.log("modeidcount=====",modeIdCount)
           for(let i=0;i<modeIdCount.length;i++){
             }
               if(modeIdCount[i].mode_id == 19){
                modeIdCount[i].mode_id = "IUF+HD"
+            }
+            if(modeIdCount[i].mode_id == 20){
+              modeIdCount[i].mode_id = "UF"
+            }
+            if(modeIdCount[i].mode_id == 21){
+              modeIdCount[i].mode_id = "HD+"
+            }
+            if(modeIdCount[i].mode_id == 22){
+              modeIdCount[i].mode_id = "血浆胆红素吸附+HDF"
+            }
+            if(modeIdCount[i].mode_id == 23){
+              modeIdCount[i].mode_id = "血浆胆红素吸附"
+            }
+            if(modeIdCount[i].mode_id == 24){
+              modeIdCount[i].mode_id = "I-HDF"
+            }
+            if(modeIdCount[i].mode_id == 25){
+              modeIdCount[i].mode_id = "HD高通"
+            }
+
+            if(modeIdCount[i].mode_id == 26){
+              modeIdCount[i].mode_id = "CVVH"
+            }
+            if(modeIdCount[i].mode_id == 27){
+              modeIdCount[i].mode_id = "CVVHD"
             }
              if(modeIdCount[i].mode_id == 28){
                modeIdCount[i].mode_id = "CVVHDF"
             }
           })
           let list = Object.values(dataInfo)
-             
+
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
          }
        })
       }
-    
+
     },
     unique(arr) {
         const res = new Map();
             // console.log("total",total)
           }
        })
-     
+
     },
     getModeId(patients){
       for(let i=0;i<patients.length;i++){
             patients[i].mode_id = "HDF后置换"
         }else if(patients[i].mode_id == 19){
           patients[i].mode_id = "IUF+HD"
+        }else if(patients[i].mode_id == 20){
+          patients[i].mode_id = "UF"
+        }else if(patients[i].mode_id == 21){
+          patients[i].mode_id = "HD+"
+        }else if(patients[i].mode_id == 22){
+          patients[i].mode_id = "血浆胆红素吸附+HDF"
+        }else if(patients[i].mode_id == 23){
+          patients[i].mode_id = "血浆胆红素吸附"
+        }else if(patients[i].mode_id == 24){
+          patients[i].mode_id = "I-HDF"
+        }else if(patients[i].mode_id == 25){
+          patients[i].mode_id = "HD高通"
+        }else if(patients[i].mode_id == 26){
+          patients[i].mode_id = "CVVH"
+        }else if(patients[i].mode_id == 27){
+          patients[i].mode_id = "CVVHD"
         }else if(patients[i].mode_id == 28){
           patients[i].mode_id = "CVVHDF"
         }
         }
         let str = ''
         arr.map(item => {
-          str += item.mode_id + '(' + item.Count + '次) 、' 
+          str += item.mode_id + '(' + item.Count + '次) 、'
         })
         var strs = str.substring(0, str.length - 1)
-       
+
         return strs
       },
       exportList(){
          this.DialysisData[i].HDFHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDF+HP")
          this.DialysisData[i].CRRT = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CRRT")
          this.DialysisData[i].OTR = this.getHdModeIdCount(this.DialysisData[i].patient_id,"腹水回输")
+
+         this.DialysisData[i].IUFHD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"IUF+HD")
+         this.DialysisData[i].UF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"UF")
+         this.DialysisData[i].HDPlus = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HD+")
+         this.DialysisData[i].IHDF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"I-HDF")
+         this.DialysisData[i].HDGT = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HD高通")
+         this.DialysisData[i].CVVH = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVH")
+         this.DialysisData[i].CVVHD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVHD")
+         this.DialysisData[i].CVVHDF = this.getHdModeIdCount(this.DialysisData[i].patient_id,"CVVHDF")
+
+
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
         const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
-       
+
         excel.export_json_to_excel({
            header: tHeader,
            data,
             count += arr[i].Count
           }
         }
-       
+
         return count
      }
 
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    
+
      //获取该机构下的所有患者
      this.getCurrentOrgPatients()
      //统计列表

src/xt_pages/stock/cancelStockOrderEdit.vue

 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockConfig, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber  } from '@/api/stock'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber  } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
           this.manufacturerList = response.data.data.manufacturerList
           this.dealerList = []
           this.dealerList = response.data.data.dealerList
+          console.log("供应商2332322332232323232323",this.dealerList)
 
         })
       },changeManufacturer(val) {

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200" fixed="left">
+         <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
               </el-form-item>
             </template>
           </el-table-column>
+
+
           <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope">
               <span>规格&单位</span>
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: false, name: "耗材退库单" },
+        { path: false, name: "药品退库单" },
         { path: false, name: "新增退库单" }
       ],
       crumbs2: [

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

           this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
           this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
         }
-      
-       
+    
        }
+       console.log("数据23323",this.tableData)
+       
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tableData.length;i++){
          obj.total_price += this.tableData[i].total

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="140">
+          <el-table-column align="center" width="150">
+          <template slot="header" slot-scope="scope" >
+                <span >批号<span style="color: red">*</span></span>
+            </template>
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 20px" :rules="tableRules.batch_number"  :prop="'recordData.' + scope.$index + '.batch_number'">
+                  <el-input
+                    placeholder="请输入批号"
+                    v-model="scope.row.batch_number"
+                  ></el-input>
+                </el-form-item>
+              </template>
+         </el-table-column>
+          <!-- <el-table-column align="center" width="140">
             <template slot="header" slot-scope="scope" >
               <span>批号</span>
               </template>
                     ></el-input>
                   </el-form-item>
                 </template>
-          </el-table-column>
+          </el-table-column> -->
                    
          <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
         expiry_date:[
          {required:true,message:'有效日期不能为空',trigger:'blur'}
         ],
+        batch_number:[
+          {required:true,message:'批号不能为空',trigger:'blur'}
+        ],
       },
 
       total: "",
           console.log("000000000000",response.data.data.info)
           this.manufacturerList = manufacturerList
           var dealerList  = response.data.data.dealerList
+          console.log("供应商232322332322332232323",this.dealerList)
           this.dealerList = dealerList
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

                 <span>{{item.count_unit}}</span>
               </td>
               <td style="line-height:50px">
-                  {{item.last_price}}
+                  {{item.price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.last_price).toFixed(2)}}
+                {{(item.count * item.price).toFixed(2)}}
              </td>
              <td>{{item.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
-             <td>{{(getTime(item.expiry_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
             var warehousing = response.data.data.warehousing
             console.log("ware2232",warehousing)
             this.warehouseList = warehousing
+          
             for(let i=0;i<info.length;i++){
                info[i].child = []
               for(let j=0;j<warehousing.length;j++){
         var count = 0
         for(let i=0;i<this.warehouseList.length;i++){
           if(id == this.warehouseList[i].warehouse_out_id){
-             count +=this.warehouseList[i].count * this.warehouseList[i].last_price
+             count +=this.warehouseList[i].count * this.warehouseList[i].price
           }
         }
         return count

src/xt_pages/stock/drugs/query.vue

         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
         
         <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showThree">
            <template slot-scope="scope">
-            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
+            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showFour">
            <template slot-scope="scope">
-            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
+            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) >0">
                <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>         
             </div>
            </template>

src/xt_pages/stock/stockQuery.vue

       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var outlist = response.data.data.outList
-        
+          console.log("outlist22323232233",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
         
            count = this.outCountList[i].count
          }
       }
-      return count
-    },
+     return count
+   },
    getAutoCount(id){
      var count= 0
      for(let i=0;i<this.autoCountList.length;i++){

src/xt_pages/user/hospitalSummaryPrint.vue

 <template>
 <div>
-  <div style="float:right">
+  <div style="float:right;margin-right:10px">
     <el-button type="primary" size="small" @click="printThisPage">打印</el-button> 
   </div>
   <div id="dialysis-print-box">
       <div>
         <table class="print-table" border="1" style="margin-top: 10px;">
           <tr>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               性别:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
                 <span v-if="patient.gender == 2">女</span>
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               年龄:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
                  {{getNewAge(patient.id_card_no)}}
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               婚姻:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-                 <span v-if="patient.marital_status == 0">未婚</span>
-                 <span v-if="patient.marital_status == 1">已婚</span>
-                 <span v-if="patient.marital_status == 2">未婚</span>
+                 <span v-if="patient.marital_status == 0"></span>
+                 <span v-if="patient.marital_status == 1">未婚</span>
+                 <span v-if="patient.marital_status == 2">已婚</span>
                  <span v-if="patient.marital_status == 3">离异</span>
                  <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               职业: 
             </td>
              <td style="text-align:center;width:50px" colspan="1">
                {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               电话:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
           </tr>
 
           <tr>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               住址:
             </td>   
-            <td style="text-align:center;" colspan="11">
+            <td style="text-align:center;width:300px" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.home_address}}
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               入院时间:
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:300px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.admission_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px" colspan="2">
+            <td style="text-align:center;width:200px" colspan="1">
               出院时间:
             </td>
-            <td style="text-align:center;width:100px" colspan="2">
+            <td style="text-align:center;width:300px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.discharge_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px"  colspan="1">
+            <td style="text-align:center;width:100px"  colspan="2">
               住院天数:
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                {{getTimeDay(hosDetail.admission_time,hosDetail.discharge_time)}}
                
             </td>
             <td style="text-align:center;width:50px" colspan="2">
               转归:
-            
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.lapseto == 1">留治</span>
                 <span v-if="patient.lapseto == 2">转归</span>
       var name = ""
       for(let i=0;i<this.educationOptions.length;i++){
           if(id == this.educationOptions[i].id){
-              name = this.educationOptions[i].name
+           name = this.educationOptions[i].name
           }
       }
       return name
   },
  
   created() {
-    this.educationOptions = getDataConfig("patient", "education_types");
+    this.educationOptions = getDataConfig("patient", "profession_options");
     var xtuser = this.$store.getters.xt_user
     this.orgname = xtuser.org.org_name
     var id = this.$route.query.id

src/xt_pages/workforce/components/nextTableWeeks.vue

 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import { getNextScheduleWeekDay,getAllZoneList } from "@/api/schedule";
 import WeekItem from "./WeekItem";
 const moment = require('moment')
       zone:"",
       // zoneList:[{id:0,name:"全部"}],
       zoneList:[],
+      start_time:moment().week(moment().week() + 1).startOf('week').unix()
     };
   },
   watch: {
         if(zone != 0){
           str = zone.join(",")
         }
+
+        var now_time = parseInt(this.week_type) * 86400 + this.start_time
+
         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:str,
+          record_date:this.getTime(now_time)
         }
         // const params = {
         //   start_time:1609603200,
         //   week_type:this.week_type,
         //   week_time:this.week_time,
         // }
-      console.log("params",params)
+      console.log("params0000000000",params)
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
         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
         })
-    }
+    },
+    getTime(val) {
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
   },
   components: {
     WeekItem
     // 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/next_remind_print.vue

         </el-col>
       </el-row>
     </div>
-    <div class="app-container" style="background-color: white;">
+    <div class="app-container" style="background-color: white;"  v-loading="loading"
+      element-loading-text="加载中">
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
         now_time:0,
         zone:"",
         pre_status:0,
-        printObj:{}
+        printObj:{},
+        loading: false,
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+     var now_time = parseInt(this.week_type) * 86400 + this.start_time
+     this.now_time = now_time
      this.getPrintList()
      this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
+      this.loading = true;
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
           start_time:this.start_time,
           end_time:this.end_time,
           zone:this.zone,
+          record_date:this.getTime(now_time)
         }
-
+     console.log("prarms23232323",params)
         //  const params = {
         //   week_type:this.week_type,
         //   week_time:this.week_time,
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
+        this.loading = false
          var scheduleData = resp.data.schedule
 
           if(this.pre_status == 0){
             var arr =   newList.sort(this.compare('sort'))
             console.log("打印",arr)
             this.scheduleData = arr
+           
           }
         } else {
           this.$message.error(resp.msg)
         this.$message.error(err)
       })
 
-      var now_time = parseInt(this.week_type) * 86400 + this.start_time
-      console.log("now",now_time)
-      this.now_time = now_time
+    
     },
     methods: {
       getAdvice:function(doctor_advice) {

src/xt_pages/workforce/remind_print.vue

     created() {
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
-      console.log("org_id23322323",this.org_id)
+     //console.log("org_id23322323",this.org_id)
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit

src/xt_pages/workforce/remind_print_setting.vue

         // if(zone != 0){
         //   str = zone.join(",")
         // }
+        var now_time = parseInt(this.week_type) * 86400 + this.start_time
         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,
+          record_date:this.getTime(now_time)
         }
         // const params = {
         //   start_time:1609603200,