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

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/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -18,7 +18,7 @@
           :key="record.id"
           class="print_page_main_content"
         >
-          <div id="dialysis-print-box">
+          <div id="dialysis-print-box"  style="page-break-after:always">
               <div class="dialysis-print-order print-template-two print_page_main_content">
                 <div style="display:inline-block;width:100%;text-align:center;">
                     <div
@@ -588,45 +588,58 @@
 
                                 <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
                                 <td height="30px" style="padding:4px 5px;">
-                                    <span v-if="advice.start_time">
-                                    {{ getTime(advice.start_time, "{h}:{i}") }}
+                                    <span v-if="advice[0].start_time">
+                                        {{ getTime(advice[0].start_time, "{h}:{i}") }}
                                     </span>
                                 </td>
                                 <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
-                                    <span v-if="advice.parent_id > 0">---></span>
-                                    <span>{{ advice.advice_name }}</span>
-                                    <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                                    <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
-                                    <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
-                                    <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-                                    <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
-                                    <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
+                                    <span v-for="(item,index) in advice" :key="index">
+                                      <!-- <span v-if="item.children.length > 0"> -->
+                                          <span v-if="item.parent_id > 0">---></span>
+                                          <span v-if="item.advice_name">&nbsp;&nbsp;&nbsp;&nbsp;{{ item.advice_name }}</span>
+                                          <span v-if="item && item.advice_desc">({{ item.advice_desc }}{{ item.drug_spec_unit }})</span>
+                                          <span v-if="item.prescribing_number">&nbsp;&nbsp; {{ item.prescribing_number }}{{ item.prescribing_number_unit }}</span>
+                                          <span v-if="item.single_dose != 0">{{ item.single_dose }}{{ item.single_dose_unit }}</span>
+                                          <span v-if="item.parent_id == 0">{{ item.delivery_way }}</span>
+                                          <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span>
+                                          <span v-if="item.parent_id == 0 && item.remark.length > 0">({{ item.remark }})</span>
+                                          <span v-if="item.children && !Array.isArray(item)" style="display:block;border-top: 1px solid #000;" v-for="(child, childindex) in item.children" :key="childindex" class="advice-children">
+                                              <span style="padding-left: 20px !important;">---></span>
+                                              <span>
+                                              <span>{{ child.advice_name }}</span>
+                                              <span v-if="child.advice_desc">{{ child.advice_desc }}{{ child.drug_spec_unit }}</span>
+                                              <span v-if="child.prescribing_number">* {{ child.prescribing_number }}{{ child.prescribing_number_unit }}</span>
+                                              <span v-if="child.single_dose != 0">单次用量 {{ child.single_dose }}{{ child.single_dose_unit }}</span>
+                                              </span>
+                                          </span>
+                                      <!-- </span> -->
+                                  </span>
                                 </td>
                                 
                                 <td height="30px" style="padding:4px 5px;">
-                                    <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
-                                        {{getAdminUser(advice, 'advice_doctor')}}
+                                    <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">
+                                        {{getAdminUser(advice[0], 'advice_doctor')}}
                                     </span>
                                     <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                                        <img style="height:30px;" :src="setAdminUserES(advice, 'advice_doctor')" alt srcset />
+                                        <img style="height:30px;" :src="setAdminUserES(advice[0], 'advice_doctor')" alt srcset />
                                     </span>
                                 </td>
                                 
                                 <td height="30px" style="padding:4px 5px;">
-                                    <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                                    <span v-if="advice[0].execution_time">{{ getTime(advice[0].execution_time, "{h}:{i}") }}</span>
                                 </td>
                                 <td height="30px" style="padding:4px 5px;">
-                                    <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
-                                        {{getAdminUser(advice, 'execution_staff')}}
+                                    <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
+                                        {{getAdminUser(advice[0], 'execution_staff')}}
                                     </span>
                                     <span v-else>
-                                        <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                                        <img style="height:30px;" :src="setAdminUserES(advice[0], 'execution_staff')" alt srcset />
                                     </span>
                                 </td>
                                 <td height="30px" style="padding:4px 5px;">
-                                    <span v-if="setAdminUserES(advice, 'checker') == ''">{{ getAdminUser(advice, "checker") }}</span>
+                                    <span v-if="setAdminUserES(advice[0], 'checker') == ''">{{ getAdminUser(advice[0], "checker") }}</span>
                                     <span v-else>
