Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -1062,32 +1062,6 @@
               }
             }
 
-            //
-              if((this.records[recordIndex].assessment_before_dislysis&&this.records[recordIndex].assessment_before_dislysis.systolic_blood_pressure!= 0 && this.records[recordIndex].diastolic_blood_pressure != 0) || (this.records[recordIndex].assessment_before_dislysis && this.records[recordIndex].assessment_before_dislysis.remark.length > 0)) {
-               let records = {
-                   id : -1,
-                  systolic_blood_pressure: this.records[recordIndex].assessment_before_dislysis.systolic_blood_pressure,
-                  diastolic_blood_pressure: this.records[recordIndex].assessment_before_dislysis.diastolic_blood_pressure,
-                  pulse_frequency: 0,
-                  breathing_rate: 0,
-                  venous_pressure: 0,
-                  blood_flow_volume: 0,
-                  ultrafiltration_volume: 0,
-                  sodium_concentration: 0,
-                  symptom: '',
-                  dispose: '',
-                  result:  this.records[recordIndex].assessment_before_dislysis.remark,
-                 monitoring_nurse:this.records[recordIndex].assessment_before_dislysis.creater
-
-               }
-
-                this.records[recordIndex].monitor_records.splice(0,0,records)
-
-              }
-
-
-
-
             var childMap = {}
             for (const index in this.records[recordIndex].advices) {
               if (this.records[recordIndex].advices[index].parent_id == 0) {

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

@@ -284,16 +284,12 @@
           <el-col :span="8">
             <el-form-item label="失衡综合症症状: ">
 
-              <!--<el-select v-model="form.disequilibrium_syndrome_option">-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option v-for="item in this.$store.getters.disequilibrium_syndrome_option" :label="item.name" :value="item.id"-->
-                           <!--:key="item.id"></el-option>-->
-              <!--</el-select>-->
-
-              <el-input v-model="form.disequilibrium_syndrome_option" readonly @focus="showDialog('8')"></el-input>
-
+              <el-select v-model="form.disequilibrium_syndrome_option">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
 
+                <el-option v-for="item in this.$store.getters.disequilibrium_syndrome_option" :label="item.name" :value="item.id"
+                           :key="item.id"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -539,6 +535,11 @@
           this.loading = false
           return false
         }
+        if (this.record_date.length != 10) {
+          this.$message.error('无效的日期')
+          this.loading = false
+          return false
+        }
 
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
@@ -665,13 +666,6 @@
             this.InnerDialogProps.selected = this.form.in_advance_reason
             this.InnerDialogProps.isShowTextArea = false
             break
-          case '8':
-            this.InnerDialogProps.values = this.$store.getters.disequilibrium_syndrome_option
-            this.InnerDialogProps.titles = '失衡综合症症状'
-            this.InnerDialogProps.type = 'disequilibrium_syndrome_option'
-            this.InnerDialogProps.selected = this.form.disequilibrium_syndrome_option
-            this.InnerDialogProps.isShowTextArea = false
-            break
         }
       },
       selectActualTreatmentHour(val) {
@@ -703,9 +697,7 @@
           case 'in_advance_reason':
             this.form.in_advance_reason = val.value.join(',')
             break
-          case 'disequilibrium_syndrome_option':
-            this.form.disequilibrium_syndrome_option = val.value.join(',')
-            break
+
           default:
             break
         }
@@ -723,11 +715,7 @@
         this.isVisibility = false
       }
     },
-
     created() {
-      var date = this.$route.query && this.$route.query.date
-      console.log(date)
-      this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
       this.symptomsOptions = getDataConfig('hemodialysis', 'symptoms')
       this.internalFistulaOptions = getDataConfig('hemodialysis', 'internal_fistula')
@@ -739,8 +727,10 @@
       this.patientGoseOptions = this.$store.getters.patient_gose
       this.observationContentOptions = this.$store.getters.observation_content
 
+      console.log(this.patient)
 
-
+      var date = this.$route.query && this.$route.query.date
+      this.record_date = uParseTime(date, '{y}-{m}-{d}')
     },
     components: {
       MultiSelectBox

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -16,7 +16,7 @@
       <!--<dialysis-print-order-two :patientInfo="patientInfo" :receiverTreatmentAccess="receiverTreatmentAccess" :predialysis="predialysis"></dialysis-print-order-two>-->
 
       <DialysisPrintOrderOne v-bind:childResponse="childResponse" v-if="org_template_info.template_id != 2"> </DialysisPrintOrderOne>
-
+      
       <DialysisPrintOrderTwo v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 2"></DialysisPrintOrderTwo>
 
 
@@ -216,24 +216,6 @@
           return ''
         }
       },
