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

src/api/his/his.js

@@ -818,6 +818,17 @@ export function getPrintLable(params){
 }
 
 
+export function getMonthHisPatient(params){
+  return request({
+    url:"/api/monthhispatient",
+    method:"get",
+    params:params
+  })
+}
+
+
+
+
 
 
 

src/api/patient.js

@@ -755,7 +755,7 @@ export function getPatientDialysisInfor(params){
 
 export function getContextScheduleList(params){
   return request({
-    url:"/api/patient/getcontextschedulelist",
+    url:"/api/patient/getcontextschedulelistone",
     method:"get",
     params:params
   })

src/xt_pages/Dialysisanalysis/albumin/albuminall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -431,12 +435,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/bloodPhosphorus/phosphorusall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -510,12 +514,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/bloodPotassium/potassiumall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -429,12 +433,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/calcium/calciumall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -361,7 +365,7 @@ export default {
         start_date: this.start_time,
         end_date: this.end_time,
         project_id: 4,
-        item_id: 289
+        item_id: 54
       }
       this.pieData = []
       this.tableData = []
@@ -433,12 +437,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/calcium/calciumalone.vue

@@ -611,7 +611,7 @@ export default {
     this.query.end_time = year + '-' + month + '-' + day
     this.query.start_time = year + '-' + last_month + '-' + day
     this.query.project_id = 4
-    this.query.item_id = 289
+    this.query.item_id = 54
     this.getCurrentOrgPatients()
 
     // this.GetPersonQCStatistisData()

src/xt_pages/Dialysisanalysis/hemoglobin/hemoglobinall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -510,12 +514,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/otherIndicators/otherall.vue

@@ -73,6 +73,10 @@
             :data="tableData"
             :show-summary = true
             border
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
             style="width: 100%;">
                 <el-table-column
                     prop="date"
@@ -82,7 +86,6 @@
                 </el-table-column>
                 <el-table-column
                     prop="name"
-
                     label="人数"
                     >
                 </el-table-column>
@@ -181,12 +184,25 @@ export default{
           {
             type: "pie",
             label: {
-              show: true,
-              formatter:"{b} : {d}% ({c})"
+              normal : {
+                formatter: '{b}:{c}: ({d}%)',
+                textStyle : {
+                    fontWeight : 'normal',
+                    fontSize : 15,
+                    color : "black"
+                }
+              }
               // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
             },
             radius: "65%", //饼图半径
-            data: this.pieData
+            data: this.pieData,
+            itemStyle : {
+              emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
           }
         ]
       };

src/xt_pages/Dialysisanalysis/platelets/plateletsall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -65,6 +69,7 @@
         </el-table-column>
         <el-table-column
           prop="count"
+          align="center"
           label="人数"
         >
         </el-table-column>
@@ -429,12 +434,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/qualitycontrol/totalSstatistics.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -64,6 +68,7 @@
         </el-table-column>
         <el-table-column
           prop="count"
+          align="center"
           label="人数"
         >
         </el-table-column>
@@ -428,12 +433,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }
@@ -669,5 +687,7 @@ export default {
   display: flex;
   justify-content: space-around;
   color: #1e5feb;
+  
 }
+
 </style>

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

@@ -569,9 +569,6 @@ export default {
 
       }
   
-
-    
-     
      
      var doc_str = ""
       console.log("医嘱2333333333333",this.predialysis_evaluation)

src/xt_pages/dialysis/dialysisFlow.vue

@@ -143,7 +143,9 @@
           :label="item.name"
         >
           <template slot-scope="scope">
-            <span>{{getModeFinish(scope.row.dialysis_finish,item.id)}}</span>
+            <span :class="edtf(scope.row.dialysis_finish,item.id) ? 'lv' : 'hong' ">
+              {{getModeFinish(scope.row.dialysis_finish,item.id)}}
+            </span>
           </template>
 
         </el-table-column>
@@ -317,8 +319,6 @@
                 </span>
            </template>
          </el-table-column> -->
-  
-
         </el-table>
   
         <el-pagination
@@ -473,7 +473,7 @@
         complicationList: [],
         template_id:0,
         org_id:0,
-  
+        names:'',
       };
     },
     created() {
@@ -778,14 +778,27 @@
       var name = "×"
        if(val!=null){
          for(let i=0;i<val.length;i++){
+        
             if(val[i].module == id){
                name = "√"
             }
          }
        }
+     
        return name
-     }
-      
+     },
+      edtf(val,id){
+        var name
+        if(val!=null){
+         for(let i=0;i<val.length;i++){
+          
+            if(val[i].module == id){
+               name = "√"
+            }
+         }
+       }
+       return name
+      }
       
     },
     components: {
@@ -883,6 +896,14 @@
     width: 20px;
     height: 20px;
   }
