新分支

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -409,6 +409,7 @@ export default {
     },
     //选中行数
     handleCurrentChange(val) {
+      console.log("state--",this.state)
       this.currentRow = val;
       console.log("this.currentRow", this.currentRow);
       if (this.state == 1) {

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -267,13 +267,13 @@
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="封管液" v-if="dialysisSett.blood_access==1">
+        <el-table-column align="center" label="封管液" v-if="dialysisSett.blood_access==1 && org_id!=10629">
            <template slot-scope="scope">
              <span v-if="getBloodAccessOption(scope.row.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
            </template>
         </el-table-column>
 
-        <el-table-column align="center" label="促红" v-if="org_id!=10599">
+        <el-table-column align="center" label="促红" v-if="org_id!=10599 && org_id!=10629">
            <template slot-scope="scope">
               {{ scope.row.advice_spc }}
            </template>

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -49,11 +49,11 @@
                 <td width="100" v-if="dialysisSett.calcium==1">钙</td>
                 <td width="100" v-if="dialysisSett.bicarbonate == 1">碳酸氢盐</td>
                 <td width="100" v-if="dialysisSett.blood_access==1">血管通路</td>
-                <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
+                <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1 && org_id!=10629">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">封管液</td>
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">促红</td>
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">封管液</td>
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">促红</td>
               </tr>
               </thead>
               <tbody>
@@ -175,13 +175,13 @@
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599 && org_id!=10629">
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
                   <span v-else></span>
                 </td>
                 
                 
-                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599">
+                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599 && org_id!=10629">
                   {{ item.advice_spc }}
                 </td>
                </tr>

src/xt_pages/dialysis/details/index.vue

@@ -19,12 +19,12 @@
           >下一位</el-button
         >   
 
-        <!-- <el-button
+        <el-button
           size="small"
           type="primary"
           @click="history_click"
           
-          >透析历史</el-button> -->
+          >透析历史</el-button>
 
         <el-button
           size="small"
@@ -1199,29 +1199,33 @@
       width="50%"
       >
       <div>
-        <div >
+        <!-- <div >
           透析频率：
           <div class="touxipl"></div>
-        </div>
+        </div> -->
         <div style="margin: 20px 0;">
           <div style="border-left: 2px solid #409eff;color: #409eff;padding: 0 10px;">
             <span>已排详情</span>
           </div>
-          <div>
-            <el-calendar v-model="time_value" >  
-              <template
-                slot="dateCell"
-                slot-scope="{date, data}" @click="viewDayWork(data)">
-                <P v-if="data.day.split('-').slice(1).join('-')=='03-06'"
-                  style="background: red;color: white;text-align: center;">
-                  HD
-                </P>
-                <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;">
-                  {{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '✔️' : ''}}<br/>
-                  <span v-if="data.day.split('-').slice(1).join('-')=='03-06'">上午 门诊</span>
-                </p>
-
+          <div @click="viewDayWork">
+            <el-calendar v-model="time_value">  
+              
+                <template
+                  slot="dateCell"
+                  slot-scope="{date, data}">
+                    <p :class="data.isSelected ? 'is-selected' : ''" style="text-align: center;">
+                      {{ data.day.split('-').slice(2).join('-') }}<br/>
+                      <span v-for="(item,index) in orderList" :key="index" style="background: red;color: white;text-align: center;">
+                        <span v-if="data.day == item.order_date">
+                          {{ getModeId(item.mode_id) }}
+                          <span v-if="item.schedual_type_name ==1">上午</span>
+                          <span v-if="item.schedual_type_name ==2">下午</span>
+                          <span v-if="item.schedual_type_name ==3">晚上</span>
+                        </span>
+                      </span>
+                    </p>
               </template>
+            
             </el-calendar>
           </div>
         </div>
@@ -1261,6 +1265,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
 import Calendar from 'vue-calendar-component'
+import data from '../../../store/modules/data'
 export default {
   name: 'index',
   components: {
@@ -1409,9 +1414,9 @@ export default {
       historyclick:false,
       time_value:new Date(),
       
-      startTime:'',
-      endTime:'',
-      
+      start_time:moment().startOf('months').format('YYYY-MM-DD'),
+      end_time:moment().endOf('months').format('YYYY-MM-DD'),
+      orderList:[]
     }
   },
   created() {
@@ -2098,7 +2103,7 @@ export default {
       }
     },
     requestDialysisSchedules: function() {
-      console.log("时间人民站起来了呃")
+     
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
@@ -2922,29 +2927,89 @@ export default {
     },
     // 透析历史
     history_click(){
-      this.historyclick =true
+      this.getPatientDialysisRecordList()
       // this.getmonth(this.time_value2)
       // console.log('time_value',moment(this.time_value2).format('YYYY-MM-DD'));
     },
+    getPatientDialysisRecordList(){
+      var params= {
+        patient_id:this.$route.query.patient_id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+      getPatientDialysisRecordList(params).then(response=>{
+         if(response.data.state == 1){
+           var list  = response.data.data.list
+           this.historyclick =true
+           if(list!=null && list.length>0){
+             for(let i=0;i<list.length;i++){
+              
+               list[i].order_date =""
+               if(this.org_id ==9538 || this.org_id ==10101||this.org_id ==10353){
+                  list[i].order_date = this.getOrderTime(list[i].dialysis_date) 
+                  list[i].schedual_type_name= list[i].schedual_type
+               }else{
+                 list[i].order_date = this.getOrderTime(list[i].schedule_date) 
+                 list[i].schedual_type_name= list[i].schedule_type
+               }
+              
+             }
+           }
+           console.log("list------",list)
+           this.orderList = []
+           this.orderList = list
+         }
+      })
+    },
     // 获取每个月的第一天和最后一天
     getmonth(val){
-      const months= new Date(val).getMonth()
-      let startTime =  moment().month(months).startOf('month').format('YYYY-MM-DD')
+      // const months= new Date(val).getMonth()
+      // let startTime =  moment().month(months).startOf('month').format('YYYY-MM-DD')
       
-      //   //某月最后一天
-      let endTime = moment().month(months).endOf('month').format('YYYY-MM-DD')
-      this.startTime = startTime
-      this.endTime = endTime
-      console.log('time_value333333',this.startTime,this.endTime);
+      // //   //某月最后一天
+      // let endTime = moment().month(months).endOf('month').format('YYYY-MM-DD')
+      // this.startTime = startTime
+      // this.endTime = endTime
+      // console.log('time_value333333',this.startTime,this.endTime);
+    },
+    getOrderTime(val){
+      if (val < 0) {
+        return "";
+      }
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
+      }
+    },
+    viewDayWork(val){
+      console.log("val33333333333333",val)
+      var patient_id = this.$route.query.patient_id
+      var start_time = this.timestamp(this.start_time)
+      this.$router.push({
+        path: "/dialysis/details",
+        query: { patient_id:patient_id , date: start_time}
+      });
+      this.history_click = false
+    },
+    timestamp(start_time) {
+      // 使用 Date 对象和它的 getTime 方法将日期字符串转换为时间戳
+      return new Date(start_time).getTime()/1000 - 28800;
     }
+  
   },
   watch:{
     time_value:{
       handler(newValue,oldValue){
+        console.log("newValue----------",newValue)
         // this.initData()
         this.time_value = newValue
         this.getmonth(this.time_value)
         console.log('yyyyyyyyyyy',moment(this.time_value).format('YYYY-MM-DD'),moment(oldValue).format('YYYY-MM-DD'))
+
+        this.start_time = moment(this.time_value).format('YYYY-MM-DD')
+        this.end_time =   moment(oldValue).format('YYYY-MM-DD')
+
       }
     }
   }

src/xt_pages/dialysis/longSignPrint.vue

@@ -37,6 +37,7 @@
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                              

src/xt_pages/dialysis/signPrint.vue

@@ -36,6 +36,7 @@
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                              

src/xt_pages/outpatientDoctorStation/batch_replacement.vue

@@ -519,6 +519,7 @@ export default {
     this.getdrugconfigs();
     let tableHeight = document.body.clientHeight - 263;
     this.tableHeight = tableHeight;
+    this.getusernames();
   },
   mounted() {
     const that = this;
@@ -544,6 +545,16 @@ export default {
     },
   },
   methods: {
+    getusernames(){
+      var params = {}
+      gethisusertoalive(params).then((res) =>{
+        console.log("this.res",res)
+        if (res.data.state == 1){
+          this.tableData = res.data.data.list;
+          console.log("this.tableData", this.tableData);
+        }
+      });
+    },
     save() {
       var tmp = this.modeOptions[this.modeOptions_value].name;
       var tmp2 = "";
@@ -740,6 +751,7 @@ export default {
       console.log(">>>>>>>", this.new_type);
       this.id = "";
       this.tableData = [];
+      this.getusernames()
     },
     changeid(item, index) {
       console.log("");
@@ -831,6 +843,7 @@ export default {
       replacepeoplename(params).then((res) => {
         if (res.data.state == 1) {
           this.tableData = res.data.data.list;
+          
         }
       });
     },