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

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -333,7 +333,7 @@
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换量<br /><br />ml</td>-->
-                        <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
+                        <td width="60" style="height:20px;line-height:20px">血容量<br />L</td>
                         <td width="">病情变化及处理</td>
                     </tr>
 
@@ -357,7 +357,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
-                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
+                        <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
                         <td style="text-align:left;padding-left:10px;">
                             <div style="line-height:20px;text-align: left;display: inline-block;">
                                 &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}

src/xt_pages/dialysis/details/NavIgation.vue

@@ -138,6 +138,7 @@
       :dialysis_order="dialysis_order"
       :his_is_open="his_is_open"
       :predialysis="predialysis_evaluation"
+      :is_advice_open="is_advice_open"
     ></doctor-advice-dialog>
 
     <computer-dialog
@@ -306,6 +307,13 @@ export default {
         return [];
       }
     },
+    his_doctor_advices:{
+     // 临时医嘱
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
     double_check: {
       // 双人核对
       type: Object,
@@ -537,10 +545,17 @@ export default {
       default: () => {
         return { id: 0 };
       }
-    }
+    },
+    is_advice_open:{
+      type: Number,
+      default: () => {
+        return 0;
+      }
+    },
   },
   methods: {
     getUnReadNum: function() {
+      console.log("医嘱中国23322222222222222222222222222",this.doctor_advices)
       let doctorAdvice = [];
       for (let y = 0; y < this.doctor_advices.length; y++) {
         if (this.doctor_advices[y].execution_state == 2) {
@@ -550,10 +565,21 @@ export default {
       const sorted = this.groupBy(doctorAdvice, function(item) {
         return [item.groupno];
       });
-      console.log(doctorAdvice);
-      console.log(sorted.length);
-
-      return sorted.length;
+     
+    
+      // var strLength = 0
+      // var arr = []
+      // if(this.his_doctor_advices!=undefined && this.his_doctor_advices.length > 0){
+      //   for(let i=0;i<this.his_doctor_advices.length;i++){
+      //     if (this.his_doctor_advices[i].execution_state == 2) {
+      //      arr.push(this.his_doctor_advices[i]);
+      //    } 
+      //   }
+      //   strLength = arr.length
+      // }
+      // console.log("232332323232323223",arrOne.length + strLength);
+      return sorted.length
+      
     },
     groupBy(array, f) {
       const groups = {};
@@ -614,7 +640,7 @@ export default {
       this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis,this.last_assessment_after_dislysis);
     },
     showDoctorAdviceDialog: function() {
-      this.$refs.doctor_advice.show(this.his_is_open);
+      this.$refs.doctor_advice.show(this.his_is_open,this.is_advice_open);
     },
     showComputerDialog: function() {
       this.$refs.computer_dialog.show(this.dialysis_order);
@@ -623,7 +649,7 @@ export default {
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open);
+      this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open,this.is_advice_open);
     },
     showAccepts: function() {
       this.$refs.accepts.show(this.receiver_treatment_access);

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

@@ -136,14 +136,14 @@
       <div class="txsj">
         <el-button
           round
-          v-if="his_is_open != 1"
+          v-if="his_is_open != 1 || is_advice_open == 1"
           @click="openLast(1)"
         >上一方
         </el-button>
 
         <el-button
           round
-          v-if="his_is_open != 1"
+          v-if="his_is_open != 1 || is_advice_open == 1"
           @click="openNext(2)"
         >下一方
         </el-button>
@@ -154,7 +154,7 @@
           round
           @click="openGroupFrom"
           :loading="deleLoading"
-          v-if="his_is_open != 1"
+          v-if="his_is_open != 1 || is_advice_open == 1"
           :disabled="!is_has_create"
         >新增医嘱
         </el-button>
@@ -189,6 +189,7 @@
           :loading="deleLoading"
         >修改医嘱
         </el-button>
+
         <el-button v-else disabled round @click="openEditGroupAdvice" :loading="deleLoading">修改医嘱</el-button>
 
         <el-button
@@ -207,7 +208,7 @@
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table
-        v-if="his_is_open == 0"
+        v-if="his_is_open !=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
         border
@@ -242,8 +243,8 @@
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1 " @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1 " @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
 
@@ -300,7 +301,7 @@
 
 
       <el-table
-        v-else
+        v-if="his_is_open  == 1 || is_advice_open == 1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
         border
@@ -325,7 +326,7 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容32323" align="center">
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link">
@@ -333,9 +334,9 @@
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open == 1  && scope.row.origin == 1 " @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open == 1  && scope.row.origin == 1" @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open == 1  && scope.row.origin == 1" @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
 
@@ -345,8 +346,8 @@
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
-                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open == 1  && scope.row.origin == 1" @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open == 1  && scope.row.origin == 1" @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -763,6 +764,7 @@
         title: '临时医嘱',
         add_title: '新增医嘱',
         his_is_open:0,
+        is_advice_open:0,
         showAdviceForm: false,
         showAdvicePanel: true,
         showNameForm: false,
@@ -926,8 +928,7 @@
               adviceNames: this.other_doctor_advices,
               remark: ''
             }
-            console.log("2223333",submitForm)
-
+           
             let mode = '1'
             CreateGroupAdvice(this.patientid, 0, submitForm, mode).then(
               response => {
@@ -980,7 +981,7 @@
           this.$message.error('没有选择患者')
           return false
         }
-        // console.log(this.form)
+        
         let mode = '2'
         if (this.form.advice_doctor != this.$store.getters.xt_user.user.id) {
           mode = '3'
@@ -1160,11 +1161,16 @@
       }
       ,
       openDeleteGroupAdvice(val) {
-        console.log("val2323233232",this.groupSelectRow)
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要删除的医嘱内容')
           return
         }
+        if(this.groupSelectRow!=null){
+           if(this.groupSelectRow.origin == 2){
+              this.$message.error('处方医嘱不能删除')
+              return
+           }
+        }
         if(this.groupSelectRow.execution_state == 1){
            this.$message.error("已执行的医嘱无法删除!")
            return
@@ -1203,7 +1209,7 @@
             isEdit: 1,
             index: this.groupSelectRow.index
           }
-          console.log("88888888",this.nameForm)
+         
         } else {
           this.nameForm = {
             advice_name: '',
@@ -1261,7 +1267,7 @@
       }
       ,
       submitExce() {
-        console.log(this.currentRow.origin)
+        
         if (this.currentRow == null) {
           this.$message.error('请先选择要执行的医嘱！')
           return false
@@ -1368,8 +1374,7 @@
           this.form.advice_name = arr[0]
        }
 
-        console.log("新增医嘱子药",this.form)
-
+        
         CreateDoctorAdvice(this.patient.id, this.form, mode)
           .then(response => {
             this.loading = false
@@ -1412,14 +1417,14 @@
                     var swapData = this.doctor_advices.splice(spliceIndex)
                     this.doctor_advices.push(response.data.data.advice)
                     for (var index in swapData) {
-                      this.doctor_advices.push(swapData[index]) // = this.doctor_advices.concat(swapData);
+                      this.doctor_advices.push(swapData[index]) 
                     }
                   }
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
               }
-              // this.$emit("new_create", response.data.data.advice);
+              
               return false
             }
           })
@@ -1552,17 +1557,22 @@
       ,
 
       openEditGroupAdvice() {
-        console.log("医嘱泪奔23332233223",this.groupSelectRow)
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要修改的医嘱内容')
           return
         }
-        console.log("22222",this.groupSelectRow.groupno)
+        if(this.groupSelectRow!=null){
+          if(this.groupSelectRow.origin == 2){
+            this.$message.error("处方医嘱不能修改")
+            return
+          }
+        }
         this.$refs.editGroupForm.open(this.groupSelectRow.groupno)
       }
       ,
 
       openGroupFrom() {
+        
         this.$refs.addGroupForm.open()
 
         // this.title="新增医嘱";
@@ -1596,8 +1606,6 @@
       }
       ,
       checkAdvice() {
-        console.log(this.currentRow)
-        // console.log(this.$store.getters.xt_user)
         if (this.currentRow == null) {
           this.$message.error('请先选择要核对的医嘱！')
           return false
@@ -1788,9 +1796,8 @@
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        })
-          .then(() => {
-            console.log(this.currentRow)
+        }).then(() => {
+           
             let mode = '4'
             if (
               this.currentRow.advice_doctor != this.$store.getters.xt_user.user.id
@@ -2030,9 +2037,10 @@
         this.$refs.addGroupForm.open()
       }
       ,
-      show(his_is_open) {
+      show(his_is_open,is_advice_open) {
+       
         this.his_is_open = his_is_open
-        console.log(this.his_is_open)
+        this.is_advice_open = is_advice_open
         this.isVisibility = true
         this.getPermission()
       }
@@ -2136,7 +2144,6 @@
         }
       },
       cellMouseEnter: function(row, column, event) {
-        console.log("数据是",row)
         this.currentRow = row
         this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {
@@ -2238,9 +2245,7 @@
               check_url: '/api/patients/advice/check?mode=7',
               module: 4
             }
-          })
-          .then(res => {
-            console.log(res)
+          }).then(res => {
             if (res.data.state == 0) {
               this.hasPermission = false
             } else if (res.data.state == 1) {
@@ -2312,8 +2317,7 @@
           if (response.data.state == 1) {
 
             var doctor_advices = response.data.data.advices
-            console.log("doctor_advices",doctor_advices)
-
+           
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule
@@ -2325,15 +2329,27 @@
 
       },
       getDialysisScheduleDetail() {
-        console.log("触发伏组件")
         if(this.$route.query.showView && this.$route.query.showView == true){
           return
         }
         getDialysisScheduleDetail(this.patientid, this.record_date).then(response => {
           if (response.data.state == 1) {
+           this.doctor_advices = []
             var doctor_advices = response.data.data.doctor_advices
             this.doctorAdvices = doctor_advices
-            this.doctor_advices = doctor_advices
+            if(doctor_advices !=undefined && doctor_advices.length > 0){
+              for(let i=0;i<doctor_advices.length;i++){
+                doctor_advices[i]['origin'] = 1
+                this.doctor_advices.push(doctor_advices[i])
+              }
+            }
+           var his_advices = response.data.data.his_advices
+            if(his_advices!=undefined && his_advices.length > 0){
+              for(let i=0;i<his_advices.length;i++){
+                 his_advices[i]['origin'] = 2
+                 this.doctor_advices.push(his_advices[i])
+              }
+            }
           }
         })
       }
@@ -2433,7 +2449,6 @@
                 obj.type = 2
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
-                // console.log("222",this.all_drug)
                 this.all_drug.push(obj)
               }
             }
@@ -2470,7 +2485,6 @@
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
-                // console.log("2222",this.all_drug)
               }
             }
         })