+  .hong{
+    color: red;
+    font-size: 18px;
+  }
+  .lv{
+    color: rgb(26, 240, 115);
+    font-size: 18px;
+  }
   </style>
   <style scoped>
    /* 合并表格线样式 */

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -992,7 +992,8 @@ import {
   Refund,
   refundNumber,
   register,
-  upload
+  upload,
+  getMonthHisPatient,
 } from '@/api/his/his'
 import RegisterDialog from './components/registerDialog'
 import treatPrint from './treatPrint'
@@ -2185,8 +2186,10 @@ export default {
           this.cal_two = two_count
           this.cal_three = one_count + two_count
           this.current_index = 0
-          this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+          if(this.patientTableData.length > 0) {
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          }
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
         }
       })
 
@@ -2404,8 +2407,10 @@ export default {
           this.cal_two = two_count
           this.cal_three = one_count + two_count
           this.current_index = 0
-          this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+          if(this.patientTableData.length > 0){
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          }
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
         }
       })
 
@@ -2415,6 +2420,8 @@ export default {
       if (this.activeName == 'first') {
         this.getPatientList()
       } else if (this.activeName == 'second') {
+        this.getMonthHISPatientList()
+
         const params = {
           'record_date': this.record_date,
           'patient_id': this.patientInfo.id,
@@ -4024,228 +4031,235 @@ export default {
       })
     },
     changeRadio(id) {
-      let temp_id = id
-      this.radio = id
-      let params = {
-        'record_date': this.record_date
-      }
-      getChargeHisPatientList(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.patientTableData = []
-          this.all_table_data = []
-          this.hisPatientDatas = []
-
-          let one_count = 0
-          let two_count = 0
-          let three_count = 0
-          for (let i = 0; i < response.data.data.list.length; i++) {
-            if (response.data.data.list[i].his_patient.length == 0) { //没挂号
-              if (response.data.data.list[i].prescription.length > 0) {
-                let obj = {
-                  id: response.data.data.list[i].id,
-                  name: response.data.data.list[i].name,
-                  number: '',
-                  order_status: 0,
-                  order_number: '',
-                  his_patient_id: 0,
-                  prescription: response.data.data.list[i].prescription
-                }
-
-                this.all_table_data.push(obj)
-              }
-
-            } else { //挂号
-              if (response.data.data.list[i].his_patient.length == 1) {
-                if (response.data.data.list[i].his_patient[0].orders.length > 0) {
-                  for (let b = 0; b < response.data.data.list[i].his_patient[0].orders.length; b++) {
-                    let obj = {
-                      id: response.data.data.list[i].id,
-                      name: response.data.data.list[i].name,
-                      number: response.data.data.list[i].his_patient[0].number,
-                      order_status: response.data.data.list[i].his_patient[0].orders[b].order_status,
-                      his_patient_id: response.data.data.list[i].his_patient[0].id,
-                      order_number: response.data.data.list[i].his_patient[0].orders[b].order_number,
-                      order_id: response.data.data.list[i].his_patient[0].orders[b].id,
-                      prescription: response.data.data.list[i].prescription
-
-                    }
-                    this.all_table_data.push(obj)
-
-                  }
-                } else {
+      if(this.activeName == 'first') {
+        let temp_id = id
+        this.radio = id
+        let params = {
+          'record_date': this.record_date
+        }
+        getChargeHisPatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = []
+            this.all_table_data = []
+            this.hisPatientDatas = []
+
+            let one_count = 0
+            let two_count = 0
+            let three_count = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                if (response.data.data.list[i].prescription.length > 0) {
                   let obj = {
                     id: response.data.data.list[i].id,
                     name: response.data.data.list[i].name,
-                    number: response.data.data.list[i].his_patient[0].number,
+                    number: '',
                     order_status: 0,
-                    his_patient_id: response.data.data.list[i].his_patient[0].id,
                     order_number: '',
-                    order_id: 0,
+                    his_patient_id: 0,
                     prescription: response.data.data.list[i].prescription
-
                   }
-                  this.all_table_data.push(obj)
 
+                  this.all_table_data.push(obj)
                 }
-              }
 
-              if (response.data.data.list[i].his_patient.length > 1) {
-                for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                  if (response.data.data.list[i].his_patient[b].orders.length == 0) {
+              } else { //挂号
+                if (response.data.data.list[i].his_patient.length == 1) {
+                  if (response.data.data.list[i].his_patient[0].orders.length > 0) {
+                    for (let b = 0; b < response.data.data.list[i].his_patient[0].orders.length; b++) {
+                      let obj = {
+                        id: response.data.data.list[i].id,
+                        name: response.data.data.list[i].name,
+                        number: response.data.data.list[i].his_patient[0].number,
+                        order_status: response.data.data.list[i].his_patient[0].orders[b].order_status,
+                        his_patient_id: response.data.data.list[i].his_patient[0].id,
+                        order_number: response.data.data.list[i].his_patient[0].orders[b].order_number,
+                        order_id: response.data.data.list[i].his_patient[0].orders[b].id,
+                        prescription: response.data.data.list[i].prescription
+
+                      }
+                      this.all_table_data.push(obj)
+
+                    }
+                  } else {
                     let obj = {
                       id: response.data.data.list[i].id,
                       name: response.data.data.list[i].name,
-                      number: response.data.data.list[i].his_patient[b].number,
+                      number: response.data.data.list[i].his_patient[0].number,
                       order_status: 0,
-                      his_patient_id: response.data.data.list[i].his_patient[b].id,
+                      his_patient_id: response.data.data.list[i].his_patient[0].id,
                       order_number: '',
                       order_id: 0,
                       prescription: response.data.data.list[i].prescription
+
                     }
                     this.all_table_data.push(obj)
-                  } else {
 
-                    for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
+                  }
+                }
+
+                if (response.data.data.list[i].his_patient.length > 1) {
+                  for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
-                        order_status: response.data.data.list[i].his_patient[b].orders[c].order_status,
+                        order_status: 0,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
-                        order_number: response.data.data.list[i].his_patient[b].orders[c].number,
-                        order_id: response.data.data.list[i].his_patient[b].orders[c].id,
+                        order_number: '',
+                        order_id: 0,
                         prescription: response.data.data.list[i].prescription
-
                       }
                       this.all_table_data.push(obj)
+                    } else {
+
+                      for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
+                        let obj = {
+                          id: response.data.data.list[i].id,
+                          name: response.data.data.list[i].name,
+                          number: response.data.data.list[i].his_patient[b].number,
+                          order_status: response.data.data.list[i].his_patient[b].orders[c].order_status,
+                          his_patient_id: response.data.data.list[i].his_patient[b].id,
+                          order_number: response.data.data.list[i].his_patient[b].orders[c].number,
+                          order_id: response.data.data.list[i].his_patient[b].orders[c].id,
+                          prescription: response.data.data.list[i].prescription
+
+                        }
+                        this.all_table_data.push(obj)
+                      }
+
                     }
 
                   }
-
                 }
               }
             }
-          }
-          for (let i = 0; i < this.all_table_data.length; i++) {
-            if (this.all_table_data[i].his_patient_id > 0) {
-              this.hisPatientDatas.push(this.all_table_data[i])
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].his_patient_id > 0) {
+                this.hisPatientDatas.push(this.all_table_data[i])
+              }
             }
-          }
 