-                                        <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" style="height: 30px;" />
+                                      <img class="es-img" :src="setAdminUserES(advice[0], 'checker')" alt="" srcset="" style="height: 30px;" />
                                     </span>
                                 </td>
                                 </tr>
@@ -789,7 +802,7 @@
                 </div>
                 </div>
           </div>
-          <div style="page-break-after:always"></div>
+          <!-- <div style="page-break-after:always"></div> -->
         </div>
       </div>
     </div>
@@ -991,8 +1004,8 @@ export default {
             }
 
             var delghTwo = 0
-            if (this.records[recordIndex].advices && this.records[recordIndex].advices.length < 6) {
-              delghTwo = 6 - this.records[recordIndex].advices.length
+            if (this.records[recordIndex].advices && this.records[recordIndex].advices.length < 12) {
+              delghTwo = 12 - this.records[recordIndex].advices.length
             } else {
               delghTwo = 0
             }
@@ -1006,42 +1019,42 @@ export default {
               }
             }
 
-            // var childMap = {}
-            // for (const index in this.records[recordIndex].advices) {
-            //   if (this.records[recordIndex].advices[index].parent_id == 0) {
-            //     continue
-            //   }
-            //   if (
-            //     !(
-            //       this.records[recordIndex].advices[index].parent_id in childMap
-            //     )
-            //   ) {
-            //     childMap[
-            //       this.records[recordIndex].advices[index].parent_id
-            //     ] = []
-            //   }
-            //   childMap[this.records[recordIndex].advices[index].parent_id].push(
-            //     this.records[recordIndex].advices[index]
-            //   )
-            // }
-
-            // var advices = []
-            // for (const index in this.records[recordIndex].advices) {
-            //   if (this.records[recordIndex].advices[index].parent_id > 0) {
-            //     continue
-            //   }
-            //   var item = this.records[recordIndex].advices[index]
-            //   if (item.id in childMap) {
-            //     item.children = childMap[item.id]
-            //   } else {
-            //     item.children = []
-            //   }
-            //   advices.push(item)
-            // }
+            var childMap = {}
+            for (const index in this.records[recordIndex].advices) {
+              if (this.records[recordIndex].advices[index].parent_id == 0) {
+                continue
+              }
+              if (
+                !(
+                  this.records[recordIndex].advices[index].parent_id in childMap
+                )
+              ) {
+                childMap[
+                  this.records[recordIndex].advices[index].parent_id
+                ] = []
+              }
+              childMap[this.records[recordIndex].advices[index].parent_id].push(
+                this.records[recordIndex].advices[index]
+              )
+            }
+
+            var advices = []
+            for (const index in this.records[recordIndex].advices) {
+              if (this.records[recordIndex].advices[index].parent_id > 0) {
+                continue
+              }
+              var item = this.records[recordIndex].advices[index]
+              if (item.id in childMap) {
+                item.children = childMap[item.id]
+              } else {
+                item.children = []
+              }
+              advices.push(item)
+            }
 
             var leftAdvice = []
             var rightAdvice = []
