Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

package-lock.json

@@ -14394,6 +14394,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz",
       "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ=="
     },
+    "vue-calendar-component": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz",
+      "integrity": "sha512-BJh7xOBzM7QVcapcN4EbPQ1eZ8Pii1/oy+dzqjZTilRSIDD7SRPdFpnUJwZvs8lCrhtBAyJbYFsdm2SogXWHVQ=="
+    },
     "vue-clipboard": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/vue-clipboard/-/vue-clipboard-0.0.1.tgz",

package.json

@@ -73,6 +73,7 @@
     "sortablejs": "1.7.0",
     "v-fit-columns": "^0.2.0",
     "vue": "2.5.16",
+    "vue-calendar-component": "^2.8.2",
     "vue-clipboard": "0.0.1",
     "vue-clipboard2": "^0.3.1",
     "vue-count-to": "1.0.13",

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

@@ -98,7 +98,9 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-             {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
+            <!-- <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span> -->
+            {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
           </template>
 
         </el-table-column>

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

@@ -42,6 +42,8 @@
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
                   {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
+                  <!-- <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span> -->
                 </td>
                </tr>
               </tbody>

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

@@ -372,7 +372,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460)">
+        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460 || org_id ==10551)">
           <el-form-item label="透析中入量: " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>

src/xt_pages/dialysis/details/index.vue

@@ -1205,20 +1205,23 @@
           <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>
@@ -1259,6 +1262,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: {
@@ -1407,9 +1411,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() {
@@ -2096,7 +2100,7 @@ export default {
       }
     },
     requestDialysisSchedules: function() {
-      console.log("时间人民站起来了呃")
+
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
@@ -2920,29 +2924,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')
-
-      //   //某月最后一天
-      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);
+      // 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);
+    },
+    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/doctorAdviceStaticPrint.vue

@@ -201,9 +201,9 @@
                if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
                   newHisArr.forEach((item, index) => {
-                  let { advice_name } = item
-                  if (!dataInfoOne[advice_name]) {
-                    dataInfoOne[advice_name] = {
+                  let { drug_id } = item
+                  if (!dataInfoOne[drug_id]) {
+                    dataInfoOne[drug_id] = {
                       advice_name:item.advice_name,
                       child: [],
                       count:0,

src/xt_pages/dialysis/longSignPrint.vue

@@ -32,11 +32,10 @@
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <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> 
@@ -54,7 +53,7 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223  || org_id ==10617|| org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -183,9 +183,9 @@
       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340 && org_id!=0 ">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340 || org_id == 0">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
       </div>
 
 
@@ -1492,11 +1492,12 @@ export default {
               ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
           } else {
             tempSingleDoseDesc = row.single_dose ? row.single_dose : '' + '' + row.single_dose_unit ? row.single_dose_unit : ''
+            
           }
         }
 
         if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' 
         }
 
         if (isChild == 1) {
@@ -1862,9 +1863,9 @@ export default {
                if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
                   newHisArr.forEach((item, index) => {
-                  let { advice_name } = item
-                  if (!dataInfoOne[advice_name]) {
-                    dataInfoOne[advice_name] = {
+                  let { drug_id } = item
+                  if (!dataInfoOne[drug_id]) {
+                    dataInfoOne[drug_id] = {
                       advice_name:item.advice_name,
                       child: [],
                       count:0,

src/xt_pages/dialysis/signPrint.vue

@@ -31,7 +31,7 @@
                             <div v-if="org_id ==0 || org_id ==10223">
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
@@ -53,11 +53,11 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.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> 
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2824,7 +2824,12 @@
                       style="flex: 1"
                       v-if="org_id != 10223 && org_id!=10375 && org_id!=10598"
                     >
-
+                      <span v-if="org_id!=10460">
+                          透析中入量(L)：
+                       </span>
+                      <span v-if="org_id==10460">
+                        透析中入量(ml)：
+                      </span>
                       <div
                         class="under_line"
                         style="width: 70px; text-align: center"
@@ -2835,12 +2840,7 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=10460">
-                          透析中入量(L)：
-                        </span>
-                        <span v-if="org_id==10460">
-                          透析中入量(ml)：
-                        </span>
+                      
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
                     </div>
 

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button> 
+          @click="toJiaBan">首拼</el-button>  -->