-          let unChargePatient = []
-          for (let i = 0; i < this.all_table_data.length; i++) {
-            let isHasUnCharge = false
-            for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-              if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-                isHasUnCharge = true
-              } else {
-                if (this.all_table_data[i].his_patient_id > 0) {
-                  if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
-                    isHasUnCharge = true
+            let unChargePatient = []
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              let isHasUnCharge = false
+              for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
+                if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                  isHasUnCharge = true
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
+                      isHasUnCharge = true
+                    }
                   }
+
                 }
+              }
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                isHasUnCharge = true
 
               }
-            }
-            if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-              isHasUnCharge = true
 
-            }
+              if (isHasUnCharge) {
+                unChargePatient.push(this.all_table_data[i])
+              }
 
-            if (isHasUnCharge) {
-              unChargePatient.push(this.all_table_data[i])
             }
 
-          }
+            unChargePatient = this.unique_four(unChargePatient)
 
-          unChargePatient = this.unique_four(unChargePatient)
+            one_count = one_count + unChargePatient.length
 
-          one_count = one_count + unChargePatient.length
+            let ChargePatient = []
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].order_status == 2) {
+                ChargePatient.push(this.all_table_data[i])
+              }
 
-          let ChargePatient = []
-          for (let i = 0; i < this.all_table_data.length; i++) {
-            if (this.all_table_data[i].order_status == 2) {
-              ChargePatient.push(this.all_table_data[i])
             }
 
-          }
+            two_count = two_count + ChargePatient.length
 