-            var adlen = this.records[recordIndex].advices.length
+            var adlen = advices.length
 
             var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
             for (var i = 0; i < halfLen; i++) {
@@ -1142,7 +1155,6 @@ export default {
     QueryPartById: function(val) {
       let vascular_access_part_name = '/'
       const vascular_access = getDataConfig('hemodialysis', 'vascular_access_desc')
-        console.log('哈哈哈哈哈哈',vascular_access)
       for (let i = 0; i < vascular_access.length; i++) {
         if (vascular_access[i].id == val) {
           vascular_access_part_name = vascular_access[i].name

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -187,7 +187,7 @@
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px; display: flex;align-items: center;">
                 医生签名:
-                <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
+                <span style="height: 30px;display: flex;align-items: center;" v-if="setAdminUserES(prescription.creater) == ''">
                 {{ getAdminUser(prescription.creater) }}
                 </span>
                 <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
@@ -385,7 +385,7 @@
             <td style="text-align:left;" colspan="4">
                 <span style="margin-left:15px;align-items: center;display: flex;">
                     责任护士：
-                    <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
+                    <span style="height: 30px;display: flex;align-items: center;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) }}</span>
                     <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
                 </span>
@@ -394,25 +394,25 @@
                 <span style="margin-left:15px;align-items: center;display: flex;">
                     核对护士:
                     <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder == null">
-                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                      <span style="height: 30px;display: flex;align-items: center;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </span>
                     <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
-                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                      <span style="height: 30px;display: flex;align-items: center;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </span>
                     <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
-                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                      <span style="height: 30px;display: flex;align-items: center;" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                         {{ getAdminUser(check == null ? 0 : check.modifier) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
                     </span>
                     <span style="width: 80px;text-align: center;display: flex;align-items: center;" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater && dialysisOrder.start_nurse != check.modifier">
-                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                      <span style="height: 30px;display: flex;align-items: center;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -30,6 +30,7 @@
                     <div>检验项目：</div>
                     <div>
                         <div v-for="item in projectPrint" style="margin-bottom:10px;">{{ item.team.project_team }}</div>
+                        <div v-for="item in singleProjectPrint" style="margin-bottom:10px;">{{ item.project.project_name }}</div>
                     </div>
                 </div>
                 <div style="display:flex;justify-content: space-between;border-top:1px solid #000;line-height:40px;padding:0 10px;">
@@ -75,7 +76,8 @@ export default {
         projectPrint:[],
         time:'',
         doctor:'',
-        org_id:''
+        org_id:'',
+        singleProjectPrint:[]
       }
     },
    methods:{
@@ -153,6 +155,7 @@ export default {
               }
             })
             let data = []
+            let data2 = []
             projectPrint.map(item => {
               if(item.team.id != 0){
                 let status = data.some(it => (it.team.id == item.team.id))
@@ -160,6 +163,9 @@ export default {
                   data.push(item)
                 }
               }
+              if(item.team.id == 0){
+                data2.push(item)
+              }
               
             })
           
@@ -167,6 +173,7 @@ export default {
             this.pre_time = this.advicePrint[0].pre_time
             this.doctor = this.advicePrint[0].doctor
             this.projectPrint = data
+            this.singleProjectPrint = data2
             console.log('99999999999999999',projectPrint)
             var projectlist =  response.data.data.projectlist
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1266,7 +1266,7 @@
       },
 
       comfirm() {
-        console.log('222222222222', this.curPrescriptions)
+        console.log('222222222222', this.teamList)
 
         // if (this.curPrescriptions.order_status == 2) {
         //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
@@ -1278,24 +1278,70 @@
         //   this.$refs.multipleTable.clearSelection()
         //   return
         // }
-       if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-            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.advices.length > 0 && this.curPrescriptions.project.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.advices.length == 0 && this.curPrescriptions.project.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.curDrugs.length > 0) {
+          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.teamList.length > 0) {
+          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('该处方属于特病类型处方，请开特病类型的项目')
+              // return
+            }
+
+          }
 
+          let arr = this.teamList
+          let newArr = []
+          arr.map(item => {
+            if(this.curPrescriptions.med_type != 14){
+              newArr.push(item)
             }
+            if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
+              newArr.push(item)
+            }
+          })
+          this.teamList = newArr
         }
 
-        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
-            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.curDrugs.length == 0) {
+          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.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')
@@ -1615,7 +1661,8 @@
                 price: project[i].price,
                 medical_code: project[i].medical_code,
                 unit: project[i].unit,
-                type: 2
+                type: 2,
+                is_special_diseases: project[i].disease_directory
               }
 
               this.tabProject.push(obj)
@@ -1635,7 +1682,8 @@
                 price: good_info[i].retail_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
-                type: 3
+                type: 3,
+                is_special_diseases: good_info[i].is_special_diseases
               }
               this.tabProject.push(obj)
             }

src/xt_pages/user/templateSummary.vue

@@ -1574,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
            }
         })

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -167,6 +167,10 @@
           <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>
@@ -209,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>
 

src/xt_pages/workforce/components/tableWeeks.vue

@@ -241,6 +241,11 @@
                     <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>
@@ -248,42 +253,41 @@
             </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>
 

src/xt_pages/workforce/next_remind_print.vue

@@ -88,9 +88,13 @@
                   <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

@@ -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>