@@ -2518,14 +2532,14 @@
       },
 
      querySearch(queryString, cb) {
-        console.log('queryString',queryString)
+      
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-        console.log('results',results)
+     
         cb(results);
      },
 
@@ -2536,15 +2550,14 @@
      },
 
      querySearch1(queryString, cb) {
-        console.log('queryString',queryString)
+       
         var restaurants = this.drugSpec;
-         console.log(restaurants)
+        
         restaurants.map(item => {
           item.value = item.drug_spec
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-        console.log('results',results)
         cb(results);
       },
      handleSelect(){
@@ -2561,16 +2574,11 @@
       this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id
       this.request_record_date = this.record_date
-
+      
+    
       // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
-    },mounted(){
-      console.log("~~~~~")
-      console.log(this.his_is_open)
-      console.log("~~~~~")
-
-
     },
     components: {
       AddGroupAdvice,

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -703,7 +703,6 @@ export default {
             id:this.groupForm.id,
          
           };
-          console.log("hhhhh",this.drug_id,this.nameForm.way)
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
@@ -714,8 +713,6 @@ export default {
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
-          console.log("88888888",submitForm)
-          console.log("99999",this.medicals)
           if(this.private_drug_config != null&& this.private_drug_config.drug_start == 1){
                
              for(let index=0;index<submitForm.adviceNames.length;index++){
@@ -730,7 +727,6 @@ export default {
                    }
                    if(submitForm.adviceNames[index].children.length == 0){
                      if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
-                       console.log("进来了没有")
                         submitForm.adviceNames[index].way = 2
                         submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
                     }
@@ -739,7 +735,6 @@ export default {
                 }
              }
           }
-          console.log("2222",submitForm)
          
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
@@ -995,6 +990,7 @@ export default {
       this.nameFormTitle = "添加子药内容";
     },
     openGroupAdvice(isEdit) {
+      console.log("hhhahhdhahdhahddhhdhdhh",this.groupSelectRow)
       this.isChild = false;
       if (isEdit) {
         if (this.groupSelectRow === null) {
@@ -1069,11 +1065,7 @@ export default {
     },
     selectAdvice(selection, row) {
      
-     console.log("row",row)
-
-      var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id]
-        .DoctorAdviceTemplate;
-      console.log(adviceArray);
+      var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id].DoctorAdviceTemplate;
       for (let y = 0; y < adviceArray.length; y++) {
         adviceArray[y].selection = false;
       }
@@ -1157,7 +1149,7 @@ export default {
       }
     },
     templateTableChange(currentRow, oldCurrentRow) {
-      console.log("params -----",currentRow)
+     
       this.selectedTemp = { id: 0, name: "", org_id: 0, list: [], rows: [] };
       if (currentRow == null) {
         return false;
@@ -1577,6 +1569,7 @@ export default {
             var medicalList = response.data.data.private_drug_list
             console.log("medicallist",medicalList)
             var base_drug_list = response.data.data.base_drug_list
+            console.log("base_drug_list23233232322323",base_drug_list)
             var base_drug_cofig = response.data.data.base_drug_config
             var private_drug_cofig = response.data.data.private_drug_config
        
@@ -1674,7 +1667,7 @@ export default {
      
     },
     changeDrugDesc(name) {
-        console.log("hhhhhhhhhh",this.drugSpec)
+       
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -1702,7 +1695,7 @@ export default {
       },
 
      querySearch(queryString, cb) {
-        console.log('queryString',queryString)
+        
         var restaurants = this.all_drug;
         restaurants.map(item => {
           item.value = item.drug_name

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

@@ -1937,7 +1937,7 @@
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
-      show(pre, schedual, last, his_is_open) {
+      show(pre, schedual, last, his_is_open,is_advice_open) {
         
         if (pre != undefined) {
           if (pre.oxygen_uptake == 1) {
@@ -1952,6 +1952,9 @@
         if (his_is_open == 1) {
           this.is_open = 0
         }
+        if(is_advice_open == 1){
+          this.is_open = 1
+        }
 
         if(this.$store.getters.xt_user.org.id == 10101){
           if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
@@ -3558,9 +3561,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-        console.log('首季9999', this.dialysisPrescription.anticoagulant_zongliang)
-        console.log("收集",this.dialysisPrescription.anticoagulant_shouji)
-        console.log("weichi",this.dialysisPrescription.anticoagulant_weichi)
+       
         if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
          this.dialysisPrescription.anticoagulant_zongliang = ""
          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)

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

@@ -230,6 +230,7 @@
                 template_id == 46 ||
                 template_id == 47 ||
                 template_id == 48 ||
+                template_id == 51 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -281,6 +282,7 @@
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
+               template_id != 51 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -1061,6 +1063,7 @@
                 template_id == 46 ||
                 template_id == 47 ||
                 template_id == 48 ||
+                template_id == 51 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1103,7 +1106,9 @@
               template_id != 44 &&
               template_id != 46 &&
               template_id != 47 &&
+              template_id != 51 &&
               template_id == 48 &&
+             
               org_id !=  10210 &&
               org_id != 9555
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -33,7 +33,7 @@
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
           <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
-          <th v-if="isShow('血容量')" width="92px">血容量(ml)</th>
+          <th v-if="isShow('血容量')" width="92px">血容量(L)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>

src/xt_pages/dialysis/details/index.vue

@@ -266,8 +266,10 @@
         @assessmentAfterDislysis="assessmentAfterDislysisFunc"
         :system_prescribe="system_prescribe"
         :his_is_open="his_is_open"
+        :is_advice_open="is_advice_open"
         :lastAssessment="lastAssessment"
         :stockType="stockType"
+        :his_doctor_advices="his_doctor_advices"
       >
       </nav-igation>
 
@@ -631,7 +633,7 @@ export default {
       config: {},
 
       his_is_open:0,
-
+      is_advice_open:0,
       lastPredialysisEvaluation: { id: 0 },
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
@@ -684,7 +686,8 @@ export default {
 
       queueConfig:{},
       stockType:[],
-      preparestock:[]
+      preparestock:[],
+      his_doctor_advices:[],
     }
   },
   created() {
@@ -941,6 +944,9 @@ export default {
               if(this.his_is_open == 1){
                 this.is_open = 0
               }
+              if(this.is_advice_open == 1){
+                this.is_open = 1
+              } 
               this.longAdvices = totalAdvice
               this.waitUploadAdvices = waitUploadAdvices
               break
@@ -1143,15 +1149,15 @@ export default {
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-
+          console.log("his_doctor_advices 2323232233232332323323232",this.his_doctor_advices)
+          this.his_doctor_advices = his_doctor_advices
           this.his_is_open = resp.data.is_open_config.is_open
-          console.log(this.his_is_open)
-
-
-
+          
+          this.is_advice_open = resp.data.is_advice_open.is_advice_open
+          console.log("is_advice_open 2323232233232332323323232",this.is_advice_open)
           var stockType =  resp.data.stockType
           this.stockType = stockType
-          console.log("stockTYPW",stockType)
+         
 
           var prepare = resp.data.prepare
           if(prepare!=null){

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -107,7 +107,8 @@
         v-if="
           org_template_info.template_id == 6 ||
           org_template_info.template_id == 10 ||
-          org_template_info.template_id == 11
+          org_template_info.template_id == 11 ||
+          org_template_info.template_id == 50
         "
       >
         <el-button
@@ -664,6 +665,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 51">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1042,6 +1053,11 @@
             v-if="org_template_info.template_id == 50"
           >
           </DialysisPrintOrderFifty>
+          <DialysisPrintOrderFiftyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 51"
+          >
+          </DialysisPrintOrderFiftyOne>
         </div>
       </el-container>
     </div>
@@ -1110,9 +1126,11 @@ import DialysisPrintOrderFortySeven from "./template/DialysisPrintOrderFortySeve
 import DialysisPrintOrderFortyEight from "./template/DialysisPrintOrderFortyEight";
 import DialysisPrintOrderFortyNine from "./template/DialysisPrintOrderFortyNine";
 import DialysisPrintOrderFifty from "./template/DialysisPrintOrderFifty";
+import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyOne,
     DialysisPrintOrderFifty,
     DialysisPrintOrderFortyNine,
     DialysisPrintOrderFortyEight,
@@ -1390,7 +1408,8 @@ export default {
         this.org_template_info.template_id == 10 ||
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
-        this.org_template_info.template_id == 50
+        this.org_template_info.template_id == 50 ||
+        this.org_template_info.template_id == 51
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -310,7 +310,7 @@
                   <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
 <!--                  <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量<br /><br />ml</td>-->
-                  <!-- <td width="60" style="height:20px;line-height:20px">血容量<br />ml</td> -->
+                  <td width="60" style="height:20px;line-height:20px">血容量<br />L</td>
                   <td width="">病情变化及处理</td>
               </tr>
 
@@ -334,7 +334,7 @@
                   <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
 <!--                  <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
-                  <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td> -->
+                  <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
                   <td style="text-align:left;padding-left:10px;">
                       <div style="line-height:20px;text-align: left;display: inline-block;">
                           &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -287,7 +287,7 @@
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
                                           <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
                                               <span
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
                                               <span
@@ -386,7 +386,7 @@
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
                                                 <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217">
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
                                                     {{ scope.row.stock_count }}
                                                 </span>
                         <span v-else> {{ scope.row.total }}</span>
@@ -2737,7 +2737,7 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340) {
         if (row.count <= 0) {
           if (selection) {
             selection.forEach(row => {
@@ -3024,7 +3024,7 @@ export default {
     },
     selectChange(selection, row) {
       console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340) {
         if (row.stock_count <= 0) {
           if (row.type == 3) {
             if (selection) {

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -53,8 +53,8 @@
       <el-form-item label="药物过敏史: " prop="name">
         <el-input v-model="allergic_history" placeholder="药物过敏史"></el-input>
       </el-form-item>
-<!-- 
-  <el-form-item label="初始透析日期: " prop="name">
+
+  <!-- <el-form-item label="初始透析日期: " prop="name">
          <el-date-picker
           :disabled="true"
           style="width:100%;"
@@ -610,12 +610,13 @@
        this.getlist();
        this.getInitData();
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       console.log("232322323",this.case_history);
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){
           this.patientInfo.gender = '女'
         }
+
+      this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
       this.primary_disease = this.case_history.primary_disease
       this.confirm_failure_date = this.case_history.confirm_failure_date
       this.drug_allergy_history = this.case_history.drug_allergy_history

src/xt_pages/hospitalStation/components/dialysisIndex.vue

@@ -62,6 +62,7 @@
           :lastAssessment="lastAssessment"
           :stockType="stockType"
           :mode_id="mode_id"
+          :is_advice_open="is_advice_open"
         >
         </nav-igation>
 
@@ -256,7 +257,7 @@ export default {
       config: {},
 
       his_is_open:0,
-
+      is_advice_open:0,
       lastPredialysisEvaluation: { id: 0 },
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
@@ -584,7 +585,7 @@ export default {
           var schedual = resp.data.schedual // 患者排班信息
 
           var prescription = resp.data.prescription // 透析处方
-          console.log("投产出大发大发233232323232233232",prescription)
+         
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
@@ -732,18 +733,18 @@ export default {
           var his_doctor_advices = resp.data.his_advices
 
           this.his_is_open = resp.data.is_open_config.is_open
-          console.log(this.his_is_open)
-
+          
+          this.is_advice_open = resp.data.is_advice_open.is_advice_open
+          console.log("is_advice_open23223323232322323",this.is_advice_open)
 
 
           var stockType =  resp.data.stockType
           this.stockType = stockType
-          console.log("stockTYPW",stockType)
+          
 
           var prepare = resp.data.prepare
           this.preparestock = prepare
-          console.log("prepare222222",prepare)
-
+        
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -3879,6 +3879,7 @@
       },
 
       opentwo(index) {
+        
         if (index == 1) {
           if (this.patientInfo.id == undefined) {
             this.$message.error('请先选择病人')

src/xt_pages/hospitalStation/recordPrint.vue

@@ -22,7 +22,7 @@
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if="org_id == 10217 || org_id == 0"
+        v-if=" org_id == 0 || org_id == 9671 || org_id == 9675"
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/hospitalStation/recordTemplate/printTwo.vue

@@ -23,36 +23,36 @@
           <span v-if="patient.gender == 1">男</span>
           <span v-if="patient.gender == 2">女</span>
         </div>
-        <div>工作单位：</div>
+        <div>工作单位：{{patient.work_unit}}</div>
        
       </div>
       <div class="infoTitle">
-        <div>出生日期：</div>
-        <div>身份证号：</div>
+        <div>出生日期：{{patient.id_card_no.slice(6,10)}}年{{ patient.id_card_no.slice(10,12) }}月{{patient.id_card_no.slice(12,14) }}日</div> 
+        <div>身份证号：{{patient.id_card_no}}</div>
       </div>
       <div class="infoTitle">
-        <div>联系人：</div>
+        <div>联系人：{{patient.contact_name}}</div>
         <div>联系电话：{{ patient.phone ? patient.phone : "" }}</div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>进入透析时间：</div>
+        <div>进入透析时间：{{getTime(patient.first_dialysis_date)}}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="infoTitle">
-        <div style="width: 300px">原发病：</div>
-        <div>确诊肾衰日期：</div>
+        <div style="width: 300px">原发病：{{history.primary_disease}}</div>
+        <div>确诊肾衰日期：{{getTime(patient.first_dialysis_date)}}</div>
       </div>
       <div class="otherInfo">
         <div>
-          药物过敏史：{{ patient.past_history ? patient.past_history : "" }}
+          药物过敏史：{{ history.allergic_history ? history.allergic_history : "" }}
         </div>
       </div>
       <div class="otherInfo">
-        <div>初始透析日期：</div>
+        <div>初始透析日期：{{getTime(patient.first_dialysis_date)}}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>血管通路：</div>
+        <div>血管通路：{{getAccess(accessList.access_project)}}</div>
         <div style="flex: 1"></div>
       </div>
 
@@ -63,7 +63,7 @@
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 200px;">
+      <div class="otherInfo" style="min-height: 180px;">
         <div class="otherName">现病史：</div>
         <div style="flex: 1">
           {{
@@ -103,23 +103,23 @@
       <div class="recordTitle">
         <div>体格检查</div>
         <div class="recordContent" style="height:250px;">
-            <div>
+          <div>
           <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
           <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
           <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
           <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
-            </div>
-          
+          </div>
+
         </div>
         <div></div>
       </div>
       <div class="recordTitle">
         <div>专科检查</div>
-        <div class="recordContent"></div>
+        <div class="recordContent">{{history.special_inspection}}</div>
       </div>
       <div class="recordTitle" style="border-bottom: 1px solid">
         <div>实验室及器械检查</div>
-        <div class="recordContent" style="height:250px;"></div>
+        <div class="recordContent" style="height:250px;">{{history.lab_apparatus}}</div>
       </div>
       <div style="display: flex; justify-content: end">
         <div class="endInfo">
@@ -127,14 +127,12 @@
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
           </div>
           <div style="display: flex">
-            <div>医师：</div>
+            <div>医师：{{getDoctor(history.doctor) ? getDoctor(history.doctor) : ""}}</div>
             <div>
-              手签：{{
-                getDoctor(history.doctor) ? getDoctor(history.doctor) : ""
-              }}
+              手签：
             </div>
           </div>
-          <div style="text-align: center; letter-spacing: 3px">2000 年 2 月 4 日</div>
+          <div style="text-align: center; letter-spacing: 3px">{{getTime(history.record_date)}}</div>
         </div>
       </div>
     </div>
@@ -145,6 +143,7 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
+import {getAccessList} from "@/api/patient"
 export default {
   props: {
     patient: Object,
@@ -159,6 +158,8 @@ export default {
       orgname: "",
       history: {},
       printDate: "",
+      accessList:{},
+      blood_access_part_opera:[],
     };
   },
   methods: {
@@ -178,11 +179,11 @@ export default {
         birth.substr(6, 2);
       return jsGetAge(births, "-");
     },
-    // show(val) {
-    //   this.patientid = val;
-    //   this.getAllDoctorList();
-    //   this.getPatientCaseHistory();
-    // },
+    show(val) {
+      this.patientid = val;
+      this.getAllDoctorList();
+      this.getPatientCaseHistory();
+    },
     getProfession(id) {
       var name = "";
       for (let i = 0; i < this.educationOptions.length; i++) {
@@ -217,18 +218,17 @@ export default {
       const params = {
         patient_id: this.patientid,
       };
-      console.log("病历22222", params);
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;
-          //    console.log("patinet",patient)
           this.patient = patient;
           var history = response.data.data.history;
-          console.log("中国history222222", history);
           this.history = history;
           var hispatient = response.data.data.hispatient;
-          //    console.log("hispatient",hispatient)
           this.hispatient = hispatient;
+          var accessList = response.data.data.accessList
+          console.log("accesslist2332323232",accessList)
+          this.accessList = accessList
         }
       });
     },
@@ -241,12 +241,39 @@ export default {
       }
       return name;
     },
+    getTime(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+    getAccessList(){
+      getAccessList().then(response=>{
+        if(response.data.state == 1){
+          var blood_access_part_opera = response.data.data.blood_access_part_opera
+          this.blood_access_part_opera = blood_access_part_opera
+        }
+     })
+    },
+    getAccess(id){
+      var name = ""
+      for(let i=0;i<this.blood_access_part_opera.length;i++){
+         if(id == this.blood_access_part_opera[i].value){
+             name = this.blood_access_part_opera[i].name
+         }
+      }
+      return name
+    }
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
     this.getAllDoctorList();
     this.getPatientCaseHistory();
-
+    this.getAccessList()
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();
@@ -254,6 +281,7 @@ export default {
       data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
+
   },
   watch: {
     patientid: function (val) {

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -193,10 +193,10 @@
         let new_project_ids = this.unique(project_ids)
         let list = []
 
-        console.log('ids')
-        console.log(new_drug_ids)
-        console.log(new_project_ids)
-        console.log('ids')
+        // console.log('ids')
+        // console.log(new_drug_ids)
+        // console.log(new_project_ids)
+        // console.log('ids')
 
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -285,7 +285,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 ||org_id ==10340">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -382,7 +382,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2737,7 +2737,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -3015,7 +3015,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -73,7 +73,6 @@
       </el-form-item>
       
   
-
       <el-form-item label="确诊肾衰日期: " prop="name">
          <el-date-picker
           style="width:100%;"
@@ -101,21 +100,21 @@
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
       <el-form-item label="体温:" prop="temperature">
-        <el-input v-model="case_history.temperature" placeholder=""></el-input>
+        <el-input v-model="case_history.temperature" placeholder="体温"></el-input>
         <span>℃</span>
       </el-form-item>
       <el-form-item label="脉搏: " prop="pulse">
-        <el-input v-model="case_history.pulse" placeholder=""></el-input>
+        <el-input v-model="case_history.pulse" placeholder="脉搏"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="呼吸: " prop="breathing">
-        <el-input v-model="case_history.breathing" placeholder=""></el-input>
+        <el-input v-model="case_history.breathing" placeholder="呼吸"></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="血压:" prop="name">
-        <el-input v-model="case_history.sbp" placeholder=""></el-input>
+        <el-input v-model="case_history.sbp" placeholder="血压" style="width:50px"></el-input>
         /
-        <el-input v-model="case_history.dbp" placeholder=""></el-input>
+        <el-input v-model="case_history.dbp" placeholder="血压" style="width:50px"></el-input>
         mmHg
       </el-form-item>
     </el-form>
@@ -629,12 +628,12 @@
       
       this.first_dialysis_date = this.getTime(this.patientInfo.first_dialysis_date)
       
-      this.primary_disease = this.case_history.primary_disease
-      this.confirm_failure_date = this.case_history.confirm_failure_date
-      this.drug_allergy_history = this.case_history.drug_allergy_history
-      this.physical_examination = this.case_history.physical_examination
-      this.special_inspection = this.case_history.special_inspection
-      this.lab_apparatus = this.case_history.lab_apparatus
+      // this.primary_disease = this.case_history.primary_disease
+      // this.confirm_failure_date = this.case_history.confirm_failure_date
+      // this.drug_allergy_history = this.case_history.drug_allergy_history
+      // this.physical_examination = this.case_history.physical_examination
+      // this.special_inspection = this.case_history.special_inspection
+      // this.lab_apparatus = this.case_history.lab_apparatus
     },
     watch:{
       detalid:function(val){

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -59,6 +59,7 @@
           @assessmentAfterDislysis="assessmentAfterDislysisFunc"
           :system_prescribe="system_prescribe"
           :his_is_open="his_is_open"
+          :is_advice_open="is_advice_open"
           :lastAssessment="lastAssessment"
           :stockType="stockType"
           :mode_id="mode_id"
@@ -256,7 +257,7 @@ export default {
       config: {},
 
       his_is_open:0,
-
+      is_advice_open:0,
       lastPredialysisEvaluation: { id: 0 },
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
@@ -550,6 +551,9 @@ export default {
               if(this.his_is_open == 1){
                 this.is_open = 0
               }
+              if(this.is_advice_open == 1){
+               this.is_open =1
+              }
               this.longAdvices = totalAdvice
               this.waitUploadAdvices = waitUploadAdvices
               break
@@ -740,7 +744,8 @@ export default {
 
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-
+           
+          this.is_advice_open = resp.data.is_advice_open.is_advice_open
 
 
           var stockType =  resp.data.stockType

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -22,7 +22,7 @@
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if="org_id == 10217 || org_id == 0"
+        v-if=" org_id == 0 || org_id == 9671 || org_id == 9675"
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -23,36 +23,36 @@
           <span v-if="patient.gender == 1">男</span>
           <span v-if="patient.gender == 2">女</span>
         </div>
-        <div>工作单位：</div>
+        <div>工作单位：{{patient.work_unit}}</div>
        
       </div>
       <div class="infoTitle">
-        <div>出生日期：</div>
-        <div>身份证号：</div>
+        <div>出生日期：{{patient.id_card_no.slice(6,10)}}年{{ patient.id_card_no.slice(10,12) }}月{{patient.id_card_no.slice(12,14) }}日</div> 
+        <div>身份证号：{{patient.id_card_no}}</div>
       </div>
       <div class="infoTitle">
-        <div>联系人：</div>
+        <div>联系人：{{patient.contact_name}}</div>
         <div>联系电话：{{ patient.phone ? patient.phone : "" }}</div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>进入透析时间：</div>
+        <div>进入透析时间：{{getTime(patient.first_dialysis_date)}}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="infoTitle">
-        <div style="width: 300px">原发病：</div>
-        <div>确诊肾衰日期：</div>
+        <div style="width: 300px">原发病：{{history.primary_disease}}</div>
+        <div>确诊肾衰日期：{{getTime(patient.first_dialysis_date)}}</div>
       </div>
       <div class="otherInfo">
         <div>
-          药物过敏史：{{ patient.past_history ? patient.past_history : "" }}
+          药物过敏史：{{ history.allergic_history ? history.allergic_history : "" }}
         </div>
       </div>
       <div class="otherInfo">
-        <div>初始透析日期：</div>
+        <div>初始透析日期：{{getTime(patient.first_dialysis_date)}}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>血管通路：</div>
+        <div>血管通路：{{getAccess(accessList.access_project)}}</div>
         <div style="flex: 1"></div>
       </div>
 
@@ -63,7 +63,7 @@
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 200px;">
+      <div class="otherInfo" style="min-height: 180px;">
         <div class="otherName">现病史：</div>
         <div style="flex: 1">
           {{
@@ -115,11 +115,11 @@
       </div>
       <div class="recordTitle">
         <div>专科检查</div>
-        <div class="recordContent"></div>
+        <div class="recordContent">{{history.special_inspection}}</div>
       </div>
       <div class="recordTitle" style="border-bottom: 1px solid">
         <div>实验室及器械检查</div>
-        <div class="recordContent" style="height:250px;"></div>
+        <div class="recordContent" style="height:250px;">{{history.lab_apparatus}}</div>
       </div>
       <div style="display: flex; justify-content: end">
         <div class="endInfo">
@@ -127,14 +127,12 @@
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
           </div>
           <div style="display: flex">
-            <div>医师：</div>
+            <div>医师：{{getDoctor(history.doctor) ? getDoctor(history.doctor) : ""}}</div>
             <div>
-              手签：{{
-                getDoctor(history.doctor) ? getDoctor(history.doctor) : ""
-              }}
+              手签：
             </div>
           </div>
-          <div style="text-align: center; letter-spacing: 3px">2000 年 2 月 4 日</div>
+          <div style="text-align: center; letter-spacing: 3px">{{getTime(history.record_date)}}</div>
         </div>
       </div>
     </div>
@@ -145,6 +143,7 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
+import {getAccessList} from "@/api/patient"
 export default {
   props: {
     patient: Object,
@@ -159,6 +158,8 @@ export default {
       orgname: "",
       history: {},
       printDate: "",
+      accessList:{},
+      blood_access_part_opera:[],
     };
   },
   methods: {
@@ -217,18 +218,17 @@ export default {
       const params = {
         patient_id: this.patientid,
       };
-      console.log("病历22222", params);
       getPatientCaseHistory(params).then((response) => {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;
-          //    console.log("patinet",patient)
           this.patient = patient;
           var history = response.data.data.history;
-          console.log("中国history222222", history);
           this.history = history;
           var hispatient = response.data.data.hispatient;
-          //    console.log("hispatient",hispatient)
           this.hispatient = hispatient;
+          var accessList = response.data.data.accessList
+          console.log("accesslist2332323232",accessList)
+          this.accessList = accessList
         }
       });
     },
@@ -241,12 +241,39 @@ export default {
       }
       return name;
     },
+    getTime(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+    getAccessList(){
+      getAccessList().then(response=>{
+        if(response.data.state == 1){
+          var blood_access_part_opera = response.data.data.blood_access_part_opera
+          this.blood_access_part_opera = blood_access_part_opera
+        }
+     })
+    },
+    getAccess(id){
+      var name = ""
+      for(let i=0;i<this.blood_access_part_opera.length;i++){
+         if(id == this.blood_access_part_opera[i].value){
+             name = this.blood_access_part_opera[i].name
+         }
+      }
+      return name
+    }
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
     this.getAllDoctorList();
     this.getPatientCaseHistory();
-
+    this.getAccessList()
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();
@@ -254,6 +281,7 @@ export default {
       data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
+
   },
   watch: {
     patientid: function (val) {

src/xt_pages/user/patients.vue

@@ -507,11 +507,7 @@
               >
             </el-radio-group>
           </el-form-item>
-          <!-- <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
-              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">转出</el-radio>
-              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">死亡</el-radio>
-
-          </el-form-item> -->
+         
           <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required>
             <el-date-picker
               v-model="lapsetoForm.lapseto_time"
@@ -864,7 +860,7 @@
           var isHasDryWeight = header.includes('干体重(kg)')
           var isHasHeight = header.includes('身高(cm)')
           var isHasHomeAddress = header.includes('家庭住址')
-
+         
           if (!(isHasName && isHasGender && isHasPhone && isHasIdCard && isHasDate && isHasSource && isHasLapseto && isHasInfectious && isHasDiagnose && isHasDialysisNo && isHasDryWeight && isHasHeight && isHasHomeAddress)) {
             this.dialogVisible = true
             return