-          two_count = two_count + ChargePatient.length
-
-          if (this.radio == 1) {
-            this.all_table_data = this.unique_four(this.all_table_data)
-          }
+            if (this.radio == 1) {
+              this.all_table_data = this.unique_four(this.all_table_data)
+            }
 
-          console.log(this.all_table_data)
+            console.log(this.all_table_data)
 
-          switch (this.radio) {
-            case 1:
-              this.patientTableData = []
-              for (let i = 0; i < this.all_table_data.length; i++) {
-                let isHasUnCharge = false
-                for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
-                  console.log('!111111111')
-                  console.log(this.all_table_data[i].order_status)
-                  if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-                    console.log('!22222222222')
+            switch (this.radio) {
+              case 1:
+                this.patientTableData = []
+                for (let i = 0; i < this.all_table_data.length; i++) {
+                  let isHasUnCharge = false
+                  for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
+                    console.log('!111111111')
+                    console.log(this.all_table_data[i].order_status)
+                    if (this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                      console.log('!22222222222')
 
-                    isHasUnCharge = true
-                  } else {
-                    if (this.all_table_data[i].his_patient_id > 0) {
-                      console.log('!4444444444444')
+                      isHasUnCharge = true
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        console.log('!4444444444444')
 
-                      if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
-                        isHasUnCharge = true
-                        console.log('!33333333333')
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
+                          isHasUnCharge = true
+                          console.log('!33333333333')
 
+                        }
                       }
+
                     }
 
                   }
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
+                    console.log('11111111')
 
+                    isHasUnCharge = true
+                  }
+                  if (isHasUnCharge) {
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
                 }
-                if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2 && this.all_table_data[i].order_status != 3) {
-                  console.log('11111111')
-
-                  isHasUnCharge = true
-                }
-                if (isHasUnCharge) {
-                  this.patientTableData.push(this.all_table_data[i])
-                }
-              }
-              this.all_patient = this.patientTableData
-              break
-            case 2:
-              this.patientTableData = []
-              for (let i = 0; i < this.all_table_data.length; i++) {
-                if (this.all_table_data[i].order_status == 2) {
-                  this.patientTableData.push(this.all_table_data[i])
+                this.all_patient = this.patientTableData
+                break
+              case 2:
+                this.patientTableData = []
+                for (let i = 0; i < this.all_table_data.length; i++) {
+                  if (this.all_table_data[i].order_status == 2) {
+                    this.patientTableData.push(this.all_table_data[i])
+                  }
                 }
-              }
-              this.all_patient = this.patientTableData
-              break
-            case 4:
-              this.patientTableData = []
-              this.patientTableData = this.all_table_data
-              this.all_patient = this.patientTableData
-              break
-          }
+                this.all_patient = this.patientTableData
+                break
+              case 4:
+                this.patientTableData = []
+                this.patientTableData = this.all_table_data
+                this.all_patient = this.patientTableData
+                break
+            }
 
