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

src/api/advice.js

@@ -494,7 +494,6 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors(params) {
-  console.log('中国国323322332232323232323', params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',

src/router/modules/drugs.js

@@ -76,6 +76,14 @@ export default {
       is_menu: false,
       meta: { title: 'inventoryPrint', noCache: true }
     },
+    {
+      path: '/stock/drugs/print',
+      component: () => import('@/xt_pages/stock/drugs/print'),
+      name: 'print',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'print', noCache: true }
+    },
     // {
     //   path: '/stock/drugs/stock/return',
     //   component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),

src/router/modules/patient.js

@@ -226,6 +226,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/patient/patient/templateSummary/print_1',
+    component: () => import('@/xt_pages/user/templateSummaryPrint_1'),
+    hidden: true,
+    is_menu: false,
+    name: 'templateSummary_1',
+    meta: {
+      title: 'templateSummary_1',
+      noCache: true
+    }
+  },
   {
     path: '/patient/patient/hospitalSummary/print',
     component: () => import('@/xt_pages/user/hospitalSummaryPrint'),
@@ -236,6 +247,7 @@ export default {
       title: 'templateSummary',
       noCache: true
     }
-  }
+  },
+
   ]
 }

src/router/modules/stock.js

@@ -99,6 +99,14 @@ export default {
       is_menu: false,
       meta: { title: 'inventoryPrint', noCache: true }
     },
+    {
+      path: '/stock/print_all',
+      component: () => import('@/xt_pages/stock/print_all'),
+      name: 'print_all',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'print_all', noCache: true }
+    },
 
     // {
     //   path: "/stock/",

src/xt_pages/data/components/templateTable.vue

@@ -299,6 +299,7 @@ export default {
       })
         .then(() => {
           const tempData = Object.assign({}, this.temp);
+          console.log("templdatae232333233",tempData)
           deleteChildConfig(tempData).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -111,8 +111,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10249"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10249" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -223,8 +223,10 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
+        @selection-change="handleSelectionChange"
       >
-        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+        <el-table-column type="selection"  width="55"></el-table-column>
+       <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
@@ -280,10 +282,10 @@
         </el-table-column>
         <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士"><!--bug642-->
           <template slot-scope="scope">
-            <span v-if="scope.row.parent_id == 0">
+            <span>
               {{getXuserName(scope.row.execution_staff)}}
             </span>
-            <span v-else></span>
+
           </template>
         </el-table-column>
         <el-table-column
@@ -294,10 +296,10 @@
           label="核对人员"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.parent_id == 0">
+            <span>
               {{getXuserName(scope.row.checker)}}
             </span>
-            <span v-else></span>
+
           </template>
         </el-table-column>
       </el-table>
@@ -320,8 +322,9 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
+        @selection-change="handleSelectionChange"
       >
-
+        <el-table-column type="selection"  width="55"></el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -794,6 +797,10 @@
 
     },
     methods: {
+      handleSelectionChange(){
+
+      },
+
       //调试
       lili(index,row){
         // console.log("==index==",index)
@@ -1336,7 +1343,7 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-            
+
 
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
@@ -1349,7 +1356,7 @@
                     break
                   }
                 }
-               
+
                 if (spliceIndex > -1) {
                   spliceIndex += 1
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1362,7 +1369,7 @@
                     }
                   }
 
-                 
+
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
@@ -1636,9 +1643,7 @@
           this.$message.error('你没有执行医嘱的权限')
           return false
         }
