新分支

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -39,8 +39,8 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" :label="'湿化瓶'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        <!-- {{scope.row.first_total_time?scope.row.first_total_time:""}} -->
-                        {{ scope.row.first_disinfection_time }}
+                        {{ getTimeTwo(scope.row.first_start_time) }} - {{ getTimeTwo(scope.row.first_end_time) }}
+                        <!-- {{ scope.row.first_disinfection_time }} -->
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
@@ -54,7 +54,8 @@
                 <el-table-column prop="date" :label="'止血带'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
                         <!-- {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}} -->
-                        {{ scope.row.sencond_disinfection_time }}
+                        <!-- {{ scope.row.sencond_disinfection_time }} -->
+                        {{ getTimeTwo(scope.row.sencond_start_time) }} - {{ getTimeTwo(scope.row.sencond_end_time) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="责任人" align="center" min-width="60">
@@ -67,7 +68,8 @@
                 <el-table-column prop="province" :label="'医疗垃圾桶'+'\n'+'1000mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
                         <!-- {{scope.row.third_total_time?scope.row.third_total_time:""}} -->
-                        {{ scope.row.third_disinfection_time }}
+                        <!-- {{ scope.row.third_disinfection_time }} -->
+                        {{ getTimeTwo(scope.row.third_start_time) }} - {{ getTimeTwo(scope.row.third_end_time) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="60">
@@ -81,7 +83,8 @@
                 <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
                         <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
-                        {{ scope.row.fourth_disinfection_time }}
+                        <!-- {{ scope.row.fourth_disinfection_time }} -->
+                        {{ getTimeTwo(scope.row.fourth_start_time) }} - {{ getTimeTwo(scope.row.fourth_end_time) }} 
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -95,7 +98,8 @@
                 <el-table-column prop="city" :label="'体温枪'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
                         <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
-                        {{ scope.row.last_disinfection_time }}
+                        <!-- {{ scope.row.last_disinfection_time }} -->
+                        {{ getTimeTwo(scope.row.last_start_time) }} - {{ getTimeTwo(scope.row.last_end_time) }} 
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -994,7 +998,7 @@
 
                             <tr v-for="(item,index) in tableData" :key="index">
                                 <td>{{getTimes(item.record_date) }}</td>
-                                <td>{{item.first_disinfection_time}}</td>
+                                <td>{{getTimeTwo( item.first_start_time)}}- {{getTimeTwo(item.first_end_time)  }}</td>
                                 <td>
                                 <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">
                                    {{getName(item.first_creator)}}
@@ -1003,7 +1007,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{item.sencond_disinfection_time}}</td>
+                                <td>{{getTimeTwo(item.sencond_start_time) }} - {{getTimeTwo( item.sencond_end_time) }}</td>
                                 <td>
                                  <span v-if="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator) == ''">
                                    {{getName(item.sencond_creator)}}
@@ -1012,7 +1016,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{item.third_disinfection_time }}</td>
+                                <td>{{getTimeTwo(item.third_start_time) }} - {{getTimeTwo(item.third_end_time)  }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.third_creator?item.third_creator:item.third_creator) == ''">
                                    {{getName(item.third_creator)}}
@@ -1021,7 +1025,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.third_creator?item.third_creator:item.third_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{ item.fourth_disinfection_time }}</td>
+                                <td>{{getTimeTwo(item.fourth_start_time)  }} - {{getTimeTwo(item.fourth_end_time)  }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator) == ''">
                                    {{getName(item.fourth_creator)}}
@@ -1030,7 +1034,7 @@
                                     <img style="height:30px;" :src="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator)" alt="" srcset="">
                                 </span>   
                                 </td>
-                                <td>{{ item.last_disinfection_time}}</td>
+                                <td>{{getTimeTwo(item.last_start_time) }} - {{getTimeTwo( item.last_end_time) }}</td>
                                 <td>
                                     <span v-if="setAdminUserES(item.last_creator?item.last_creator:item.last_creator) == ''">
                                    {{getName(item.last_creator)}}

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue

@@ -476,23 +476,23 @@
                         
 
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('自体内瘘') > -1" 
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1" 
                             text="自体内瘘"
                           ></check-box>
                           &nbsp;
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('人造血管') > -1" 
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('人造血管') > -1" 
                             text="人造血管"
                           ></check-box>
                           &nbsp;
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('直穿') > -1" 
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('直穿') > -1" 
                             text="直穿"
                           ></check-box>
                           &nbsp;
 
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('颈内静脉') > -1" 
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1" 
                             text="颈内静脉"
                           ></check-box>
                           &nbsp;
@@ -500,13 +500,13 @@
 
                           
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('股静脉') > -1" 
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('股静脉') > -1" 
                             text="股静脉"
                           ></check-box>
                           &nbsp;
 
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('锁骨下') > -1" 
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('锁骨下') > -1" 
                             text="锁骨下"
                           ></check-box>
                           &nbsp;
@@ -514,11 +514,11 @@
 
                           
                           <check-box
-                            :checked="record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('锁骨下') == -1
-                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('股静脉') == -1
-                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('颈内静脉') == -1
-                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('人造血管') == -1
-                            && record&&record.assessment_before_dislysis.blood_access_part_id.indexOf('自体内瘘') == -1
+                            :checked="record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('锁骨下') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('股静脉') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('颈内静脉') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('人造血管') == -1
+                            && record&&record.assessment_before_dislysis.blood_access_part_opera_name.indexOf('自体内瘘') == -1
                             " 
                              
                              text="其他"
@@ -810,53 +810,53 @@
                       <tr v-for="(advice, advice_index) in record.advices" :key="advice_index" style="transform: translateY(3px)">
             
                     <td width="60">
-                      {{ getTime(advice[0].start_time, "{h}:{i}") }}
+                     <span v-if="advice[0]!=undefined">{{ getTime(advice[0].start_time, "{h}:{i}") }}</span>  
                     </td>
                   
                     <td style="text-align: left; padding-left: 5px" width="340">
-                      <span v-if="advice[0].parent_id > 0">---></span>
-                      <span>{{ advice[0].advice_name }}</span>
-                      <span v-if="advice && advice[0].advice_desc"
-                        >({{ advice[0].advice_desc
-                        }}{{ advice[0].drug_spec_unit }})</span
+                      <span v-if="advice[0]&&advice[0].parent_id > 0">---></span>
+                      <span>{{advice[0]&& advice[0].advice_name }}</span>
+                      <span v-if="advice[0] && advice[0].advice_desc"
+                        >({{ advice[0]&&advice[0].advice_desc
+                        }}{{advice[0]&& advice[0].drug_spec_unit }})</span
                       >
-                      <span v-if="advice[0].prescribing_number"
-                        >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                        }}{{ advice[0].prescribing_number_unit }}</span
+                      <span v-if="advice[0]&&advice[0].prescribing_number"
+                        >&nbsp;&nbsp; {{advice[0]&& advice[0].prescribing_number
+                        }}{{advice[0]&& advice[0].prescribing_number_unit }}</span
                       >
