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

src/api/advice.js

 }
 
 export function getNewLongSchedualDoctors(params){
+  console.log("params-----------",params)
   return request({
     url: '/api/schedule/new/long/advices',
     method: 'get',

src/xt_pages/Dialysisanalysis/otherIndicators/index.vue

       <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>
     },
     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'
         }
     },
         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)
           }
       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(){
   .date_type3{
     background: url('../../../assets/img/biaoge.png');
   }
-  
+
   .title{
     font-size: 18px;
     margin: 15px 10px;

src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsall.vue

           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/batch_print/batch_print_order_six.vue

 
                   
                     </div>
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      备注：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{ record.assessment_after_dislysis.remark ?record.assessment_after_dislysis.remark : "/" }}
+                      </div>
+                    </div>
+                  </div>
 
                     <div
                       class="row"
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 14
+              this.records[recordIndex].advices.length < 10
             ) {
-              delghTwo = 14 - this.records[recordIndex].advices.length;
+              delghTwo = 10 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
                 rightIndex in advices ? advices[i + halfLen] : []
               );
             }
-            if (halfLen < 8) {
-              var nl = 8 - leftAdvice.length;
+            if (halfLen < 6) {
+              var nl = 6 - leftAdvice.length;
               for (let index = 0; index < nl; index++) {
                 leftAdvice.push([]);
               }
-              var nl = 8 - rightAdvice.length;
+              var nl = 6 - rightAdvice.length;
               for (let index = 0; index < nl; index++) {
                 rightAdvice.push([]);
               }

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

           if(response.data.state == 1){
             this.startDialogVisible = true
             var list = response.data.data.list
+            console.log("list===========",list)
             var kaliumCount = 0
             var sodiumCount = 0
             var calciumCount = 0
                  list[i].dialysis_irrigation_arr = []
                  list[i].puncture_needle_arr = []
                  list[i].dialysis_strainer_arr = []
-
-                 if(list[i].dialysis_solution.dialysis_dialyszers!=""){
+                 
+                 if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
+                  if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
+                   list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
+                  }
+                 }else{
+                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
+                  }
                  }
-                 if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
-                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
+
+                 if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
+                  if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
+                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
+                  }
+                 }else{
+                  if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
+                    list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
+                   }
                  }
-                 if(list[i].dialysis_solution.dialysis_irrigation!=""){
-                   list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
+                
+                 if(list[i].dialysis_prescription.dialysis_irrigation!=""){
+                  if(list[i].dialysis_prescription.dialysis_irrigation!=""){
+                   list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
+                   }
+                 }else{
+                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
+                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
+                   }
                  }
-                 if(list[i].dialysis_solution.dialysis_strainer!=""){
-                   list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 
+                 if(list[i].dialysis_prescription.dialysis_strainer!=""){
+                  if(list[i].dialysis_prescription.dialysis_strainer!=""){
+                     list[i].dialysis_strainer_arr = list[i].dialysis_prescription.dialysis_strainer.split(",")
+                   }
+                 }else{
+                  if(list[i].dialysis_solution.dialysis_strainer!=""){
+                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                  }
                  }
-                 if(list[i].dialysis_solution.puncture_needle!="" ){
+
+                 if(list[i].dialysis_prescription.puncture_needle!=""){
+                  if(list[i].dialysis_prescription.puncture_needle!="" ){
+                    list[i].puncture_needle_arr = list[i].dialysis_prescription.puncture_needle.split(",")
+                   }
+                 }else{
+                  if(list[i].dialysis_solution.puncture_needle!="" ){
                     list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
+                  }
                  }
+                
+                
+                
                  kaliumCount += parseInt(list[i].dialysis_solution.kalium)
                  sodiumCount += parseInt(list[i].dialysis_solution.sodium)
                  calciumCount +=parseInt(list[i].dialysis_solution.calcium)

src/xt_pages/dialysis/longDoctorAdvice.vue

             </template>
          </el-autocomplete>
          <el-button type="primary" @click="toSeach">搜索</el-button>
+
         </div>
+        <div class="filter-container">
+          <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
+          <el-button type="primary" @click="toSeachOne">搜索</el-button>
+         </div>
         <div class="cell clearfix">
           <label class="title">
             <span class="name">日期查询:</span>
         execution_frequency:"",
         zoneIdList:[],
         partion_str:"",
+        keyword:""
       };
     },
     created() {
            var schedule_type = this.listQuery.schedul_type
            var partition_type = this.listQuery.partition_type
          
-          getNewLongSchedualDoctors({date: newTime,patient_type: 0,advice_type: 1,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
+          getNewLongSchedualDoctors({date: newTime,patient_type: 0,advice_type: 1,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne,keyword:this.keyword}).then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
              this.admin_users = resp.data.adminUser
            if(nameOne == '全部'){
             nameOne = ""
           }
-        this.$router.push({ path: "/dialysis/signLongPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id} });
+        this.$router.push({ path: "/dialysis/signLongPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword} });
   
       },
       batchPrintActionOne: function() {
         var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
 
         return week;
-      }
+      },
+      toSeachOne(){
+      this.requestSchedualDoctors(this.time)
+     }
   
     },
     components: {

src/xt_pages/dialysis/longSignPrint.vue

             execution_frequency:"",
             org_id:0,
             drugList:[],
+            keyword:"",
         }
     },
     methods:{
             delivery_way:this.delivery_way,
             execution_frequency:this.execution_frequency,
             patient_id:this.$route.query.patient_id,
+            keyword:this.keyword
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
       var execution_frequency = this.$route.query.execution_frequency
       this.execution_frequency = execution_frequency
       this.time = moment(time).format('YYYY-MM-DD')
+      var keyword =  this.$route.query.keyword
+      this.keyword = keyword
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)
     }

src/xt_pages/dialysis/newDoctorAdvice.vue

         const { columns, data } = param;
         const sums = [];
         columns.forEach((column, index) => {
-          console.log("index---------",index)
+        
           if (index === 0) {
             sums[index] = '总数';
             return;
           }
           if(index > 2){
             const values = data.map(item => item[column.property]);
-            console.log("data0----------------",data)
+           
 
           }
 
         //  })
         }
       })
-    }
+    },
+   
 
   },
   components: {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

                     <div class="inline_block" style="flex: 1">
                       透析时长：
                       <div class="under_line" style="width: 50px; text-align: center">
-                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
-                      </div>h
+                        {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}h
+                        <span v-if="prescription.dialysis_duration_minute>0">{{prescription.dialysis_duration_minute}}min</span>
+                      </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
                       <span >透析方式：</span>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                                   type="primary"
                                 >读电子凭证
                                 </el-button>
+
+
+                                <el-button
+                                  v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
+                                  size="small"
+                                  @click="open(55,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  type="primary"
+                                >人脸识别
+                                </el-button>
 <!--                                <el-button-->
 <!--                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id == 10480)"-->
 <!--                                  size="small"-->
 
     <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
                      v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