-          this.cal_one = one_count
-          this.cal_two = two_count
-          this.cal_three = one_count + two_count
-          this.current_index = 0
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = one_count + two_count
+            this.current_index = 0
 
-          this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+            if(this.patientTableData.length > 0) {
+              this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            }
+            // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
 
-        }
+          }
 
-      })
+        })
+      }else{
+        this.radio = id
+        this.getMonthHISPatientList()
 
+      }
     },
     formatDecimal(num, decimal) {
       num = num.toString()
@@ -4479,10 +4493,109 @@ export default {
           this.cal_three = one_count + two_count
           this.current_index = 0
           this.$refs.tab.setCurrentRow(this.patientTableData[0])
-          this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+        }
+      })
+    },
+    getMonthHISPatientList() {
+      let params = {
+        'record_date': this.record_date,
+        'type': this.radio
+      }
+      getMonthHisPatient(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.patientTableData = []
+          this.all_table_data = []
+          this.hisPatientDatas = []
+
+          if (response.data.data.list == null){
+            response.data.data.list = []
+          }
+
+          if (response.data.data.chargePatients == null){
+            response.data.data.chargePatients = []
+          }
+          let one_count = 0
+          let two_count = 0
+
+          for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].his_patient.length > 0) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: response.data.data.list[i].his_patient[0].number,
+                    order_status: 0,
+                    his_patient_id: response.data.data.list[i].his_patient[0].id,
+                    order_number: '',
+                    order_id: 0,
+                    prescription: response.data.data.list[i].prescription
+                  }
+                  this.all_table_data.push(obj)
+              }
+
+          }
+
+          let unChargePatient = []
+          for (let i = 0; i < this.all_table_data.length; i++) {
+              unChargePatient.push(this.all_table_data[i])
+          }
+          unChargePatient = this.unique_four(unChargePatient)
+          one_count = one_count + unChargePatient.length
+
+          let ChargePatient = []
+          for (let i = 0; i < response.data.data.chargePatients.length; i++) {
+            let obj = {
+              id: response.data.data.chargePatients[i].patient_id,
+              name: response.data.data.chargePatients[i].patient.name,
+              number: response.data.data.chargePatients[i].mdtrt_id,
+              order_status: 2,
+              his_patient_id: 0,
+              order_number: response.data.data.chargePatients[i].number,
+              order_id: response.data.data.chargePatients[i].id,
+            }
+              ChargePatient.push(obj)
+            }
+          two_count = two_count + ChargePatient.length
+
+          if (this.radio == 1) {
+            this.all_table_data = this.unique_four(this.all_table_data)
+          }else{
+            this.all_table_data = ChargePatient
+          }
+
+
+          switch (this.radio) {
+            case 1:
+              this.patientTableData = []
+              for (let i = 0; i < this.all_table_data.length; i++) {
+                  this.patientTableData.push(this.all_table_data[i])
+              }
+              this.all_patient = this.patientTableData
+              break
+            case 2:
+              this.patientTableData = []
+              for (let i = 0; i < ChargePatient.length; i++) {
+                  this.patientTableData.push(ChargePatient[i])
+              }
+              break
+          }
+          console.log("111122222")
+          console.log(this.patientTableData)
+
+          this.cal_one = one_count
+          this.cal_two = two_count
+          this.current_index = 0
+          if(this.patientTableData.length > 0){
+           this.$refs.tab.setCurrentRow(this.patientTableData[0])
+          }
+          // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
         }
       })
     },
