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

src/xt_pages/Dialysisanalysis/otherIndicators/index.vue

@@ -7,23 +7,22 @@
       <div class="app-container">
         <div class="page_patientControlAnalysis">
           <div class="photos">
-            <div v-for="(item,index) in 3" :key="index"  @click="echart_click(index)"
+            <div v-for="(item,index) in indicators" :key="index"  @click="echart_click(item)"
               style="width: 280px;height: 360px;border:1px solid gainsboro;border-radius: 8px;margin: 0 0 30px 28px"
             >
-              <div v-if="index+1==1" class="background date_type1" style="background-repeat: no-repeat;"></div>
-              <div v-if="index+1==2" class="background date_type2" style="background-repeat: no-repeat;"></div>
-              <div v-if="index+1==3" class="background date_type3" style="background-repeat: no-repeat;"></div>
-              <p class="title">留治患者透析龄分析</p>
+<!--              <div v-if="index+1==1" class="background date_type1" style="background-repeat: no-repeat;"></div>-->
+              <div v-if="item.check_type == 1" class="background date_type2" style="background-repeat: no-repeat;"></div>
+              <div v-if="item.check_type == 2" class="background date_type3" style="background-repeat: no-repeat;"></div>
+              <p class="title">{{item.item_name}}</p>
               <div class="tag">
                 <span class="tags">留治患者</span>
                 <span class="tags">转归</span>
                 <span class="tags">死亡</span>
               </div>
-              <span class="use">已使用14次</span>
-              <!-- <span class="shoucang" style="background-repeat: no-repeat;"></span> -->
+<!--              <span class="use">已使用14次</span>-->
+               <span class="shoucang" style="background-repeat: no-repeat;"></span>
+              </div>
             </div>
-          </div>
-
         </div>
       </div>
     </div>
@@ -39,19 +38,7 @@ export default {
     },
     data() {
         return {
-          indicators:[{
-            name:"钾离子",
-            project_id:0,
-            item_id:0,
-          },{
-            name:"钠离子",
-            project_id:0,
-            item_id:0,
-          },{
-            name:"无机磷",
-            project_id:0,
-            item_id:0,
-          }],
+          indicators:[],
             activeName: 'first'
         }
     },