-
     <call-un-association-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-un-association-prescription>
-
     <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
                          :diagnoses="diagnoses"
                          v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
-
     <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
     <el-dialog
       class="centerDialog"
       :visible.sync="statementVisible">
       <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
     </el-dialog>
-
-
     <el-dialog
       class="centerDialog"
       width="1200px"
 <!--      <statementPrintT ref="print" :paramsObj='orderObj'></statementPrintT>-->
       <new-statement-print-three ref="print" :paramsObj='orderObj'></new-statement-print-three>
     </el-dialog>
-
     <el-dialog
       class="centerDialog"
       width="1200px"
       <new-statement-print-two :params-obj="newOrderObj"></new-statement-print-two>
       <!--<newStatementPrint ref="print" :paramsObj='newOrderObj'></newStatementPrint>-->
     </el-dialog>
-
-
     <el-dialog title="输入密码" :visible.sync="pwdFormVisible">
       <el-form :model="form">
         <el-form-item label="密码" :label-width="20">
         <el-button type="primary" @click="comfirmPWDialog">确 定</el-button>
       </div>
     </el-dialog>
-
     <el-dialog
       class="centerDialog"
       width="1200px"
             .catch(function(error) {
             })
         }
+      }else if(index == 55){
+        var that = this
+        let params = {
+          "admin_user_id":this.$store.getters.xt_user.user.id,
+          'his_patient_id': this.hisPatientInfo.id,
+        }
+          axios.get('http://127.0.0.1:9532/api/readelebyface', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.$message({ message: response.data.data.msg, type: 'success', duration: 5000 })
+                }
+              }
+            })
+            .catch(function(error) {
+            })
       }
     },
     getName(admin_user_id) {

src/xt_pages/outpatientCharges/statementPrint.vue

                   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

           <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>
             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,
                 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){
         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/components/PatientForm.vue

 
             <el-col :span="6" :style="isEdit ? 'width:360px' : ''">
               <el-form-item
-                label="系统前透析次数 : "
+                label="系统前透析次数: "
                 prop="user_sys_before_count"
               >
                 <el-input v-model="form.user_sys_before_count"></el-input>
               </el-form-item>
             </el-col>
 
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                  <el-form-item label="住院(门诊)号 : ">
+                    <el-input v-model="form.admissionNumber"></el-input>
+                  </el-form-item>
+              </el-col>
+
             <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="工作单位 : " prop="work">
                   <el-input v-model="form.work"></el-input>
                   <!-- <el-form-item label=" " style="float:left;" label-width="30px">
                   </el-form-item>-->
                 </el-col>
-                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                  <el-form-item label="住院(门诊)号 : ">
-                    <el-input v-model="form.admissionNumber"></el-input>
-                  </el-form-item>
-                </el-col>
+               
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="医保类型 : " prop="reimbursementWayID">
                     <el-select v-model="form.reimbursementWayID">

src/xt_pages/user/inspection.vue

                     </span>
                     </div>
                   <div v-else>
-                    <img :src="scope.row.value"> 
+                    <img :src="scope.row.value">
                   </div>
                 </template>
               </el-table-column>
                               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>
       } 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
               }else{
                 this.items.push(item)
               }
-             
+
 
               console.log("items232232332wo",item.value.indexOf('http'))
 
               if(this.org_id!=10503){
                 this.isPic = false
               }
- 
+
               console.log("woowwoow",this.isPic)
-              
-              
-              
+
+
+
               console.log("isPicwowowow",this.items)
             }
           }