+
     setMonthPrescription(month_prescriptions) {
       let big_prescriptions = []
       for (let i = 0; i < this.unique_three(month_prescriptions).length; i++) {
@@ -4818,14 +4931,17 @@ export default {
       this.month_prescriptions = []
       this.big_prescriptions = []
       this.big_month_prescriptions = []
-
-      this.getPatientInformation(val.id, val.order_number, val.his_patient_id, val.order_id)
-      this.patient_id = val.id
-
-      for (let i = 0; i < this.patientTableData.length; i++) {
-        if (this.patientTableData[i].his_patient_id == val.his_patient_id) {
-          this.current_index = i
+      if(val != null) {
+        this.getPatientInformation(val.id, val.order_number, val.his_patient_id, val.order_id)
+        this.patient_id = val.id
+        for (let i = 0; i < this.patientTableData.length; i++) {
+          if (this.patientTableData[i].his_patient_id == val.his_patient_id) {
+            this.current_index = i
+          }
         }
+      }else{
+        this.loading = false
+
       }
     },
     // 获取患者的基本信息

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -256,20 +256,26 @@ export default{
       }
     },
     getAge(patient) {
-      var thisLen = patient.id_card_no.length;
-      var birth = "";
-      if (thisLen == 15) {
-        birth = "19" + patient.id_card_no.substr(6, 6);
-      } else {
-        birth = patient.id_card_no.substr(6, 8);
+      if(patient.id_card_no == "TWN001836483"){
+        return patient.age
+      }else{
+        var thisLen = patient.id_card_no.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + patient.id_card_no.substr(6, 6);
+        } else {
+          birth = patient.id_card_no.substr(6, 8);
+        }
+        var births =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+        return jsGetAge(births, "-");
+
       }
-      var births =
-        birth.substr(0, 4) +
-        "-" +
-        birth.substr(4, 2) +
-        "-" +
-        birth.substr(6, 2);
-      return jsGetAge(births, "-");
+
     },
 
     getAllDoctorList() {

src/xt_pages/user/components/PatientSidebar.vue

@@ -203,68 +203,68 @@ export default {
             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱离风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-          ]
-        },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱离风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //   ]
+        // },
       ],
       name:""
     }
@@ -326,44 +326,45 @@ export default {
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
       } else if(name == '4-3'){
         this.$router.push({path:'/patients/ktv?id='+this.id})
-      } else if (name == '5-1') {
-        this.$router.push({
-          path: '/patients/patient/'+ this.id +'/Fallassessment'
-        })
-      } else if (name == '5-2') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
-        })
-      } else if (name == '5-3') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/pressuresore'
-        })
-      } else if (name == '5-4') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/OHpressuresore'
-        })
-      } else if (name == '5-5'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
-      } else if (name == '5-6'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
-      } else if (name == '5-7'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
-      } else if(name == '5-8'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
-      } else if(name == '5-9'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
-      } else if(name == '5-10'){
-        this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
-      } else if(name == '5-11'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
-
-      } else if(name == '5-12'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
-      } else if(name == '5-13'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
-      } else if(name == '5-14'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
       } 