-
-        console.log("王哈",this.currentRow)
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id ==10340 ){
+        if(this.org_id == 9675 || this.org_id ==10340 ){
            if(this.currentRow.checker == 0){
               this.$message.error("请先核对医嘱")
               return

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

@@ -1329,7 +1329,8 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
-     
+       
+      console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

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

@@ -87,7 +87,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -98,7 +98,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"
@@ -611,7 +611,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53)"
+                            v-if="isShows('置换液总量') && ((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)">
                             <el-input
@@ -620,7 +620,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53"
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(L)">
                             <el-input

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -441,7 +441,7 @@ export default {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
-
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
     getTemplateInfo() {
@@ -536,51 +536,47 @@ export default {
             if(project_config.is_open == 1){
               this.project = resp.data.project
               console.log( this.project)
+             
               let projectArr = []
-              this.project.map(item => {
-                resp.data.hisAdvices.map(it => {
-                  if(item.patient_id == it.patient_id){
-                    projectArr.push(item)
+              if(this.org_id !=9671 && this.org_id!= 10318){
+                this.project.map(item => {
+                  resp.data.hisAdvices.map(it => {
+                    if(item.patient_id == it.patient_id){
+                      projectArr.push(item)
+                    }
+                  })
+                })
+               
+                 resp.data.hisAdvices.map((item,index) => {
+                  if(projectArr[index].project && projectArr[index].project.length > 0){
+                    projectArr[index].project.map(it => {
+                      let obj = {
+                        advice_doctor: it.doctor,
+                        start_time:it.start_time,
+                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                        execution_time:it.execution_time,
+                        execution_state:it.execution_state,
+                        execution_staff:it.execution_staff,
+                        check_time:it.check_time,
+                        check_state:it.check_state,
+                        checker:it.checker,
+                        created_time:it.ctime,
+                        delivery_way:'',
+                        execution_frequency:'',
+                        remark:'',
+                        id:it.id,
+                        patient_id:it.patient_id,
+                        parent_id:0,
+                        groupno:0
+                      }
+                      item.doctor_advice.push(obj)
+                    })
                   }
                 })
-              })
-
+              }
+            
               console.log(projectArr)
 
-              resp.data.hisAdvices.map((item,index) => {
-                if(projectArr[index].project && projectArr[index].project.length > 0){
-                  projectArr[index].project.map(it => {
-                    let obj = {
-                      advice_doctor: it.doctor,
-                      start_time:it.start_time,
-                      advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
-                      execution_time:it.execution_time,
-                      execution_state:it.execution_state,
-                      execution_staff:it.execution_staff,
-                      check_time:it.check_time,
-                      check_state:it.check_state,
-                      checker:it.checker,
-                      created_time:it.ctime,
-                      delivery_way:'',
-                      execution_frequency:'',
-                      remark:'',
-                      id:it.id,
-                      patient_id:it.patient_id,
-                      parent_id:0,
-                      groupno:0
-                    }
-                    // let advice = []
-                    // advice.push(obj)
-                    // let advices = {
-                    //   advices: advice,
-                    //   group_no: 123
-                    // }
-
-                //     // console.log(11111,item.new_advice)
-                    item.doctor_advice.push(obj)
-                  })
-                }
-              })
             }
             console.log('resp.data.hisAdvices',resp.data.hisAdvices)
            if(config.is_open == 0 || config.is_open == 2){

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -258,7 +258,8 @@ export default {
             time:'',
             show:true,
             showOne:false,
-            delivery_way:""
+            delivery_way:"",
+            org_id:0,
         }
     },
     methods:{
@@ -291,36 +292,31 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                    if(this.project[index].project.length > 0){
-                        this.project[index].project.map(it => {
-                        let obj = {
-                            advice_doctor: it.doctor,
-                            start_time:it.start_time,
-                            advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
-                            execution_time:it.execution_time,
-                            execution_state:it.execution_state,
-                            execution_staff:it.execution_staff,
-                            check_time:it.check_time,
-                            check_state:it.check_state,
-                            checker:it.checker,
-                            created_time:it.ctime,
-                            remark:'',
-                            id:it.id,
-                            parent_id:0,
-                            groupno:0
+                      if(this.org_id!=9671 && this.org_id!= 10318){
+                        if(this.project[index].project.length > 0){
+                            this.project[index].project.map(it => {
+                            let obj = {
+                                advice_doctor: it.doctor,
+                                start_time:it.start_time,
+                                advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                                execution_time:it.execution_time,
+                                execution_state:it.execution_state,
+                                execution_staff:it.execution_staff,
+                                check_time:it.check_time,
+                                check_state:it.check_state,
+                                checker:it.checker,
+                                created_time:it.ctime,
+                                remark:'',
+                                id:it.id,
+                                parent_id:0,
+                                groupno:0
+                            }
+                        
+                            item.doctor_advice.push(obj)
+                            })
                         }
-                        // let advice = []
-                        // advice.push(obj)
-                        // let advices = {
-                        //   advices: advice,
-                        //   group_no: 123
-                        // }
-
-                        // console.log(11111,item.new_advice)
-                        item.doctor_advice.push(obj)
-                        })
                     }
-                    })
+                   })
                 }
                 if(config.is_open == 0 || config.is_open == 2){
 
@@ -781,11 +777,11 @@ export default {
     created(){
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
-      console.log("delivery_Way",delivery_way)
       this.delivery_way = delivery_way
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
     }
 }
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1451,21 +1451,19 @@
                         >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
-                          <span v-else>{{ advice.project.project_name }}</span>
+                          <span v-else-if="advice.project && advice.project.project_name">{{ advice.project.project_name }}</span>
 
                           <span v-if="advice && advice.advice_desc"
                             >({{ advice.advice_desc
                             }}{{ advice.drug_spec_unit }})</span
                           >
-                          <span v-if="advice && advice.project">{{advice.count}}{{advice.project.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 && advice.project">{{advice.project.unit}}</span>
                           <span v-if="advice.parent_id == 0">{{
                             advice.delivery_way
                           }}</span>
@@ -1485,11 +1483,11 @@
                       <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                     </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                        <td height="32px">
+                        <td height="32px" v-if="advice.advice_doctor">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
                             >{{ getAdminUser(advice.advice_doctor) }}</span
-                          >
+                          >  
                           <img
                             style="height: 30px"
                             :src="setAdminUserES(advice.advice_doctor)"
@@ -1498,6 +1496,19 @@
                             v-else
                           />
                         </td>
+                        <td v-else>
+                            <span
+                            v-if="setAdminUserES(advice.doctor) == ''"
+                            >{{ getAdminUser(advice.doctor) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(advice.doctor)"
+                            alt=""
+                            srcset=""
+                            
+                          />
+                        </td>
                         <!-- <td height="35px">
                       <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                       <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -46,7 +46,7 @@
           <div class="inline_block" style="margin-left: 10px">
             年龄：
             <div class="under_line" style="width: 30px; text-align: center">
-              {{ getAge(patientInfo)}}
+              {{ getAge(patientInfo) }}
             </div>
             岁
           </div>
@@ -1601,6 +1601,8 @@
             </tbody>
           </table>
         </div>
+        
+
         <template v-if="this.totollength > 13">
           <div style="display: inline-block; width: 100%; text-align: center">
             <div
@@ -1673,19 +1675,19 @@
             <div class="inline_block" style="margin-left: 5px">
               住院号/门诊号：
               <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-if="receiverTreatmentAccess.admission_number"
-            >
-              {{ receiverTreatmentAccess.admission_number }}
-            </div>
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-else
-            >
-              {{ "/" }}
-            </div>
+                class="under_line"
+                style="width: 70px; text-align: left"
+                v-if="receiverTreatmentAccess.admission_number"
+              >
+                {{ receiverTreatmentAccess.admission_number }}
+              </div>
+              <div
+                class="under_line"
+                style="width: 70px; text-align: left"
+                v-else
+              >
+                {{ "/" }}
+              </div>
             </div>
           </div>
           <div class="row" style="margin-bottom: 10px">
@@ -2695,16 +2697,32 @@ export default {
   },
   methods: {
     // 获取当前年份，用于年龄计算
-    getoldAge(){
-      let date = new Date()
-      let year = date.getFullYear()
-      let year_d = year-this.xtdate.split('-')[0]
-      return year_d
+    getoldAge() {
+      let date = new Date();
+      let year = date.getFullYear();
+      let year_d =
+        this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
+      let year_m = this.xtdate.split("-")[1];
+      let birth_m = this.patientInfo.birth.split("-")[1];
+      let year_date = this.xtdate.split("-")[2];
+      let birth_date = this.patientInfo.birth.split("-")[2];
+      // console.log(year,'今年年月')
+      // console.log(this.xtdate.split('-'),'病人就诊年月')
+      console.log(this.patientInfo.birth, "病人生日");
+      // console.log(year_d,'year_d')
+      if (year_m < birth_m) {
+        return year_d - 1;
+      } else if (year_m == birth_m) {
+        if (year_date < birth_date) {
+          return year_d - 1;
+        } else {
+          return year_d;
+        }
+      } else {
+        return year_d;
+      }
     },
 
-
-
-
     checkData() {
       if (this.receiverTreatmentAccess.way == 0) {
         this.$message.error("入科方式未填");
@@ -3075,6 +3093,7 @@ export default {
           this.patientInfo.birthday,
           "{y}-{m}-{d}"
         );
+        // console.log(this.patientInfo.birth,'测试生日')
         // this.patientInfo.age = jsGetAge(this.patientInfo.birth, '-')
         if (response.data.data.patientInfo.first_dialysis_date != 0) {
           this.patientInfo.first_dialysis_date = uParseTime(
@@ -3095,14 +3114,14 @@ export default {
         this.afterdialysis = response.data.data.AssessmentAfterDislysis;
         // console.log('透后体重', this.afterdialysis)
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis;
-        console.log("上次透后体重", this.lastafterdialysis.weight_after);
+        // console.log("上次透后体重", this.lastafterdialysis.weight_after);
         this.operators = response.data.data.operators;
-        console.log("operators", this.operators);
+        // console.log("operators", this.operators);
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null
             : response.data.data.dialysisOrder;
-        console.log("上机233232323232", this.dialysisOrder);
+        // console.log("上机233232323232", this.dialysisOrder);
         if (this.operators.length > 0) {
           var operatorsLen = this.operators.length;
           for (var index = 0; index < operatorsLen; index++) {
@@ -3159,7 +3178,7 @@ export default {
           this.afterdialysis.complications_other.join(",");
 
         this.prescription = response.data.data.dialysisPrescription;
-        console.log("透析处方", this.prescription);
+        // console.log("透析处方", this.prescription);
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);
@@ -3207,7 +3226,7 @@ export default {
 
         this.advices = response.data.data.advices;
         this.tableAdvice = response.data.data.advices;
-        console.log("医嘱数据2222222222", this.advices);
+        // console.log("医嘱数据2222222222", this.advices);
         this.monitors = response.data.data.monitors;
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
@@ -3419,7 +3438,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        console.log(this.advice_groups);
+        // console.log(this.advice_groups);
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -3451,7 +3470,7 @@ export default {
           return val.age;
         }
       } else {
-        return jsGetAge(val.birth, "-");
+        return this.getoldAge();
       }
     },
     newAdviceGroupObject: function () {
@@ -3562,9 +3581,9 @@ export default {
     }
 
     const xtdate = this.$route.query && this.$route.query.xtdate;
-    console.log("xtdate", xtdate);
+    // console.log("xtdate", xtdate);
     const xtno = this.$route.query && this.$route.query.xtno;
-    console.log("xtno", xtno);
+    // console.log("xtno", xtno);
     if (
       typeof xtdate === "string" &&
       xtdate.length > 0 &&

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -304,6 +304,7 @@
           出血
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
             <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage : "" }}</span>
+            <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage_other ? predialysis.hemorrhage_other : "" }}</span>
             <span v-if="predialysis.is_hemorrhage == 2">无</span>
             <span v-if="predialysis.is_hemorrhage != 2 && predialysis.is_hemorrhage != 1">/</span>
           </div>
@@ -416,13 +417,13 @@
                 <td style="height:40px;line-height:40px">&nbsp;
                   {{getTime(monitor.operate_time,'{h}:{i}')}}
                 </td>
-                <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} /
+                <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} <span v-if="monitor.systolic_blood_pressure||monitor.diastolic_blood_pressure">/</span>
                   {{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}
                 </td>
                 <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                 <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
-                <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}/{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
-                <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+                <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}<span v-if="monitor.venous_pressure||monitor.arterial_pressure">/</span>{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
+                <td>&nbsp;{{monitor.ultrafiltration_volume==0 && monitor.id?'0':monitor.ultrafiltration_volume}}</td>
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -113,13 +113,13 @@
                 >  （
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 1 ? true : false
+                    prescription.mode_id == 2 && prescription.displace_liqui_part == 1 ? true : false
                   "
                   showValue="前稀释"
                 ></label-box>
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 2 ? true : false
+                    prescription.mode_id == 2 && prescription.displace_liqui_part == 2 ? true : false
                   "
                   showValue="后稀释"
                 ></label-box>
@@ -127,7 +127,7 @@
                   ,置换量
                   <span style="width: 50px; display: inline-block">
                     {{
-                      prescription.displace_liqui_value
+                      prescription.displace_liqui_value && prescription.mode_id == 2
                         ? prescription.displace_liqui_value
                         : "/"
                     }}

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -28,21 +28,24 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="
-            org_id == 10138 || org_id == 4 || org_id == 10278
-          "
+          v-if="org_id == 10138 || org_id == 4 || org_id == 10278"
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028  || org_id == 10088"
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
         ></printFour>
-<!--        <privateChargePrint  :info="info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>-->
-
+        <!--        <privateChargePrint  :info="info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></privateChargePrint>-->
       </div>
-<!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
-<!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
+      <!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
+      <!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
+      <printFive
+        v-if="org_id == 0"
+        :info="info"
+        :paramsObj="paramsObj"
+        :balanceAccounts="balanceAccounts"
+      ></printFive>
       <printOne :info="info" v-else></printOne>
       <!-- 测试医保环境下表格样式放开以下这条 -->
       <!-- <testVue :info="info" v-else></testVue> -->
@@ -65,13 +68,14 @@ import privateChargePrint from "./statementTemplate/privateChargePrint";
 import printTwo from "./statementTemplate/printTwo";
 import printThree from "./statementTemplate/printThree";
 import printFour from "./statementTemplate/printFour";
+import printFive from "./statementTemplate/printFive";
 import testVue from "./statementTemplate/test";
 import {
   getAllDoctorList,
   getAllHisPatientList,
   getPrescriptionPrint,
 } from "@/api/project/project";
-import { getPrivateExpenses,getPrivateExpensesOrder } from "@/api/his/his";
+import { getPrivateExpenses, getPrivateExpensesOrder } from "@/api/his/his";
 // import PrintOther from '../hospitalStation/statementTemplate/printOther'
 export default {
   name: "dialysisPrintOrder",
@@ -83,6 +87,7 @@ export default {
     printThree,
     printFour,
     testVue,
+    printFive,
   },
   props: {
     paramsObj: Object,
@@ -115,7 +120,6 @@ export default {
 
       if (
         this.$store.getters.xt_user.org_id == 10138 ||
-        // this.$store.getters.xt_user.org_id == 0 ||
         this.$store.getters.xt_user.org_id == 4 ||
         this.$store.getters.xt_user.org_id == 10278
       ) {
@@ -256,6 +260,18 @@ export default {
             style: style,
             scanStyles: false,
           });
+        } else if (
+          this.$store.getters.xt_user.org_id == 0 ||
+          this.$store.getters.xt_user.org_id == 10191
+        ) {
+          const style =
+            "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false,
+          });
         } else {
           const style =
             "@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}";
@@ -363,8 +379,8 @@ export default {
         let params = {
           his_patient_id: obj.his_patient_id,
           id: obj.order_id,
-          order_id:obj.order_id,
-          admin_user_id:this.$store.getters.xt_user.user.id,
+          order_id: obj.order_id,
+          admin_user_id: this.$store.getters.xt_user.user.id,
         };
         if (
           this.org_id == 10138 ||
@@ -491,16 +507,14 @@ export default {
               console.log(111, this.balanceAccounts);
             }
           });
-        }else
-          if (this.org_id == 10215 || this.org_id == 0) {
-
+        } else if (this.org_id == 10215 || this.org_id == 0) {
           getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
 
               return false;
             } else {
-              var that = this
+              var that = this;
               that.info = response.data.data.info;
               that.p_admin = response.data.data.printor_admin;
               that.charge_admin = response.data.data.charge_admin;
@@ -521,62 +535,62 @@ export default {
 
               that.info["bed_cost_total"] = response.data.data.bedCostTotal;
               that.info["bed_cost_self_total"] =
-                  response.data.data.bedCostSelfTotal;
+                response.data.data.bedCostSelfTotal;
               that.info["bed_cost_part_self_total"] =
-                  response.data.data.bedCostPartSelfTotal;
+                response.data.data.bedCostPartSelfTotal;
 
               that.info["operation_cost_total"] =
-                  response.data.data.operationCostTotal;
+                response.data.data.operationCostTotal;
               that.info["operation_cost_self_total"] =
-                  response.data.data.operationCostSelfTotal;
+                response.data.data.operationCostSelfTotal;
               that.info["operation_cost_part_self_total"] =
-                  response.data.data.operationCostPartSelfTotal;
+                response.data.data.operationCostPartSelfTotal;
 
               that.info["other_cost_total"] = response.data.data.otherCostTotal;
               that.info["other_cost_self_total"] =
-                  response.data.data.otherCostSelfTotal;
+                response.data.data.otherCostSelfTotal;
               that.info["other_cost_part_self_total"] =
-                  response.data.data.otherCostPartSelfTotal;
+                response.data.data.otherCostPartSelfTotal;
 
               that.info["material_cost_total"] =
-                  response.data.data.materialCostTotal;
+                response.data.data.materialCostTotal;
               that.info["material_cost_self_total"] =
-                  response.data.data.materialCostSelfTotal;
+                response.data.data.materialCostSelfTotal;
               that.info["material_cost_part_self_total"] =
-                  response.data.data.materialCostPartSelfTotal;
+                response.data.data.materialCostPartSelfTotal;
 
               that.info["western_medicine_cost_total"] =
-                  response.data.data.westernMedicineCostTotal;
+                response.data.data.westernMedicineCostTotal;
               that.info["western_medicine_cost_self_total"] =
-                  response.data.data.westernMedicineCostSelfTotal;
+                response.data.data.westernMedicineCostSelfTotal;
               that.info["western_medicine_cost_part_self_total"] =
-                  response.data.data.westernMedicineCostPartSelfTotal;
+                response.data.data.westernMedicineCostPartSelfTotal;
 
               that.info["chinese_traditional_medicine_cost_total"] =
-                  response.data.data.chineseTraditionalMedicineCostTotal;
+                response.data.data.chineseTraditionalMedicineCostTotal;
               that.info["chinese_traditional_medicine_cost_self_total"] =
-                  response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                response.data.data.chineseTraditionalMedicineCostSelfTotal;
               that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+                response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
               that.info["check_cost_total"] = response.data.data.checkCostTotal;
               that.info["check_cost_self_total"] =
-                  response.data.data.checkCostSelfTotal;
+                response.data.data.checkCostSelfTotal;
               that.info["check_cost_part_self_total"] =
-                  response.data.data.checkCostPartSelfTotal;
+                response.data.data.checkCostPartSelfTotal;
 
               that.info["laboratory_cost_total"] =
-                  response.data.data.laboratoryCostTotal;
+                response.data.data.laboratoryCostTotal;
               that.info["laboratory_cost_self_total"] =
-                  response.data.data.laboratoryCostSelfTotal;
+                response.data.data.laboratoryCostSelfTotal;
               that.info["laboratory_cost_part_self_total"] =
-                  response.data.data.laboratoryCostPartSelfTotal;
+                response.data.data.laboratoryCostPartSelfTotal;
 
               that.info["treat_cost_total"] = response.data.data.treatCostTotal;
               that.info["treat_cost_self_total"] =
-                  response.data.data.treatCostSelfTotal;
+                response.data.data.treatCostSelfTotal;
               that.info["treat_cost_part_self_total"] =
-                  response.data.data.treatCostPartSelfTotal;
+                response.data.data.treatCostPartSelfTotal;
               that.info["date"] = response.data.data.date;
               // that.info["number"] = response.data.data.number;
               that.info["order_infos"] = response.data.data.order_infos;
@@ -643,7 +657,6 @@ export default {
               }
             }
           });
-
         }
       } else {
         var that = this;

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -0,0 +1,182 @@
+<template>
+  <div id="statement-print" class="statement-print">
+    <table class="statementTable" border="0">
+      <thead>
+        <tr>
+          <td colspan="10">石狮圣誉血液透析中心结算单</td>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr>
+          <td colspan="10">日期区间：</td>
+        </tr>
+        <tr class="view_tr">
+          <td colspan="2">姓名：</td>
+          <td colspan="2">性别：</td>
+          <td colspan="2">医保类型：</td>
+          <td colspan="2">社会保障号码：</td>
+          <td colspan="2">账号余额：</td>
+        </tr>
+        <tr class="view_tr">
+          <td colspan="10">明细信息</td>
+        </tr>
+
+        <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
+        <tr>
+          <td colspan="6">
+            <table class="list_table">
+              <tr colspan="6" v-for="(item, index) in list_L" :key="index">
+                <td colspan="2">药名</td>
+                <td>规格</td>
+                <td>数量</td>
+                <td>价格</td>
+              </tr>
+            </table>
+          </td>
+
+          <td colspan="4">
+            <table class="list_table">
+              <tr colspan="4" v-for="(item, index) in list_R" :key="index">
+                <td colspan="2">药名</td>
+                <td>规格</td>
+                <td>数量</td>
+                <td>价格</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="10">共一页，第一页419.32</td>
+        </tr>
+        <tr class="dashed_tr">
+          <td colspan="10">结付分类</td>
+        </tr>
+        <tr>
+          <td colspan="10">
+            <div>费用总计：</div>
+            <div>统筹支付：</div>
+            <div>账户支付：</div>
+            <div>个人现金支付：</div>
+            <div>其他支付：</div>
+            <div>减免金额：</div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    info: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    p_admin: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+    charge_admin: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      list_L: [1,2],
+      list_R: [1,2],
+    };
+  },
+  methods: {
+    getDay(dateString1, dateString2) {
+      var startDate = Date.parse(dateString1);
+      var endDate = Date.parse(dateString2);
+      if (startDate > endDate) {
+        return 0;
+      }
+      if (startDate == endDate) {
+        return 1;
+      }
+      var days = (endDate - startDate) / (1 * 24 * 60 * 60 * 1000);
+      return days;
+    },
+    getNowTime: function () {
+      let dateTime;
+      let yy = new Date().getFullYear();
+      let mm = new Date().getMonth() + 1;
+      let dd = new Date().getDate();
+      let hh = new Date().getHours();
+      let mf =
+        new Date().getMinutes() < 10
+          ? "0" + new Date().getMinutes()
+          : new Date().getMinutes();
+      let ss =
+        new Date().getSeconds() < 10
+          ? "0" + new Date().getSeconds()
+          : new Date().getSeconds();
+      dateTime = yy + "-" + mm + "-" + dd + " " + hh + ":" + mf + ":" + ss;
+      return dateTime;
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.statement-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;
+}
+
+.statementTitle {
+  font-size: 28px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.statementTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+}
+.statementTable thead{
+  font-size: 28px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.statementTable tbody{
+    text-align: left;
+}
+tbody .view_tr{
+    border: 1px solid;
+    text-align: center;
+}
+.list_table{
+    width: 100%;
+    margin-bottom: 100px;
+}
+tbody .dashed_tr{
+    border: 1px dashed;
+    text-align: center;
+}
+tbody tr td div{
+    height: 25px;
+}
+</style>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -439,7 +439,7 @@ export default {
     },
 
     // 电子病历打印
-    opentwo(index) {
+    opentwo(index) {  
       if (index == 1) {
         if (this.patientInfo.id == undefined) {
           this.$message.error('请先选择病人')

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -14,13 +14,11 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
         v-if="
-          org_id != 10217 &&
+          org_id != 10217 && org_id != 10188 &&org_id != 10318&&
           org_id != 9675 &&
           org_id != 9671 &&
           org_id != 0 &&
-          org_id != 10164 &&
-          org_id != 10188 &&
-          org_id != 10318
+          org_id != 10164 
         "
         ref="printOne"
         v-bind:childResponse="childResponse"
@@ -32,10 +30,11 @@
       <printTwo
         v-if="
           org_id == 10217 ||
+           org_id == 10188 ||
           org_id == 9675 ||
           org_id == 9671 ||
-          org_id == 10164 ||
-          org_id == 10188
+          org_id == 10164
+         
         "
         ref="printTwo"
         v-bind:childResponse="childResponse"
@@ -101,7 +100,7 @@ export default {
   methods: {
     show(val, id) {
       this.org_id = id;
-      if (id == 10217 || id == 9675 || id == 9671 ) {
+      if (id == 10217 || id == 9675 || id == 9671|| id == 10188 ) {
         this.$refs.printTwo.show(val);
       } else if (id == 10318|| id == 0) {
         this.$refs.printThree.show(val);

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -168,6 +168,7 @@
       <div>总费用:{{ getAllPice() }}</div>
       <div>
         个人支付: 
+       
         <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
         <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
       
@@ -446,7 +447,7 @@ export default {
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          act_pay += this.list[i].orders[j].acct_pay;
+          act_pay += this.list[i].orders[j].psn_cash_pay;
         }
       }
       return act_pay.toFixed(2);

src/xt_pages/outpatientTool/export.vue

@@ -65,7 +65,7 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-         <el-button  size="small" type="primary" @click="exportList">导出</el-button>
+         <el-button  size="small" type="primary" @click="exportList" style="width:50px">导出</el-button>
         <el-table
         :data="tableList"
          border

src/xt_pages/outpatientTool/exportOne.vue

@@ -65,61 +65,78 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-         <el-button  size="small" type="primary" @click="exportList">导出</el-button>
+         <el-button  size="small" type="primary" @click="exportList" style="width:50px">导出</el-button>
         <el-table
         :data="tableList"
          border
         style="width: 100%">
          <el-table-column prop="date" label="姓名"  width="100" align="center">
            <template slot-scope="scope" >
-            {{ scope.row.name }}
+            {{ scope.row.patient.name }}
            </template>
         </el-table-column>
         <el-table-column  prop="date"  label="身份证"  width="200" align="center">
            <template slot-scope="scope" >
-            {{ scope.row.id_card_no }}
+            {{ scope.row.patient.id_card_no }}
            </template> 
         </el-table-column>
         <el-table-column prop="name"  label="医保类型" width="100" align="center">
           <template slot-scope="scope" >
-            <span v-if="scope.row.insutype == 0">居民</span>
-            <span v-if="scope.row.insutype == 310">职工</span>
-            <span v-if="scope.row.insutype == 390">居民</span>
+            <span v-if="scope.row.order.insutype == 0">居民</span>
+            <span v-if="scope.row.order.insutype == 310">职工</span>
+            <span v-if="scope.row.order.insutype == 390">居民</span>
            </template>  
         </el-table-column>
         <el-table-column  prop="address" label="年"  width="50" align="center">
           <template slot-scope="scope" >
-            {{getTime(scope.row.settle_accounts_date)}}
+            {{getTime(scope.row.order.settle_accounts_date)}}
          </template>  
         </el-table-column>
          <el-table-column prop="address" label="月"  width="50"  align="center">
           <template slot-scope="scope">
-            {{getTimeOne(scope.row.settle_accounts_date)}}
+            {{getTimeOne(scope.row.order.settle_accounts_date)}}
            </template>  
         </el-table-column>
-         <el-table-column prop="address" label="收费项目"  width="100" align="center">
+         <el-table-column prop="address" label="药品编码"  width="100" align="center">
            <template slot-scope="scope" >
-            <span v-if="scope.row.med_chrgitm_type == '01'">床位费</span>
-            <span v-if="scope.row.med_chrgitm_type == '02'">诊察费</span>
-            <span v-if="scope.row.med_chrgitm_type == '03'">检查费</span>
-            <span v-if="scope.row.med_chrgitm_type == '04'">化验费</span>
-            <span v-if="scope.row.med_chrgitm_type == '05'">治疗费</span>
-            <span v-if="scope.row.med_chrgitm_type == '06'">手术费</span>
-            <span v-if="scope.row.med_chrgitm_type == '08'">材料费</span>
-            <span v-if="scope.row.med_chrgitm_type == '09'">西药费</span>
-            <span v-if="scope.row.med_chrgitm_type == '11'">中成费</span>
-            <span v-if="scope.row.med_chrgitm_type == '14'">其他费</span>
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.id}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.id}}
+             </span>
            </template>  
         </el-table-column>
-         <el-table-column prop="address" label="数量"  width="100" align="center">
+         <el-table-column prop="address" label="名称"  width="100" align="center">
            <template slot-scope="scope" >
-            {{getCount(scope.row.child)}}
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.advice_name}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.good_info.good_name}}
+             </span>
            </template>  
           </el-table-column>
        
-         <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <el-table-column  prop="address"  label="单位"  width="130" align="center">
          <template slot-scope="scope" >
-            {{getAllPrice(scope.row.child)}}
+          
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.prescribing_number_unit}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.unit}}
+             </span>
+           </template>  
+        </el-table-column>
+        <el-table-column  prop="address"  label="数量"  width="130" align="center">
+         <template slot-scope="scope" >
+               {{scope.row.cnt}}
+           </template>  
+        </el-table-column>
+       <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <template slot-scope="scope" >   
+               {{(scope.row.cnt * scope.row.pric).toFixed(2)}}
            </template>  
         </el-table-column>
          </el-table>
@@ -151,13 +168,14 @@ export default {
       keywords: "",
       tableList:[],
       tableData:[],
-     chargeDate: [
+      chargeDate: [
         moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
         moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
       ],
       start_time:"",
       end_time:"",
-
+      drugList:[],
+      goodList:[],
     };
   },
 
@@ -247,7 +265,19 @@ export default {
         end_time:this.end_time,
        } 
      getHisAdviceOrderList(params).then(response=>{
-
+        if(response.data.state == 1){
+          var arr= []
+           var list =  response.data.data.list
+           console.log("list2323322323我的",list)
+           for(let i=0;i<list.length;i++){
+             if(list[i].order.order_status  == 2){
+               arr.push(list[i])
+             }
+           }
+           this.tableList = arr
+           this.tableData = arr
+         
+        }
      })
     },
     changeDate(){
@@ -299,71 +329,110 @@ export default {
         return ""
       }
     },
-      exportList(){
-         import('@/vendor/Export2Excel').then(excel => {
-          for(let i=0;i<this.tableData.length;i++){
-             if(this.tableData[i].insutype == 310){
-              this.tableData[i].insutype = "职工"
-             }
-             if(this.tableData[i].insutype == 390){
-              this.tableData[i].insutype = "居民"
-             }
-             
-             this.tableData[i].year = this.getTime(this.tableData[i].settle_accounts_date)
-             this.tableData[i].month = this.getTimeOne(this.tableData[i].settle_accounts_date)
-              
-             if(this.tableData[i].med_chrgitm_type == "01"){
-               this.tableData[i].med_chrgitm_type = "床位费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "02"){
-               this.tableData[i].med_chrgitm_type = "诊察费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "03"){
-               this.tableData[i].med_chrgitm_type = "检查费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "04"){
-               this.tableData[i].med_chrgitm_type = "化验费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "05"){
-               this.tableData[i].med_chrgitm_type = "治疗费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "06"){
-               this.tableData[i].med_chrgitm_type = "治疗费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "08"){
-               this.tableData[i].med_chrgitm_type = "材料费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "09"){
-               this.tableData[i].med_chrgitm_type = "西药费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "11"){
-               this.tableData[i].med_chrgitm_type = "中成费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "14"){
-               this.tableData[i].med_chrgitm_type = "其他费"
-             }
-             
-             this.tableData[i].sum_count = this.getCount(this.tableData[i].child)
-
-             this.tableData[i].find_price = this.getAllPrice(this.tableData[i].child)
+    exportList(){
+      import('@/vendor/Export2Excel').then(excel => {
+      for(let i=0;i<this.tableData.length;i++){
+          if(this.tableData[i].insutype == 310){
+          this.tableData[i].insutype = "职工"
+          }
+          if(this.tableData[i].insutype == 390){
+          this.tableData[i].insutype = "居民"
+          }
+          
+          this.tableData[i].year = this.getTime(this.tableData[i].settle_accounts_date)
+          this.tableData[i].month = this.getTimeOne(this.tableData[i].settle_accounts_date)
+          
+          if(this.tableData[i].med_chrgitm_type == "01"){
+            this.tableData[i].med_chrgitm_type = "床位费"
           }
-         const tHeader = ['姓名','身份证','医保类型','年','月','收费项目','数量','金额']
-         const filterVal = ['name', 'id_card_no','insutype','year','month','med_chrgitm_type','sum_count','find_price']
-
-         const data = this.formatJson(filterVal,this.tableData)
-
-         excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '药品信息'
-         })
-          this.downloadLoading = false
-
-        })
-       },
-       formatJson(filterVal, jsonData) {
-        return jsonData.map(v => filterVal.map(j => v[j]))
-       },
+          if(this.tableData[i].med_chrgitm_type == "02"){
+            this.tableData[i].med_chrgitm_type = "诊察费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "03"){
+            this.tableData[i].med_chrgitm_type = "检查费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "04"){
+            this.tableData[i].med_chrgitm_type = "化验费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "05"){
+            this.tableData[i].med_chrgitm_type = "治疗费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "06"){
+            this.tableData[i].med_chrgitm_type = "治疗费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "08"){
+            this.tableData[i].med_chrgitm_type = "材料费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "09"){
+            this.tableData[i].med_chrgitm_type = "西药费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "11"){
+            this.tableData[i].med_chrgitm_type = "中成费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "14"){
+            this.tableData[i].med_chrgitm_type = "其他费"
+          }
+
+        this.tableData[i].name = this.tableData[i].patient.name
+        this.tableData[i].id_card_no = this.tableData[i].patient.id_card_no 
+        this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+        if(this.tableData[i].his_doctor_advice.id > 0){
+          this.tableData[i].his_advice_name = this.tableData[i].his_doctor_advice.advice_name
+          this.tableData[i].his_prescribing_number_unit = this.tableData[i].his_doctor_advice.prescribing_number_unit
+        }
+        if(this.tableData[i].his_prescription_project.id > 0){
+          this.tableData[i].his_advice_name = this.tableData[i].his_prescription_project.good_info.good_name
+          this.tableData[i].his_prescribing_number_unit = this.tableData[i].his_prescription_project.unit
+        }
+        if(this.tableData[i].order.insutype == 0){
+           this.tableData[i].insutype = "居民"
+        }
+        if(this.tableData[i].order.insutype == 310){
+          this.tableData[i].insutype = "职工"
+        }
+        if(this.tableData[i].order.insutype == 390){
+          this.tableData[i].insutype = "居民"
+        }
+        
+        this.tableData[i].year = this.getTime(this.tableData[i].order.settle_accounts_date)
+        this.tableData[i].month = this.getTimeOne(this.tableData[i].order.settle_accounts_date)
+      }
+      const tHeader = ['姓名','身份证','医保类型','年','月','名称','单位','数量','金额']
+      const filterVal = ['name', 'id_card_no','insutype','year','month','his_advice_name','his_prescribing_number_unit','cnt','total_price']
+
+      const data = this.formatJson(filterVal,this.tableData)
+
+      excel.export_json_to_excel({
+        header: tHeader,
+        data,
+        filename: '药品信息'
+      })
+      this.downloadLoading = false
+
+    })
+   },
+   formatJson(filterVal, jsonData) {
+     return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    getDrugNumber(drug_id){
+      
+      var id = ""
+      for(let i=0;i<this.drugList.length;i++){
+        if(this.drugList[i].id == drug_id){
+          id = this.drugList[i].id
+        }
+      }
+      return id
+    },
+    getGoodNumber(good_id){
+      var good_name = ""
+      for(let i=0;i<this.goodList.length;i++){
+        if(this.goodList[i].id == good_id){
+           good_name = this.goodList[i].good_name
+        }
+      }
+      return good_name
+    }
   },
   created() {
 

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -10,12 +10,12 @@
         </div>
         <div class="listInfo">
             <div>科别：
-              <!-- {{getDepartment(his_patient.departments)}} -->
+              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span> 
               {{getDepartment(his_record_patient.departments)}}
             </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
             <div>门诊号：
-               <!-- {{his_patient.number}} -->
+               <span v-if="org_id!=10215">{{his_patient.number}}</span> 
                {{his_record_patient.ipt_otp_no}}
             </div>
             <div>姓名：{{patient.name}}</div>
@@ -45,11 +45,16 @@
             <div>护理费：{{getNursing()}}</div>
             <div>床位费：{{getBedCostTotal()}}</div>
         </div>
-        <div class="listInfo" style="margin-bottom: 20px;">
+        <div class="listInfo" style="margin-bottom: 10px;">
             <div>麻醉费：{{getAnesthesia()}}</div>
             <div>材料费：{{getMaterialCostTotal()}}</div>
             <div>其他：{{getOtherCostTotal()}}</div>
         </div>
+        <div class="listInfo" style="margin-bottom: 20px;">
+            <div>记账支付：{{getFundPaySumamt()}}</div>
+            <div>个人账号：{{getAcctPay()}}</div>
+            <div>现金支付：{{getPsnCashPay()}}</div>
+        </div>
         <table class="listTable" border="1">
             <tr>
                 <td style="text-align:center" >序号</td>
@@ -129,7 +134,6 @@
           medicalInsuranceLevelList:[],
           schedule:[],
           bedNumber:[],
-          tableList:[],
           order_info_list:[],
           balanceAccountsType:0,
           medicalInsuranceLevelList:[],
@@ -139,6 +143,8 @@
           start_time:"",
           end_time:"",
           his_record_patient:{},
+          orderList:[],
+          org_id:0,
         }
     },
     methods:{
@@ -189,7 +195,7 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          
+          this.orderList = response.data.data.orderList
 
           var new_arr = []
 
@@ -1059,10 +1065,58 @@
         }
       }
       return number
+    },
+    getTotalCountPrice(){
+      var total_price = 0
+      for(let i=0;i<this.tableList.length;i++){
+         if(this.tableList[i].is_total == 2){
+           total_price += this.tableList[i].pric * this.tableList[i].count_number
+         }
+      }
+      if(total_price > 0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    },
+    getPsnCashPay(){
+      var psn_cash_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+        psn_cash_pay += this.orderList[i].psn_cash_pay
+      }
+      if(psn_cash_pay > 0){
+         return psn_cash_pay.toFixed(2)
+      }else{
+        return 0.00
+      }
+    },
+    getAcctPay(){
+      var acct_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+         acct_pay +=this.orderList[i].acct_pay
+      }
+      if(acct_pay > 0){
+        return acct_pay.toFixed(2)
+      }else{
+        return 0.00
+      }
+    },
+    getFundPaySumamt(){
+      var fund_pay_sumamt = 0
+      for(let i=0;i<this.orderList.length;i++){
+        fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
+      }
+      if(fund_pay_sumamt >0){
+        return fund_pay_sumamt.toFixed(2)
+      }else{
+        return 0.00
+      }
     }
 
     },
     created(){
+      this.org_id = this.$store.getters.xt_user.org.id;
+     
       this.getGatherDetailList()   
     }
 

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

@@ -16,7 +16,7 @@
             <tr>
                 <td>姓名：{{patient.name}}</td>
                 <td>科室：
-                    <!-- {{getDepartment(his_patient.departments)}} -->
+                    <span v-if="this.$store.getters.xt_user.org.id!=10215"> {{getDepartment(his_patient.departments)}}</span>
 
                    {{ getDepartment(his_record_patient.departments) }}
                 </td>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -348,6 +348,8 @@ export default {
       return new Date(time).getTime() / 1000
     },
     handleClick(patientid, inspectdate) {
+      console.log("patient_id",patientid)
+      console.log("inspectdate",inspectdate)
       // var id = 0
       // var dialysis_no = 0
       // for(let i=0;i<this.tablePatients.length;i++){
@@ -389,15 +391,15 @@ export default {
         patientid: this.patient_id,
         startime: this.listQuery.start_time,
         endtime: this.listQuery.end_time
-
       }
+      console.log("param",params)
       this.isLoadingTwo = true
       getPatientContorlAnalysis(params).then(response => {
         if (response.data.state == 1) {
           this.isLoadingTwo = false
 
           var control = response.data.data.patientcontorDetail
-          //  console.log("control",control)
+          console.log("control",control)
           let dataInfo = {}
           control.forEach((item, index) => {
             let { inspect_date } = item
@@ -475,7 +477,9 @@ export default {
               dataInfotwo[inspect_date] = {
                 inspect_date,
                 name: item.name,
-                dialysis_no: item.dialysis_no
+                dialysis_no: item.dialysis_no,
+                patient_id:item.patient_id,
+                inspect_date:item.inspect_date,
               }
             }
           })
@@ -486,6 +490,8 @@ export default {
               if (item.inspect_date == parseInt(it.name)) {
                 it.name = item.name
                 it.dialysis_no = item.dialysis_no
+                it.patient_id = item.patient_id
+                it.inspect_date = item.inspect_date
               }
             })
           })
@@ -510,7 +516,7 @@ export default {
           //     }
           //   }
           // }
-
+        
         } else {
           this.isLoadingTwo = false
 
@@ -523,7 +529,7 @@ export default {
         if (response.data.state == 1) {
           this.isLoadingTwo = false
           var patients = response.data.data.patients
-          console.log('patients', patients)
+        
           this.tablePatients = patients
 
           //  let dataInfothree = {}
@@ -544,13 +550,13 @@ export default {
           var total = response.data.data.total
           this.total = total
           var control = response.data.data.control
-          console.log('control', control)
+
           var infectiousControl = response.data.data.infectiousControl
-          // console.log("infectiouscontrol",infectiousControl)
+         
           infectiousControl.map(item => {
             control.push(item)
           })
-          console.log('infectiouscontrol', infectiousControl)
+
 
           //  var newPatinteArr = []
           //  patientlist.map(item=>{

src/xt_pages/stock/drugs/cancelDrugOrderPrint.vue

@@ -65,7 +65,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
+        <div v-if="orgId!=9671 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -68,7 +68,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9675 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
+      <div v-if="orgId == 9671 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -105,7 +105,7 @@
                 <span>{{item.drug.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                  <span>{{item.drug.dose}}{{item.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+                  <span>{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
                   {{item.count}}
@@ -144,7 +144,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -27,6 +27,7 @@
                 >
             </div>
             <div>
+               <el-button size="small" type="primary" @click="print_1">打印</el-button>
                <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
             </div>
             <!-- <div>
@@ -141,6 +142,9 @@ export default {
         print(){
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
+        print_1(){
+           this.$router.push({path:'/stock/drugs/print'}) 
+        },
         handleSizeChange(val){
          this.limit = val
          this.getlist()

src/xt_pages/stock/drugs/print.vue

@@ -0,0 +1,137 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">药品盘点</td></tr>
+                    </thead>  
+                    <tbody class="print_body">
+                    <tr>
+                        <td>药品名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>批号</td>
+                        <td>生产厂商</td>
+                        <td>仓库名称</td>
+                        <td>盘点前数量</td> 
+                        <td>盘点后数量</td>
+                        <td>盈亏类型</td>
+                        <td>进货单价</td>
+                        <td width="60">总额</td>
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.packing_unit}}</td>
+                        <td>{{item.number}}</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getInventoryExportList } from "@/api/stock"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name:"",
+          ids:"",
+          tableData:[],
+          manufacturerList:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+         getInventoryExportList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list233233232323",list)
+             this.tableData = list
+             this.manufacturerList = response.data.data.manufacturerList
+           }
+         })
+        },
+        getManufacturerName(id){
+
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        }
+    },
+    created(){
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/inventoryDetails.vue

@@ -26,6 +26,7 @@
                 @click="search">搜索</el-button>
             </div>
             <div>
+              <el-button type="primary" @click="toprint">打印</el-button>
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
             </div>
             <!-- <div>
@@ -128,6 +129,10 @@ export default {
          }
     },
     methods:{
+        toprint(){
+          this.$router.push({path:'/stock/print_all'})
+        },
+
         search(){
          this.getlist()
         },

src/xt_pages/stock/inventoryPrint.vue

@@ -66,7 +66,7 @@ export default {
     },
     methods:{
         printAction: function() {
-            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}.printTable td{padding:5px;} }';
+            const style = '@media print { .printTitle{font-size: 22px;text-align: center;}.flex{display: flex;justify-content: space-between;}.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}.printTable{width:100%;border-collapse: collapse;}.printTable td{padding:5px;} }';
             printJS({
             printable: 'print_content',
             type: 'html',

src/xt_pages/stock/print_all.vue

@@ -0,0 +1,136 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">耗材盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td>耗材名称</td>
+                        <td>规格</td>
+                        <td>单位</td>
+                        <td>批号</td>
+                        <td>生产厂商</td>
+                        <td>仓库名称</td>
+                        <td>盘点前数量</td> 
+                        <td>盘点后数量</td>
+                        <td>盈亏类型</td>
+                        <td>进货单价</td>
+                        <td width="60">总额</td>
+                        
+                    </tr>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{item.good_name}}</td>
+                        <td>{{item.specification_name}}</td>
+                        <td>{{item.packing_unit}}</td>
+                        <td>{{item.number}}</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getInventoryExportList } from "@/api/stock"
+import print from "print-js";
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材盘点打印' },
+          ],
+          org_name:"",
+          ids:"",
+          tableData:[],
+          manufacturerList:[],
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+        //  getInventoryExportList().then(response=>{
+        //    if(response.data.state == 1){
+        //      var list =  response.data.data.list
+        //      console.log("list233233232323",list)
+        //      this.tableData = list
+        //      this.manufacturerList = response.data.data.manufacturerList
+        //    }
+        //  })
+        },
+        getManufacturerName(id){
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        }
+    },
+    created(){
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -67,7 +67,7 @@
                         </div>
                         <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
                           <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-                          <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
+                          <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
                           <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
                           <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
                           <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/user/dialysisRecord.vue

@@ -576,7 +576,7 @@ export default {
       var dl = this.doctorOptions.length;
       if (dl > 0) {
         for (let index = 0; index < dl; index++) {
-          if ((this.doctorOptions[index].id = creater)) {
+          if ((this.doctorOptions[index].id == creater)) {
             return this.doctorOptions[index].name;
           }
         }