@@ -63,6 +50,29 @@ export default {
         getStatisticsList(params).then(response => {
           if (response.data.state == 1) {
             this.indicators  =  this.indicators.concat(response.data.data.configurationlist)
+            for(let i = 0; i < this.indicators.length; i++){
+              this.indicators[i]["check_type"] = 1
+              this.indicators[i]["sub_check_type"] = 1
+
+            }
+            let obj = {
+              "check_type":1,
+              "item_name":"KTV/URR",
+              "sub_check_type":2
+            }
+            this.indicators.push(obj)
+
+            let obj2 = {
+              "check_type":2,
+              "item_name":"指标汇总",
+              "sub_check_type":3
+
+            }
+            this.indicators.push(obj2)
+
+
+            console.log( this.indicators)
+            // this.indicators.push("")
           } else {
             this.$message.error(response.data.msg)
           }
@@ -74,17 +84,21 @@ export default {
       handleClick(tab, event) {
         console.log(tab, event);
       },
-      echart_click(num){
-        console.log(num)
-        if(num==0){
-          this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/columnarTotal')
-        }else if(num==1){
-          this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/CakeshapeTotal')
-        }else{
-          this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/tableTotal')
+      echart_click(item){
+        if(item.check_type == 1){
+          if(item.sub_check_type == 1){
+            this.$router.push('/Dialysisanalysis/qualitycontrol/Indicatorsdetail?project_id='+item.inspection_major+"&item_id="+item.inspection_minor+"&project_type="+parseInt(item.id))
+
+            // this.$router.push('/Dialysisanalysis/qualitycontrol/otherIndicators/components/columnarTotal')
+
+          }else if(item.sub_check_type == 2){
+            this.$router.push('/Dialysisanalysis/qualitycontrol/platelets')
+          }
+        }else if(item.check_type == 2){
+          this.$router.push('/Dialysisanalysis/qualitycontrol/summary')
         }
-        
-        
+
+
       }
     },
     created(){
@@ -111,7 +125,7 @@ export default {
   .date_type3{
     background: url('../../../assets/img/biaoge.png');
   }
-  
+
   .title{
     font-size: 18px;
     margin: 15px 10px;

src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsall.vue

@@ -508,7 +508,11 @@ export default {
           this.reference = response.data.data.reference
           this.config = response.data.data.config
 
-          this.input = this.config.min_range + "<=" + response.data.data.reference.item_name + "<=" +this.config.large_range
+          for(var i = 0; i < this.indicators.length;i++){
+            if(this.indicators[i].id == this.project_type){
+              this.input = this.config.min_range + "<=" +  this.indicators[i].label + "<=" +this.config.large_range
+            }
+          }
           let objone = {
             value:  response.data.data.unusual_total ,
             name: '不达标值患者',

src/xt_pages/dialysis/details/index.vue

@@ -1412,7 +1412,9 @@ export default {
 
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
-      orderList:[]
+      orderList:[],
+      // start_time2:'',
+      // end_time2:'',
     }
   },
   created() {
@@ -2933,15 +2935,15 @@ export default {
         start_time:this.start_time,
         end_time:this.end_time,
       }
+      console.log('tttt',params);
       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){
+               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{
@@ -2979,6 +2981,8 @@ export default {
       }
     },
     viewDayWork(val){
+      const starttime = moment(this.time_value).format('YYYY-MM-DD')
+      console.log('eeeeeeee',starttime);
       const len = (val.target.innerText).split(' ')
       console.log("val33333333333333444",len)
       if(val.target.innerText == '下个月'){
@@ -2991,8 +2995,7 @@ export default {
         // console.log('4444',this.orderList);
         if(len.length>1){
           var patient_id = this.$route.query.patient_id
-          var start_time = this.timestamp(this.start_time)
-          console.log("start_Time-------",start_time)
+          var start_time = this.timestamp(starttime)
           this.$router.push({
             path: "/dialysis/details",
             query: { patient_id:patient_id , date: start_time}
@@ -3018,7 +3021,9 @@ export default {
         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')
+        console.log('rrrrr',this.start_time);
         this.end_time =   moment(oldValue).format('YYYY-MM-DD')
       }
     }

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -1493,8 +1493,16 @@ export default {
                   that.info['number'] = response.data.data.number
                   that.info['order_infos'] = response.data.data.order_infos
                   that.info['diagnosis'] = response.data.data.diagnosis
-                  that.info['org_code'] = response.data.data.org_code
-                  that.info['org_name'] = response.data.data.org_name
+                  if(that.org_id == 10191){
+                    that.info['org_code'] = "H36030201006"
+                    that.info['org_name'] = "萍乡欣瑞怡康血液透析中心"
+                  }else{
+
+                    that.info['org_code'] =response.data.data.org_code
+                    that.info['org_name'] = response.data.data.org_name
+                  }
+
+
                   that.info['doctor_code'] = response.data.data.doctor_code
                   that.info['department'] = response.data.data.department
                   that.info['health_card_no'] = response.data.data.health_card_no

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -42,7 +42,11 @@
           <el-table v-if="subItem.type  == 1" :data="subItem.doctor_advice" border style="width: 99%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
+            <el-table-column align="center"  width="60" label="序号">
+              <template slot-scope="scope">
+              <span>{{ scope.row.groupno}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="drug_name"  width="160" label="名称">
               <template slot-scope="scope">
                 <span>{{ scope.row.advice_name }}</span>
@@ -278,7 +282,6 @@
             let tempProject = [];
             let tempAddition = [];
             for (let b = 0; b < prescription.doctor_advice.length; b++) {
-              let index = b + 1
               let obj = {
                 advice_id: 0,
                 drug_name: prescription.doctor_advice[b].advice_name,
@@ -294,7 +297,7 @@
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
-                groupno: index,
+                groupno: prescription.doctor_advice[b].groupno,
                 hosp_appr_flag:"1",
               };
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
@@ -379,7 +382,7 @@
         this.srcPrescriptions = srcPrescriptions;
         this.start_time  = start_time
         this.end_time = end_time;
-      
+
         this.patient_id = id;
         this.name = '处方调用' + '（'+name +'）';
         this.allPrescription = prescriptions;

src/xt_pages/user/inspection.vue

@@ -150,7 +150,7 @@
                     </span>
                     </div>
                   <div v-else>
-                    <img :src="scope.row.value"> 
+                    <img :src="scope.row.value">
                   </div>
                 </template>
               </el-table-column>
@@ -202,7 +202,7 @@
                               content="点击查看大图"
                               placement="top-start"
                               >
-                                <img style="width: 300px;height: 150px;" :src="item.value" alt=""> 
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
                               </el-tooltip>
                           </div>
                         </div>
@@ -1231,9 +1231,9 @@ export default {
       } else {
         this.itemLoading = true
         this.project = row
+
         this.items = row.inspection_reference
         this.itemName = row.project_name
-
         this.queryParams.patient = this.patientID
         this.queryParams.project_id = this.project.project_id
         this.queryParams.page = 1
@@ -1347,7 +1347,7 @@ export default {
               }else{
                 this.items.push(item)
               }
-             
+
 
               console.log("items232232332wo",item.value.indexOf('http'))
 
@@ -1358,11 +1358,11 @@ export default {
               if(this.org_id!=10503){
                 this.isPic = false
               }
- 
+
               console.log("woowwoow",this.isPic)
-              
-              
-              
+
+
+
               console.log("isPicwowowow",this.items)
             }
           }