+      // else if (name == '5-1') {
+      //   this.$router.push({
+      //     path: '/patients/patient/'+ this.id +'/Fallassessment'
+      //   })
+      // } else if (name == '5-2') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
+      //   })
+      // } else if (name == '5-3') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/pressuresore'
+      //   })
+      // } else if (name == '5-4') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/OHpressuresore'
+      //   })
+      // } else if (name == '5-5'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
+      // } else if (name == '5-6'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
+      // } else if (name == '5-7'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
+      // } else if(name == '5-8'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
+      // } else if(name == '5-9'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
+      // } else if(name == '5-10'){
+      //   this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
+      // } else if(name == '5-11'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
+
+      // } else if(name == '5-12'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
+      // } else if(name == '5-13'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
+      // } else if(name == '5-14'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
+      // } 
     },
     changePatient(value) {
       console.log(value)

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -30,66 +30,84 @@
                     <tr class="bg_color">
                       <td class="start">年龄</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox label="≥65岁（1分）"></el-checkbox>
-                          <el-checkbox label="<5（1分）"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in nianlin" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
+                          
                       </td>
                     </tr>
                     <tr>
                       <td class="start">既往史</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in jiwnag" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in jiwnag" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr class="bg_color">
                       <td class="start">意识状态</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in yishizt" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in yishizt" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td class="start">感官</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in ganguan" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in ganguan" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr class="bg_color">
                       <td class="start">身体状况</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in shentizk" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in shentizk" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td class="start">使用药物</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in syyaowu" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in syyaowu" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr class="bg_color">
                       <td class="start">排泄</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in paixie" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in paixie" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
+                        
                       </td>
                     </tr>
                     <tr>
                       <td class="start">自理能力</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in zilinl" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in zilinl" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
+                        
                       </td>
                     </tr>
                   </tbody>
@@ -111,9 +129,11 @@
                     <tr>
                       <td class="start">预防效果</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in xiaoguo" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in xiaoguo" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                   </tbody>
@@ -153,15 +173,148 @@
                 <table class="table" border style="width: 100%;">
                   <thead>
                     <tr>
-                      <th>健康宣教</th>
-                      <th>护理措施</th>
+                      <th style="width: 50%;">健康宣教</th>
+                      <th style="width: 50%;">护理措施</th>
                     </tr>
                   </thead>
-                  <tbody>
-                    <tr>
-                      <td></td>
-                    </tr>
-                  </tbody>
+                  <tr>
+                    <td colspan="2" style="height: 40px;">
+                      <div style="width: 100%;height: 343px; overflow: auto;border: none;">
+                        <table class="table table2" border style="width: 100%;">
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;告知病人及家属病人有跌倒的危险</label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;在病人床头悬挂"防跌倒"、"防坠床"警示牌</label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr class="bg_color">
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                    告知家属24小时陪伴，尤其在患者活动锻炼时，应有人陪伴，若离开请与值班护士联系</label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;呼叫器及用物放置病人易取处，教会使用呼叫器</label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                  告知病人及家属病人关于药物作用的注意事项
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />
+                                  &nbsp;及时给予便器，床上（边）大小便
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr class="bg_color">
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                    穿合适的裤子，以免绊倒；穿防滑鞋</label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;使用床档 </label>
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;使用约束带 </label>
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;使用助行器 </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                  告知患者改变体位欲活动时应遵循“三步曲”，即平卧30秒→双腿下垂30秒→行走，避免突然改变体位，
+                                  引起体位性低血压，特别是夜间
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;需要时协助病人上、下床  
+                                </label>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;协助病人如厕
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr class="bg_color">
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                  如出现双眼发黑、下肢无力、行走不稳和不能移动时，立即原地坐/蹲下或靠墙，呼叫他人帮助
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;避免地面积水、湿滑  
+                                </label>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;消除床旁及通道障碍
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;指导病人使用病房及卫生间扶手
+                                </label><br>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;其他有关告知
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;病床调至合适高度
+                                </label>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;及时锁上病床及轮椅的轮轴
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </div>
+                    </td> 
+                  </tr>        
+                  <tr>
+                    <td style="">
+                      <div class="jian">
+                        <el-button type="text" @click="add">+添加</el-button>
+                      </div>
+                      
+                    </td>
+                    <td style="">
+                      <div class="jian">
+                        <el-button type="text" @click="add">+添加</el-button>
+                      </div>
+                    </td>
+                  </tr>       
                 </table>
               </div>
 
@@ -184,10 +337,12 @@
                           <span>日期：</span>
                           <el-input v-model="input" style="width: 120px;"></el-input>
                         </div>
-                        <div style="display: inline-block;">
-                          <el-checkbox-group v-model="checkList">
-                            <el-checkbox v-for="item in touxidiedao" :label="item" :key="item"></el-checkbox>
-                          </el-checkbox-group>
+                        <div class="jiange" style="display: inline-block;">
+                          
+                          <span v-for="item in touxidiedao" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                       
                         </div>
                       </td>
                     </tr>
@@ -208,6 +363,25 @@
 
         </div>
       </div> 
+      <!-- 添加弹窗页面 -->
+      <el-dialog
+        title="添加"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center>
+        <span>
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6}"
+            placeholder="请输入需要添加的内容.."
+            v-model="textarea2">
+          </el-input>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="centerDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
   </template>
 
