新分支

src/api/advice.js

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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -3036,6 +3036,30 @@
 
                   
                     </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"
@@ -3659,9 +3683,9 @@ export default {
             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;
             }
@@ -3762,12 +3786,12 @@ export default {
                 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

@@ -795,6 +795,7 @@
           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
@@ -811,22 +812,59 @@
                  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

@@ -39,7 +39,12 @@
             </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>
@@ -717,6 +722,7 @@
         execution_frequency:"",
         zoneIdList:[],
         partion_str:"",
+        keyword:""
       };
     },
     created() {
@@ -844,7 +850,7 @@
            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
@@ -1055,7 +1061,7 @@
            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() {
@@ -2013,7 +2019,10 @@
         var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
 
         return week;
-      }
+      },
+      toSeachOne(){
+      this.requestSchedualDoctors(this.time)
+     }
   
     },
     components: {

src/xt_pages/dialysis/longSignPrint.vue

@@ -124,6 +124,7 @@ export default {
             execution_frequency:"",
             org_id:0,
             drugList:[],
+            keyword:"",
         }
     },
     methods:{
@@ -147,6 +148,7 @@ export default {
             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) {
@@ -589,6 +591,8 @@ export default {
       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

@@ -2368,14 +2368,14 @@ export default {
         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)
+           
 
           }
 
@@ -2454,7 +2454,8 @@ export default {
         //  })
         }
       })
-    }
+    },
+   
 
   },
   components: {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -551,8 +551,9 @@
                     <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/user/components/PatientForm.vue

@@ -292,7 +292,7 @@
 
             <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>
@@ -334,6 +334,12 @@
               </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>
@@ -704,11 +710,7 @@
                   <!-- <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">