-                      <span v-if="advice[0].single_dose != 0"
-                        >{{ advice[0].single_dose
-                        }}{{ advice[0].single_dose_unit }}</span
+                      <span v-if="advice[0]&&advice[0].single_dose != 0"
+                        >{{advice[0]&& advice[0].single_dose
+                        }}{{advice[0]&& advice[0].single_dose_unit }}</span
                       >
 
-                      <span v-if="advice[0].parent_id == 0">{{
-                        advice[0].delivery_way
+                      <span v-if="advice[0]&&advice[0].parent_id == 0">{{
+                        advice[0]&&advice[0].delivery_way
                       }}</span>
-                      <span v-if="advice[0].parent_id == 0">{{
-                        advice[0].execution_frequency
+                      <span v-if="advice[0]&&advice[0].parent_id == 0">{{
+                        advice[0]&&advice[0].execution_frequency
                       }}</span>
-                      <span>{{ advice[0].remark }}</span>
+                      <span>{{advice[0]&&advice[0].remark }}</span>
                     </td>
                 
                   
                     <td style="line-height: 10px" width="90">
-                      <span v-if="setAdminUserES(advice[0].execution_staff) == ''">{{
-                        getAdminUser(advice[0].execution_staff)
+                      <span v-if="setAdminUserES(advice[0]&&advice[0].execution_staff) == ''">{{
+                        getAdminUser(advice[0]&&advice[0].execution_staff)
                       }}</span>
                       <img
                         style="height: 30px"
-                        :src="setAdminUserES(advice[0].execution_staff)"
+                        :src="setAdminUserES(advice[0]&&advice[0].execution_staff)"
                         alt=""
                         srcset=""
                       />
                     </td>
                     <td style="line-height: 30px" width="90">
-                      <span v-if="setAdminUserES(advice[0].checker) == ''">{{
-                        getAdminUser(advice[0].checker)
+                      <span v-if="setAdminUserES(advice[0]&&advice[0].checker) == ''">{{
+                        getAdminUser(advice[0]&&advice[0].checker)
                       }}</span>
                       <img
                         style="height: 30px"
-                        :src="setAdminUserES(advice[0].checker)"
+                        :src="setAdminUserES(advice[0]&&advice[0].checker)"
                         alt=""
                         srcset=""
                         v-else
@@ -954,7 +954,7 @@
                     }}
                 </td>
                 </tr>
-                <tr style="height: 50px; text-align: left" v-if="org_id==10430||org_id==9675">
+                <tr style="height: 50px; text-align: left" v-if="org_id==10430||org_id==9675 || org_id == 0">
                 <td style="padding-left: 5px; border-bottom: none;border-top: none;">
                     透析护理记录：{{
                     record.summer&&record.summer.nursing_record ? record.summer&&record.summer.nursing_record : ""
@@ -1112,6 +1112,7 @@ export default {
       loading: false,
       orgname: "",
       bloodAccessParOpera: {},
+      bloodAccessParOperaList:[],
       anticoagulantsConfit: {},
       dialysateFormulationOptions: {},
       operatorMaps: {},
@@ -1142,6 +1143,11 @@ export default {
       "hemodialysis",
       "vascular_access_desc"
     );
+    this.bloodAccessParOperaList = getDataConfig(
+      "hemodialysis",
+      "vascular_access_desc"
+    );
+    console.log("z=============",this.bloodAccessParOperaList)
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");
@@ -1205,6 +1211,14 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
+          console.log("记录233333333333333333",this.records)
+          for(let i = 0 ; i < this.records.length ; i++){
+            console.log("进来",this.records[i].assessment_before_dislysis.blood_access_part_opera_id)
+            this.records[i].assessment_before_dislysis.blood_access_part_opera_name = ""
+            this.records[i].assessment_before_dislysis.blood_access_part_opera_name = this.bloodAccessParOperaName(this.records[i].assessment_before_dislysis.blood_access_part_opera_id)
+            console.log("232332",this.records[i].assessment_before_dislysis.blood_access_part_opera_name)
+          }
+          console.log("中uo",this.records)
           var tempmonitorflag = true;
           for(let i=0;i<this.records.length;i++){
             for(let j=0;j<this.records[i].monitor_records.length;j++){
@@ -1434,11 +1448,17 @@ export default {
       return "";
     },
     bloodAccessParOperaName(id) {
-      console.log(tihs.records, "hhh");
-      if (id in this.bloodAccessParOpera) {
-        return this.bloodAccessParOpera[id].name;
+     console.log("233333333333333",id)
+      // if (id in this.bloodAccessParOpera) {
+      //   return this.bloodAccessParOpera[id].name;
+      // }
+      var name = ""
+      for(let i=0;i<this.bloodAccessParOperaList.length;i++){
+        if(id== this.bloodAccessParOperaList[i].id){
+           name = this.bloodAccessParOperaList[i].name
+        }
       }
-      return "";
+      return name;
     },
     isBbloodAccessParOperaCheck(key, value) {
       if (key == null || typeof key === "undefined") {

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -1374,24 +1374,64 @@
                     核对护士
                     <span
                       style="display: inline-block;width:100px;text-align: left;"
+                    >
+                      &nbsp;
+
+                      <span
+                            v-if="
+                              !record.advices ||
+                                typeof record.advices[0] == 'undefined' ||
+                                typeof record.advices[0][0] == 'undefined'
+                            "
+                          ></span>
+                          <span
+                            v-else-if="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'checker'
+                              ) == ''
+                            "
+                            >{{
+                              getAdminUser(
+                                record.advices[0][0],
+                                "checker"
+                              )
+                            }}</span
+                          >
+                          <img
+                             style="height: 30px;"
+                            :src="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'checker'
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+
+                    </span>
+                    <!-- <span
+                      style="display: inline-block;width:100px;text-align: left;"
                     >
                       <span
                           v-if="
-                            setAdminUserES(record.check, 'modifier') ==
+                            setAdminUserES(record.check, 'creater') ==
                               ''
                           "
                           >{{
-                            getAdminUser(record.check, "modifier")
+                            getAdminUser(record.check, "creater")
                           }}</span
                         >
                         <img
-                          :src="setAdminUserES(record.check, 'modifier')"
+                          :src="setAdminUserES(record.check, 'creater')"
                           alt=""
                           srcset=""
                           v-else
                           style="height: 30px;"
                         />
-                    </span>
+                    </span> -->
                     护士签名
                     <span
                       style="display: inline-block;width:100px;text-align: left;"

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -1153,7 +1153,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1564,7 +1565,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderEighteen.vue

@@ -591,7 +591,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -788,7 +789,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -1112,7 +1112,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFifteen.vue

@@ -505,7 +505,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -718,7 +719,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderFifty.vue

@@ -2597,6 +2597,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyEight.vue

@@ -2570,6 +2570,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -1011,6 +1011,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1166,7 +1167,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyNine.vue

@@ -2434,6 +2434,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -2762,6 +2762,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -1018,6 +1018,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1173,7 +1174,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySix.vue

@@ -2646,6 +2646,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -25,7 +25,7 @@
                       <div>
                         性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
                       </div>
-                      <div>年龄：{{ getoldAge() }}</div>
+                      <div>年龄：{{ getAge(patientInfo) }}</div>
                       <div>透析机号:&nbsp;{{ getNumber() }}</div>
                     </div>
                   </td>
@@ -1567,6 +1567,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1769,7 +1770,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;
@@ -2177,13 +2178,13 @@ export default {
       }
       return "";
     },
-    getAge: function (val) {
-      if (val.birthday != 0) {
-        return jsGetAge(val.birth, "-");
-      } else {
-        return "";
-      }
-    },
+    // getAge: function (val) {
+    //   if (val.birthday != 0) {
+    //     return jsGetAge(val.birth, "-");
+    //   } else {
+    //     return "";
+    //   }
+    // },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThreeAdvice.vue

@@ -1219,6 +1219,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1401,7 +1402,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyTwo.vue

@@ -1214,7 +1214,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyfive.vue

@@ -2450,6 +2450,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1809,7 +1809,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -2175,7 +2176,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -1422,6 +1422,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1876,7 +1877,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFive.vue

@@ -1119,7 +1119,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1407,7 +1408,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -862,7 +862,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFortyNine.vue

@@ -1190,7 +1190,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -867,7 +867,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -2644,6 +2644,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -2098,6 +2098,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -1900,6 +1900,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -1677,6 +1677,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -2004,7 +2005,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -1143,7 +1143,8 @@
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -1284,7 +1285,7 @@
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -1117,7 +1117,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1371,7 +1372,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -1714,7 +1714,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -2021,7 +2022,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

@@ -1106,7 +1106,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1094,7 +1094,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1374,7 +1375,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -617,7 +617,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -909,7 +910,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1166,7 +1166,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1563,7 +1564,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3053,7 +3053,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
-        patient_id:""
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixteen.vue

@@ -940,7 +940,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1135,7 +1136,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -2355,6 +2355,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyOne.vue

@@ -2695,6 +2695,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyThree.vue

@@ -2697,6 +2697,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -1453,6 +1453,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1906,7 +1907,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -663,7 +663,8 @@ export default {
       },
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo_gender_1: false,
       patientInfo_gender_2: false,
@@ -716,7 +717,7 @@ export default {
   methods: {
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1016,8 +1016,17 @@
                       <div class="under_line" style="width: 80px">
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
 
-                        <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
-                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
+                        <!-- <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
+                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else /> -->
+                    
+                      
+                       
+                          <span v-if="setAdminUserES(doctor_advices&&doctor_advices[0].advice_doctor) == ''">
+                            {{ getAdminUser(doctor_advices&&doctor_advices[0].advice_doctor) }}
+                          </span>
+                          <img style="height:20px;" :src="setAdminUserES(doctor_advices&&doctor_advices[0].advice_doctor)" alt srcset v-else />
+                       
+                     
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
@@ -1109,7 +1118,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -662,7 +662,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -997,7 +998,7 @@ export default {
     },
     getDialysisRecords() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -594,7 +594,9 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
+
       },
       patientInfo: {
         birth: '',
@@ -996,7 +998,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -504,7 +504,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -905,7 +906,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -1177,7 +1177,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1361,7 +1362,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -524,7 +524,8 @@ export default {
       totollength: 0,
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -481,7 +481,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -793,7 +794,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -736,7 +736,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1072,7 +1073,7 @@ export default {
     },
     getDialysisRecords() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue

@@ -505,7 +505,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -871,7 +872,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -1083,7 +1083,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1270,7 +1271,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyThree.vue

@@ -1264,7 +1264,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -1083,7 +1083,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -1423,7 +1424,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -1102,7 +1102,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1256,7 +1257,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users;

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -1042,7 +1042,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1452,7 +1453,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -1678,7 +1678,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -2013,7 +2014,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -1075,7 +1075,8 @@ export default {
 
         queryParams: {
           xtdate: '',
-          xtno: ''
+          xtno: '',
+          patient_id:0,
         },
         patientInfo: {
           birth: '',
@@ -1417,7 +1418,7 @@ export default {
       },
       getDialysisRecord() {
         this.loading = true
-
+        this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
         getDialysisRecord(this.queryParams).then(response => {
           if (response.data.state == 1) {
             this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1636,7 +1636,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -2185,7 +2186,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

@@ -656,7 +656,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1044,7 +1045,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyOne.vue

@@ -1141,7 +1141,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1377,7 +1378,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -1236,7 +1236,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1654,7 +1655,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -1180,7 +1180,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",
@@ -1510,7 +1511,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyThree.vue

@@ -1158,7 +1158,8 @@ export default {
 
       queryParams: {
         xtdate: '',
-        xtno: ''
+        xtno: '',
+        patient_id:0,
       },
       patientInfo: {
         birth: '',
@@ -1404,7 +1405,7 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true
-
+      this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyTwo.vue

@@ -1266,7 +1266,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -1320,7 +1320,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -1480,45 +1480,24 @@
                 style="display: inline-block; width: 100px; text-align: left"
               >
                  
-                <span
-                  v-if="
-                    doctor_advices[0]
-                      ? doctor_advices[0].execution_staff != check.modifier
-                      : false
-                  "
-                >
-                  <span
-                    v-if="
-                      setAdminUserES(check == null ? 0 : check.modifier) == ''
-                    "
-                  >
-                    {{ getAdminUser(check == null ? 0 : check.modifier) }}
-                  </span>
-                  <img
-                    style="height: 30px"
-                    :src="setAdminUserES(check == null ? 0 : check.modifier)"
-                    alt
-                    srcset
-                    v-else
-                  />
-                </span>
-                <span v-else>
+                <p v-if="doctor_advices.length > 0">
                   <span
                     v-if="
-                      setAdminUserES(check == null ? 0 : check.creater) == ''
+                      setAdminUserES(doctor_advices[0].checker) == ''
                     "
                   >
-                    {{ getAdminUser(check == null ? 0 : check.creater) }}
+                    {{ getAdminUser(doctor_advices[0].checker) }}
                   </span>
                   <img
-                    style="height: 30px"
-                    :src="setAdminUserES(check == null ? 0 : check.creater)"
+                    class="es-img"
+                    :src="setAdminUserES(doctor_advices[0].checker)"
                     alt
                     srcset
                     v-else
                   />
-                </span>
+                </p>
               </span>
+            
               护士签名
               <span
                 style="display: inline-block; width: 100px; text-align: left"

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1274,7 +1274,8 @@ export default {
 
       queryParams: {
         xtdate: "",
-        xtno: ""
+        xtno: "",
+        patient_id:0,
       },
       patientInfo: {
         birth: "",

src/xt_pages/management/components/QualityForm.vue

@@ -2541,7 +2541,7 @@ export default {
         { id: 1, name: "透析液入口" },
         { id: 2, name: "透析液取样口" },
         { id: 3, name: "置换液出口" },
-        { id: 4, name: "透析机反渗水入口" },
+        { id: 4, name: "透析机反渗水出口" },
         { id: 5, name: "反渗水末端取样口" }
       ],
       rules: {

src/xt_pages/management/home.vue

@@ -3227,7 +3227,7 @@ export default {
           { id: 1, name: '透析液入口' },
           { id: 2, name: '透析液取样口' },
           { id: 3, name: '置换液出口' },
-          { id: 4, name: '透析机反渗水入口' },
+          { id: 4, name: '透析机反渗水出口' },
           { id: 5, name:'反渗水末端取样口'}
         ],
         breakDown: [

src/xt_pages/user/sickHistory.vue

@@ -85,38 +85,38 @@
       <el-dialog title="新增病史记录" width="70%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
               <label class="title"><span class="name">病程标题</span> : </label>
               <el-input v-model="title" style="width: 150px"></el-input>
 
-              <label class="title"><span class="name">日期</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
               <el-date-picker v-model="sick_history_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd "></el-date-picker>
 
 
-              <label class="title"><span class="name">肾移植史</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
               <el-select style="width: 150px;" v-model="is_shenyizhishi" placeholder="选择肾移植史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
             </div>
 
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
 
-              <label class="title"><span class="name">腹膜透析史</span> : </label>
+              <label class="title" ><span class="name">腹膜透析史</span> : </label>
               <el-select style="width: 150px;" v-model="is_fumotouxishi" placeholder="选择腹膜透析史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">医生</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
               <el-select style="width: 100px;" v-model="doctor_id" placeholder="请选择医生">
                 <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">过敏药物</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
               <el-select style="width: 100px;" v-model="is_guominyaowu" placeholder="选择过敏药物">
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
@@ -127,7 +127,7 @@
 
             </div>
 
-            <div class="cell clearfix">
+            <div class="cell clearfix" >
               <label class="title"><span class="name">病史模版</span> : </label>
               <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
                 <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
@@ -139,14 +139,14 @@
               <keep-alive>
                 <editor ref="editor"
                         id="editors"
-                        style="width: 600px"
+                        style="width: 100%"
                         v-bind:r_content="new_content"
                 >
                 </editor>
               </keep-alive>
             </div>
 
-            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
               <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
                          @click="createAction" :loading="uploading_new_record">保存
@@ -155,41 +155,42 @@
           </div>
         </div>
       </el-dialog>
+
       <el-dialog title="修改病史记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
         <div>
           <div class="new_record_form">
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
               <label class="title"><span class="name">病程标题</span> : </label>
               <el-input v-model="edit_title" style="width: 150px"></el-input>
 
-              <label class="title"><span class="name">日期</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
               <el-date-picker v-model="edit_sick_history_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd "
+                              value-format="yyyy-MM-dd "></el-date-picker>
 
 
-              <label class="title"><span class="name">肾移植史</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
               <el-select style="width: 150px;" v-model="edit_is_shenyizhishi" placeholder="选择肾移植史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
             </div>
 
-            <div class="cell clearfix">
+            <div class="cell clearfix" style="margin-bottom: 20px;">
 
-              <label class="title"><span class="name">腹膜透析史</span> : </label>
+              <label class="title" ><span class="name">腹膜透析史</span> : </label>
               <el-select style="width: 150px;" v-model="edit_is_fumotouxishi" placeholder="选择腹膜透析史" >
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">医生</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
               <el-select style="width: 100px;" v-model="edit_doctor_id" placeholder="请选择医生">
                 <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
               </el-select>
 
-              <label class="title"><span class="name">过敏药物</span> : </label>
+              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
               <el-select style="width: 100px;" v-model="edit_is_guominyaowu" placeholder="选择过敏药物">
                 <el-option label="无" value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
@@ -210,7 +211,7 @@
               <keep-alive>
                 <editor ref="edit_neditor"
                         id="editors"
-                        style="width: 600px"
+                        style="width: 100%"
                         v-bind:r_content="edit_new_content"
                 >
                 </editor>
@@ -218,7 +219,7 @@
             </div>
 
 
-            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
               <el-button @click="show_edit_dialog = false">取消</el-button>
               <el-button type="primary"
                          @click="modifyAction" :loading="uploading_new_record">保存
@@ -528,7 +529,8 @@ export default {
       this.requestSickHistory()
     }, endTimeChange(val) {
       this.requestSickHistory()
-    }, showDialog(){
+    }, 
+    showDialog(){
       for(let i = 0; i < this.doctorOptions.length; i++){
         if(this.doctorOptions[i].id == this.$store.getters.xt_user.user.id){
           this.doctor_id =this.$store.getters.xt_user.user.id

src/xt_pages/workforce/next_remind_print.vue

@@ -64,21 +64,21 @@
                 </td>
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
                  <span v-if="org_id!=9987">
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
-                        <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
+                     <span v-if="main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">
+                        <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                          <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus }}</span>
                      </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
+                     <span v-if="main_collection.dialysissolution.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   </span>
-                  {{main_collection.prescription.dialysis_dialyszers}}
-                  <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''"> {{main_collection.prescription.dialysis_irrigation}}</span>
+                  {{main_collection.dialysissolution.dialysis_dialyszers}}
+                  <span v-if="main_collection.dialysissolution.dialysis_dialyszers!='' && main_collection.dialysissolution.dialysis_irrigation!=''">/</span>
+                  <span v-if="main_collection.dialysissolution.dialysis_irrigation!=''"> {{main_collection.dialysissolution.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width" v-if="printObj.anticoagulant==1">
-                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
-                  <span v-if="main_collection.prescription.antioxidant_commodity_name!=''">
-                    (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
+                  {{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}
+                  <span v-if="main_collection.dialysissolution.antioxidant_commodity_name!=''">
+                    (<span>{{main_collection.dialysissolution.antioxidant_commodity_name}}</span>)
                   </span>
                 </td>
                 <td :width="td_1_width"  v-if="printObj.anticoagulant_zongliang == 1">