@@ -228,6 +402,7 @@
           input:'',
           options:[],
           checkList:[],
+          nianlin:['≥65岁（1分）','<5（1分）'],
           jiwnag:['有跌倒史（2分）','有坠床史（2分）','晕厥（2分）','低血压（2分）'],
           yishizt:['烦躁（4分）','谵妄（3分）','嗜睡（2分）','模糊（2分）','痴呆（2分）','昏迷（1分）'],
           ganguan:['头晕（4分）','视觉障碍（2分）','听力障碍（2分）'],
@@ -237,6 +412,9 @@
           zilinl:['无（4分）','部分（3分）'],
           xiaoguo:['未发生跌倒','发生跌倒','发生坠床'],
           touxidiedao:['发生跌倒','发生坠床'],
+
+          centerDialogVisible:false,
+          textarea2:'',
         }
         
       },
@@ -245,6 +423,9 @@
 
       },
       methods: {
+        add(){
+          this.centerDialogVisible =true
+        }
       }
     }
   </script>
@@ -281,7 +462,13 @@
         }
         .jiange{
             margin-left: 20px;
-            color: black;
+            // color: black;
+        }
+        .xiaojige{
+          margin-left: 10px;
+        }
+        .rightjiange{
+          margin-right: 40px;
         }
         input{
             -webkit-appearance: checkbox;
@@ -297,7 +484,19 @@
       color: #0077ff9f;
       // background-color: '#409eff';
     }
-    
+    ::-webkit-scrollbar {
+        width: 5px;
+    }
+    ::-webkit-scrollbar-track {
+        /*background black*/
+        border-radius: 5px;
+        background-color: white;
+    }
+    .table2 tr td{
+      width: 50%;
+      height: 40px;
+      padding: 5px;
+    }
 
   </style>
   

src/xt_pages/user/inspection.vue

@@ -168,18 +168,20 @@
               <template v-for="(item, index) in items">
                 <el-col :span="7" :key="index">
                   <div style=" margin: 5px;">
-                    <el-row>
-                      <el-col :span="8" style="width: 100%;height: 100%;" >
-                        <div @click="imgClicks(item.value)">
-                          <el-tooltip
-                            class="item"
-                            effect="dark"
-                            :hide-after="2000"
-                            content="点击查看大图"
-                            placement="top-start"
-                            >
-                              <img :src="item.value" alt="">
-                            </el-tooltip>
+                    <el-row :gutter="20">
+                      <el-col :span="8" style="width: 100%;height: 150px;">
+                        <div style="width: 100%;height: 150px;" >
+                          <div @click="imgClicks(item.value)">
+                            <el-tooltip
+                              class="item"
+                              effect="dark"
+                              :hide-after="2000"
+                              content="点击查看大图"
+                              placement="top-start"
+                              >
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
+                              </el-tooltip>
+                          </div>
                         </div>
                       </el-col>
                     </el-row>

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -225,11 +225,10 @@
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
-                    <span v-if="item.Tue_M.patient_id">
-                        
+                    <p v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }}</span>
                         <span>{{ item.Tue_M.mode_name }}</span>
-                    </span>
+                    </p>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
                     <span v-if="item.Tue_A.patient_id ">