-      getFloat: function(x) {
-        if (x != '.') {
-          var f = Math.round(x * 100) / 100;
-          var s = f.toString();
-          var rs = s.indexOf('.');
-          if (rs <= 0) {
-            rs = s.length;
-            s += '.';
-          }
-          while (s.length <= rs + 1) {
-            s += '0';
-          }
-          return s;
-        } else {
-          return '0.0';
-        }
-
-      },
       modeName(mode_id) {
         return typeof (this.modeOptions[mode_id]) !== 'undefined' && typeof (this.modeOptions[mode_id].name) !== 'undefined' ? this.modeOptions[mode_id].name : ''
       },
@@ -635,13 +617,7 @@
     text-align: center;
     margin-left: 2px;
 
-  }
 
-  .dialysis-print-order .under-line-two {
-    border-bottom: 1px solid #999;
-    width: 95%;
-    text-align: left;
-    margin-left: 2px;
 
   }
 

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1,4 +1,4 @@
-<template>
+<template>   
   <div id="dialysis-print-box">
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{orgname}}</div>
@@ -1189,6 +1189,7 @@
         return name
       },
       setAdminUserES(id) {
+        console.log(id)
         if (id == 0) {
           return ''
         }
@@ -1437,6 +1438,7 @@
                 this.advice_groups.push(group)
               }
             }
+            console.log(this.advice_groups)
           } else {
             this.loading = false
             this.$message.error('请求数据失败')

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -239,7 +239,7 @@
                     </tr>
 
                     <tr v-if="this.predialysis.systolic_blood_pressure != 0&&this.predialysis.diastolic_blood_pressure != 0||this.predialysis.remark.length > 0">
-                      <td>{{透析前}}</td>
+                      <td>{{'透析前'}}</td>
                       <td>{{predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:''}}/{{predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:''}}</td>
                       <td>{{''}}</td>
                       <td>{{''}}</td>
@@ -337,8 +337,7 @@
                       <td  width="100">护士签名</td>
                     </tr>
                     <tr v-for="(monitor,index) in monitors2" :key="index">
-
-                      <td >{{getRecordTime(monitor,'{h}:{i}',index)}}</td>
+                      <td>{{getTime(monitor.operate_time,'{h}:{i}')}}</td>
                       <td>{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}}/{{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
                       <td>{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                       <td>{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
@@ -461,9 +460,9 @@
             <tr>
               <td colspan="2">
                 <div class="row" style="padding: 2px 0;line-height:19px;">
-                    <div class="inline_block" >
+                    <div class="inline_block" style="float: left;">
                       责任护士：
-                      <div class="under_line" style="width: 100px;">
+                      <div class="under-line">
                         <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                         <img class="es-img" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
                       </div>
@@ -1021,28 +1020,8 @@
             return this.adminUser[i].name
           }
         }
-      }, getRecordTime(monitor, temp,index) {
-
-        if (index == 0 && monitor.systolic_blood_pressure != 0 && monitor.diastolic_blood_pressure != 0 || monitor.result.length > 0){
-          return "透析前"
-        }else{
-          if (monitor.operate_time == 0) {
-            return ''
-          }
-          if (monitor.operate_time != undefined) {
-            return uParseTime(monitor.operate_time, temp)
-          }
-          return ''
-
-        }
-
-
       },
       getTime(value, temp) {
-
-
-
-
         if (value == 0) {
           return ''
         }
@@ -1318,7 +1297,11 @@
                     id: this.doctor_advices[index].id,
                     parent_id: this.doctor_advices[index].parent_id,
                     children: this.doctor_advices[index].children,
-                    remark: this.doctor_advices[index].remark
+                    remark: this.doctor_advices[index].remark,
+                    execution_staff: this.doctor_advices[index].execution_staff,
+                    checker: this.doctor_advices[index].checker,
+                    execution_time: this.doctor_advices[index].execution_time,
+                    advice_doctor: this.doctor_advices[index].advice_doctor,
 
                   }
                   doctor_advice['isShow'] = 1