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

src/xt_pages/data/components/addInspection.vue

@@ -79,6 +79,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="排序 : " prop="sort" style="width: 50%">
+          <el-input
+            v-model="form.sort"
+            placeholder=""
+            maxlength="30"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="备注 : " prop="name" style="width: 100%">
           <el-input
             type="textarea"
@@ -219,6 +226,7 @@ export default {
         remark: "",
         project_detail: "",
         number: "1",
+        sort:0,
       },
       options: [
         { value: 1, label: "是" },
@@ -306,6 +314,7 @@ export default {
           tube_color: this.form.tube_color,
           team_type: this.form.team_type,
           remark: this.form.remark,
+          sort:parseInt(this.form.sort),
         };
         let data = {
           info: this.tableData,
@@ -316,15 +325,16 @@ export default {
            
             this.$message.success("保存成功");
             this.visible = false;
-            (this.form.project_team = ""),
-              (this.form.price = ""),
-              (this.form.pinyin = ""),
-              (this.form.wubi = ""),
-              (this.form.tube_color = ""),
-              (this.form.team_type = ""),
-              (this.form.remark = "");
+            this.form.project_team = "",
+            this.form.price = "",
+            this.form.pinyin = "",
+            this.form.wubi = "",
+            this.form.tube_color = "",
+            this.form.team_type = "",
+            this.form.remark = "";
             this.tableData = [];
             this.form.number = "";
+            this.form.sort = ""
             this.$parent.getlist();
           } else {
             this.$message.error("项目组套名称已存在!");

src/xt_pages/data/components/diagnoseOther.vue

@@ -64,6 +64,12 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="排序" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.sort }}
+              </template>
+            </el-table-column>
+
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">
                 {{ scope.row.remark }}
@@ -164,7 +170,8 @@
             country_content_name: '',
             remark: '',
             pinyin: '',
-            wubi: ''
+            wubi: '',
+            sort:0,
 
           },
           resetForm: {
@@ -205,7 +212,7 @@
               response.data.data.sick.pinyin
             this.Dialog.formValue.wubi =
               response.data.data.sick.wubi
-
+            this.Dialog.formValue.sort = response.data.data.sick.sort
             this.Dialog.isCreated = 2
             this.$refs.dialog.show()
 
@@ -258,7 +265,8 @@
               response.data.data.sick.pinyin
             this.Dialog.formValue.wubi =
               response.data.data.sick.wubi
-
+            this.Dialog.formValue.sort =
+              response.data.data.sick.sort
             this.Dialog.isCreated = 3
             this.Dialog.isVisibility = true
           }
@@ -277,8 +285,8 @@
             remark: val.remark,
             id: this.editId,
             pinyin: val.pinyin,
-            wubi: val.wubi
-
+            wubi: val.wubi,
+            sort:parseInt(val.sort)
           }
           modifyDiagnose(params).then(response => {
             if (response.data.state == 0) {
@@ -301,6 +309,8 @@
                 response.data.data.sick.pinyin
               this.manufacturerData[this.editIndex].wubi =
                 response.data.data.sick.wubi
+              this.manufacturerData[this.editIndex].sort =
+                response.data.data.sick.sort
 
               this.$message.success('修改成功')
             }

src/xt_pages/data/components/diagnoseOtherDialog.vue

@@ -41,6 +41,12 @@
             <el-input v-model="formValue.country_content_name"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="排序" prop="">
+            <el-input v-model="formValue.sort"></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-col>
@@ -78,7 +84,8 @@
           country_content_name: '',
           remark: '',
           pinyin: '',
-          wubi: ''
+          wubi: '',
+          sort:0,
 
         },
         resetForm: {

src/xt_pages/data/components/diagnosis.vue

@@ -72,6 +72,10 @@
                 {{ scope.row.country_content_name }}
               </template>
             </el-table-column>
+            
+           
+
+        
 
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">

src/xt_pages/data/components/editInspection.vue

@@ -41,6 +41,13 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="排序 : " prop="sort" style="width: 50%">
+                  <el-input
+                    v-model="form.sort"
+                    placeholder=""
+                    maxlength="30"
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
@@ -145,7 +152,8 @@
           remark: '',
           project_detail: '',
           number: '',
-          item_id: ''
+          item_id: '',
+          sort:'',
         },
         options: [{
           value: 1,
@@ -285,6 +293,7 @@
             this.form.pinyin = projectTeamDetail.pinyin
             this.form.wubi = projectTeamDetail.wubi
             this.form.tube_color = projectTeamDetail.tube_color
+            this.form.sort = projectTeamDetail.sort
             if (projectTeamDetail.tube_color == 0) {
               this.form.tube_color = ''
             }
@@ -316,7 +325,8 @@
               wubi: this.form.wubi,
               tube_color: this.form.tube_color,
               team_type: this.form.team_type,
-              remark: this.form.remark
+              remark: this.form.remark,
+              sort:parseInt(this.form.sort)
             }
             let data = {
               'info': arr

src/xt_pages/data/components/inspection.vue

@@ -42,6 +42,11 @@
                    {{scope.row.price}}
                 </template>
             </el-table-column>
+            <el-table-column label="排序" width="100" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.sort}}
+                </template>
+            </el-table-column>
             <el-table-column prop="date" label="备注" align="center">
                 <template slot-scope="scope">
                    {{scope.row.remark}}

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)}}
@@ -1316,8 +1320,47 @@
                 }else{
                     this.form.last_modifications = 0
                 }
+
+                if(this.form.first_start_time == null){
+                   this.form.first_start_time = ""
+                }
+
+                if(this.form.first_end_time == null){
+                   this.form.first_end_time = ""
+                }
+
+                if(this.form.sencond_start_time == null){
+                   this.form.sencond_start_time = ""
+                }
+
+                if(this.form.sencond_end_time == null){
+                   this.form.sencond_end_time = ""
+                }
+
+                if(this.form.third_start_time == null){
+                   this.form.third_start_time = ""
+                }
+
+                if(this.form.third_end_time == null){
+                   this.form.third_end_time = ""
+                }
+
+                if(this.form.fourth_start_time == null){
+                   this.form.fourth_start_time = ""
+                }
+
+                if(this.form.fourth_end_time == null){
+                   this.form.fourth_end_time = ""
+                }
               
-              
+                if(this.form.last_start_time == null){
+                   this.form.last_start_time = ""
+                }
+
+                if(this.form.last_end_time == null){
+                   this.form.last_end_time = ""
+                }
+               console.log("param23333333333333333",this.form)
                
               saveObjectTableDisinfect(this.form).then(response=>{
                  if(response.data.state == 1){

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/details/dialog/AssessmentAfterDislysis.vue

@@ -11,10 +11,10 @@
       <el-form ref="form" :model="form" label-width="160px">
         <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('实际治疗时长')">
-            <el-form-item label="实际治疗时长(时):" :prop="isName('实际治疗时长')" :rules="isCheckmust('实际治疗时长')">
-              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> -->
+            <el-form-item label="实际治疗时长(时):" prop="actualTreatmentHourShow" :rules="isCheckmust('实际治疗时长')">
+              <!-- <el-input v-model="form.actual_treatment_hour"></el-input> :prop="isName('实际治疗时长')"-->
               <el-time-picker
-                v-model="actualTreatmentHourShow"
+                v-model="form.actualTreatmentHourShow"
                 placeholder="透析时长"
                 style="width:100%;"
                 value-format="H:m"
@@ -620,9 +620,9 @@
           type="primary"
           @click="submitForm('form')"
           :loading="loading"
-          v-if="hasPermission"
+          
           >保 存</el-button>
-          <!--  -->
+          <!-- v-if="hasPermission" -->
       </span>
     </el-dialog>
 
@@ -697,7 +697,7 @@ export default {
       internalFistulaOptions: [],
       vascularAccessOptions: [],
       unit: [{ id: 1, name: 'g' }, { id: 2, name: 'ml' },{ id: 3, name: 'kg' }],
-      actualTreatmentHourShow: '',
+      // actualTreatmentHourShow: '',
       vascularAccessDescOptions: [],
       catheterOptions: [],
       complicationOptions: [],
@@ -729,6 +729,7 @@ export default {
       },
 
       form: {
+        actualTreatmentHourShow: '',
         weight_after: '',
         weight_loss: '',
         temperature: '',
@@ -893,7 +894,7 @@ export default {
         if (this.assessment_after_dislysis['sealing_fluid_dispose'] == 0) {
           this.form['sealing_fluid_dispose'] = ''
         }
-        this.actualTreatmentHourShow = new Date(
+        this.form.actualTreatmentHourShow = new Date(
           2018,
           1,
           1,
@@ -1316,7 +1317,7 @@ export default {
       for (var index in records) {
         this.$set(this.assessment_after_dislysis, index, records[index])
       }
-      this.actualTreatmentHourShow = new Date(
+      this.form.actualTreatmentHourShow = new Date(
         2018,
         1,
         1,

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

@@ -218,15 +218,9 @@
         :rules="isCheckmust('跌倒风险预防措施')"
         v-if="isShow('跌倒风险预防措施')"
       >
-        <!--        <el-radio-->
-        <!--          v-for="(item, index) in precaution_arr"-->
-        <!--          :key="index"-->
-        <!--          :label="item.id"-->
-        <!--          v-model="receiveTreatmentAsses.precaution"-->
-        <!--          >{{ item.name }}-->
-        <!--        </el-radio>-->
-        
-        <el-checkbox-group v-model="precautionTwo">
+        <!-- isFalldown prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施') :prop="isName('跌倒风险预防措施')" :rules="isCheckmust('跌倒风险预防措施')"
+           [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
+        <el-checkbox-group v-model="precautionTwo" @change="precautionchange">
           <el-checkbox
             v-for="item in precaution_arr"
             :label="item.name"
@@ -235,6 +229,7 @@
           >
         </el-checkbox-group>
       </el-form-item>
+
       <el-form-item
         label-width="200px"
         label="其他跌倒风险预防措施 : "
@@ -340,8 +335,8 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <!-- -->
-      <el-button type="primary" v-if="hasPermission" @click="handleComfirm('receiveTreatmentAsses')"
+      <!-- v-if="hasPermission"-->
+      <el-button type="primary"   @click="handleComfirm('receiveTreatmentAsses')"
         >保 存</el-button
       >
     </div>
@@ -394,8 +389,10 @@ export default {
         tumble: "",
         his_department: "",
         his_bed: "",
+        falldown:[],
       },
       precautionTwo: [],
+      arr:[]
     };
   },
   methods: {
@@ -419,22 +416,21 @@ export default {
       }
       this.accepts = accepts;
       // console.log("accepts", accepts);
-      var arr = [];
-      if (this.accepts.precaution) {
-        var precaution = this.accepts.precaution.split(",");
-        // console.log("precaution", precaution);
-        // console.log("hhh", this.precaution_arr);
-        for (let i = 0; i < precaution.length; i++) {
-          for (let j = 0; j < this.precaution_arr.length; j++) {
-            if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
-              // console.log("aaaa");
-              arr.push(this.precaution_arr[j].name);
-            }
-          }
-        }
-        this.precautionTwo = arr;
-        // console.log("arr", arr);
-      }
+      // var arr = [];
+      // if (this.accepts.precaution) {
+      //   var precaution = this.accepts.precaution.split(",");
+      //   // console.log("precaution", precaution);
+      //   // console.log("hhh", this.precaution_arr);
+      //   for (let i = 0; i < precaution.length; i++) {
+      //     for (let j = 0; j < this.precaution_arr.length; j++) {
+      //       if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+      //         // console.log("aaaa");
+      //         this.arr.push(this.precaution_arr[j].name);
+      //       }
+      //     }
+      //   }
+      //   this.precautionTwo = this.arr;
+      // }
 
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {
@@ -458,20 +454,44 @@ export default {
     handleCancle: function () {
       this.isVisibility = false;
     },
+    // 复选框跌倒风险措施
+    precautionchange(){
+      // for (let i = 0; i < this.precaution_arr.length; i++) {
+      //   for (let j = 0; j < this.precautionTwo.length; j++) {
+      //     if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+      //       this.arr.push(this.precaution_arr[i].id);
+      //     }
+      //   }
+      // } 
+      // var obj = this.arr.join(",");
+      // this.receiveTreatmentAsses.precaution = obj;
+
+      // this.receiveTreatmentAsses.falldown=this.precautionTwo
+      if(this.precautionTwo.length>0){
+        this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
+      }
+      console.log('this.precaution_arr',this.precautionTwo);
+      // console.log('arr的数据',this.receiveTreatmentAsses.falldown);
+      // console.log('sadffdasfdg',this.receiveTreatmentAsses.falldown.length);
+      // this.$refs[fromName].resetFields();
+      
+    },
+
     handleComfirm: function (formName) {
-      var arr = [];
+      // var arr = [];
       for (let i = 0; i < this.precaution_arr.length; i++) {
         for (let j = 0; j < this.precautionTwo.length; j++) {
           if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-            arr.push(this.precaution_arr[i].id);
+            this.arr.push(this.precaution_arr[i].id);
           }
         }
-      }
-      // console.log("arr", arr);
-      var obj = arr.join(",");
+      } 
+      // this.precautionchange()
+      var obj = this.arr.join(",");
       this.receiveTreatmentAsses.precaution = obj;
       let ParamsQuery = this.receiveTreatmentAsses;
-      // console.log("ParamsQuery", ParamsQuery);
+      
+      console.log("ParamsQuery", ParamsQuery);
       ParamsQuery["patient"] = this.patient.id;
       ParamsQuery["record_date"] = this.record_date;
       //console.log(this.receiver_treatment_access);
@@ -534,30 +554,61 @@ export default {
     isCheckmust(name) {
       let filedList = store.getters.xt_user.fileds;
       for (let i = 0; i < filedList.length; i++) {
-        // if (
-        //   filedList[i].module == 2){console.log(filedList[i],'filedList[i]')}
+        
         if (
           filedList[i].module == 2 &&
           filedList[i].filed_name_cn == name &&
           filedList[i].is_write == 1
         ) {
+          // name == '跌倒风险预防措施' && this.precautionTwo.length<=0
           if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
-          return [
-            { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-            {
-              required: true,
-              pattern: /^[1-9]\d*$/,
-              message: `请输入${name}`,
-              trigger: ['blur','change']
-            },
-          ];
+            return [
+              { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
+              {
+                required: true,
+                pattern: /^[1-9]\d*$/,
+                message: `请输入${name}`,
+                trigger: ['blur','change']
+              },
+            ];
+          } 
+          // if(name == "跌倒风险预防措施" && this.precautionTwo.length<=0){
+          //   return [
+          //     { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
+          //     {
+          //       required: true,
+          //       pattern: /^[1-9]\d*$/,
+          //       message: `请选择${name}`,
+          //       trigger: ['blur','change']
+          //     },
+          //   ];
+          // }
+            return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
         }
-          return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
-        }
-
-        
       }
     },
+    // isFalldown(name){
+    //   let filedList = store.getters.xt_user.fileds;
+    //   for (let i = 0; i < filedList.length; i++) {
+    //     if (
+    //       filedList[i].module == 2 &&
+    //       filedList[i].filed_name_cn == name &&
+    //       filedList[i].is_write == 1
+    //     ) {
+    //       if (name == "跌倒风险预防措施" && this.precautionTwo.length<=0) {
+    //         return [
+    //           { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
+    //           {
+    //             required: true,
+    //             pattern: /^[1-9]\d*$/,
+    //             message: `请选择${name}`,
+    //             trigger: ['blur','change']
+    //           },
+    //         ];
+    //       } 
+    //     }
+    //   }
+    // },
     getPermission() {
       request
         .get("/api/func_per/get", {
@@ -627,6 +678,7 @@ export default {
     },
   },
   created() {
+    
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
     this.record_date = date
@@ -643,7 +695,11 @@ export default {
     // console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
+    
   },
+  // mounted(){
+  //   this.isFalldown()
+  // }
 };
 </script>
 

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

@@ -964,7 +964,7 @@
             filedList[i].is_write == 1&&
             filedList[i].is_show == 1
           ) {
-            console.log(filedList[i],'false')
+            // console.log(filedList[i],'false')
             if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管') {
             return [
               { required: true, message: `请输入${name}` },
@@ -990,7 +990,7 @@
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
-            console.log("filedList",filedList)
+            // console.log("filedList",filedList)
             return true
           }
         }
@@ -1616,7 +1616,8 @@
       //   }
       //
       // }
-    }, watch: {
+    }, 
+    watch: {
       isVisibility(val) {
 
       },

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

@@ -111,7 +111,8 @@
           :prop="isName('换药护士')"
           :rules="isCheckmust('换药护士')"
         >
-          <el-select v-model="form.change_nurse" placeholder="换药护士">
+        <!--  -->
+          <el-select v-model="form.change_nurse" placeholder="请选择换药护士">
             <el-option
               v-for="(admin, index) in adminRoles"
               :key="index"
@@ -250,7 +251,6 @@
         >
           <el-select v-model="form.blood_access_id" placeholder="请选择" @change="changeBloodAccessOpion">
             <el-option :key="0" label="请选择" :value="0"></el-option>
-
             <el-option
               v-for="(option, index) in blood_access_option"
               :key="index + 'i'"

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

@@ -23,7 +23,6 @@
                     ref="dialysisPrescription"
                     :model="dialysisPrescription"
                     label-width="148px"
-
             >
                 <el-row :gutter="24">
                     <el-col :span="8" v-if="isShows('透析模式')">
@@ -43,7 +42,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" v-if="isShows('透析时长')">
-                        <el-form-item label="透析时长(h)：" :prop="isName('透析时长')" :rules="isCheckmust('透析时长')">
+                        <el-form-item label="透析时长(h)：" prop="dialysis_duration_hour" :rules="isCheckmust('透析时长')">
                             <el-input
                                     type="number"
                                     v-model="dialysisPrescription.dialysis_duration_hour"
@@ -626,7 +625,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('钠')"><!--  :prop="isName('钠')"-->
+                    <el-col :span="8" v-if="isShows('钠')"><!--  :prop="isName('钠')" prop="sodium"-->
                         <el-form-item label="钠(mmol/L)：" prop="sodium" :rules="isCheckmust('纳')">
                             <el-input
                                     type="number"
@@ -1681,86 +1680,6 @@
         zongliang:"",
         educationList:[],
         value:"",
-
-        // rules : {
-        //   mode_id:[{required: true, message: '请选择透析模式', trigger: 'change'}],
-        //   dialysis_duration_hour:[{required: true, message: '请输入透析时长', trigger: 'blur'}],
-        //   dialysis_duration_minute:[{required: true, message: '请输入透析时长', trigger: 'blur'}],
-        //   blood_flow_volume:[{required: true, message: '请输入血流量', trigger: 'blur'}],
-        //   replacement_flow:[{required: true, message: '请输入置换流量', trigger: 'blur'}],
-        //   pre_impulse:[{required: true, message: '请输入预冲量', trigger: 'blur'}],
-        //   target_ultrafiltration:[{required: true, message: '请输入目标超滤量', trigger: 'blur'}],
-        //   prescription_water:[{required: true, message: '请输入处方脱水量', trigger: 'blur'}],
-        //   water_machine:[{required: true, message: '请选择带水上机', trigger: 'change'}],
-        //   is_water:[{required: true, message: '请选择是否单超脱水', trigger: 'change'}],
-        //   single_time:[{required: true, message: '请输入单超时长', trigger: 'blur'}],
-        //   single_water:[{required: true, message: '请输入单超脱水', trigger: 'blur'}],
-        //   drhy_water:[{required: true, message: '请输入曲线脱水', trigger: 'blur'}],
-        //   dry_water_hour:[{required: true, message: '请输入曲线脱水时长', trigger: 'blur'}],
-        //   dialysate_formulation:[{required: true, message: '请选择透析液配方', trigger: 'change'}],
-        //   anticoagulant:[{required: true, message: '请选择抗凝剂', trigger: 'change'}],
-        //   antioxidant_commodity_name:[{required: true, message: '请输入抗凝剂商品名称', trigger: 'blur'}],
-        //   heparin_sodium:[{required: true, message: '请输入肝素钠', trigger: 'blur'}],
-        //   nucleoprotamine:[{required: true, message: '请输入鱼精蛋白', trigger: 'blur'}],
-        //   push_the_protamine:[{required: true, message: '请输入下机前推注鱼精蛋白', trigger: 'blur'}],
-        //   add_amount:[{required: true, message: '请输入追加肝素量', trigger: 'blur'}],
-        //   calculateAnticoagulantZL:[{required: true, message: '请输入减肝素量', trigger: 'blur'}],
-        //   reduce_amount:[{required: true, message: '请输入减肝素量', trigger: 'blur'}],
-        //   anticoagulant_shouji:[{required: true, message: '请输入首剂', trigger: 'blur'}],
-        //   anticoagulant_weichi:[{required: true, message: '请输入维持', trigger: 'blur'}],
-        //   anticoagulant_zongliang:[{required: true, message: '请输入总量', trigger: 'blur'}],
-        //   prescribing_number:[{required: true, message: '请输入开药数量', trigger: 'blur'}],
-        //   replacement_total:[{required: true, message: '请输入置换量', trigger: 'blur'}],
-        //   displace_speed:[{required: true, message: '请输入置换速度', trigger: 'blur'}],
-        //   anticoagulant_gaimingcheng:[{required: true, message: '请输入钙名称', trigger: 'blur'}],
-        //   anticoagulant_gaijiliang:[{required: true, message: '请输入钙剂量', trigger: 'blur'}],
-        //   kalium:[{required: true, message: '请输入钾', trigger: 'blur'}],
-        //   sodium:[{required: true, message: '请输入钠', trigger: 'blur'}],
-        //   calcium:[{required: true, message: '请输入钙', trigger: 'blur'}],
-        //   bicarbonate:[{required: true, message: '请输入碳酸氢盐', trigger: 'blur'}],
-        //   dialysate_flow:[{required: true, message: '请输入透析液流量', trigger: 'blur'}],
-        //   dialysate_temperature:[{required: true, message: '请输入透析液温度', trigger: 'blur'}],
-        //   conductivity:[{required: true, message: '请输入电导率', trigger: 'blur'}],
-        //   dialyzer_perfusion_apparatus:[{required: true, message: '请输入透析器/灌流器', trigger: 'blur'}],
-        //   dialysis_dialyszers:[{required: true, message: '请输入透析器', trigger: 'blur'}],
-        //   dialysis_irrigation:[{required: true, message: '请输入灌流器', trigger: 'blur'}],
-        //   dialysis_strainer:[{required: true, message: '请输入滤过器', trigger: 'blur'}],
-        //   plasma_separator:[{required: true, message: '请输入血浆分离器', trigger: 'blur'}],
-        //   bilirubin_adsorption_column:[{required: true, message: '请输入胆红素吸附柱', trigger: 'blur'}],
-        //   body_fluid:[{required: true, message: '请选择体液过多症状', trigger: 'change'}],
-        //   body_fluid_other:[{required: true, message: '请输入体液过多其他症状', trigger: 'blur'}],
-        //   special_medicine:[{required: true, message: '请选择透析前使用特殊药物', trigger: 'change'}],
-        //   special_medicine_other:[{required: true, message: '请输入透析前使用其他特殊药物', trigger: 'blur'}],
-        //   value:[{required: true, message: '请选择透析备注', trigger: 'change'}],
-        //   dialysis_remark:[{required: true, message: '请输入透析备注', trigger: 'blur'}],
-        //   prescription_sodium:[{required: true, message: '请输入处方钠', trigger: 'blur'}],
-        //   start_sodium:[{required: true, message: '请输入开始钠', trigger: 'blur'}],
-        //   sodium_curve:[{required: true, message: '请输入钠曲线', trigger: 'blur'}],
-        //   dialysis_fluid_flow:[{required: true, message: '请输入透析液流速', trigger: 'blur'}],
-        //   sodium_bicarbonate_flow:[{required: true, message: '请输入碳酸氢钠流速', trigger: 'blur'}],
-        //   treatment_remark:[{required: true, message: '请输入病情处理', trigger: 'blur'}],
-        //   displace_liqui_part:[{required: true, message: '请选择置换液', trigger: 'change'}],
-        //   displace_liqui_value:[{required: true, message: '请输入置换液总量', trigger: 'blur'}],
-        //   target_ktv:[{required: true, message: '请输入目标KT/V', trigger: 'blur'}],
-        //   blood_access:[{required: true, message: '请选择血管通路', trigger: 'change'}],
-        //   anticoagulant_stop_time_hour:[{required: true, message: '请输入抗凝提前停止时间', trigger: 'blur'}],
-        //   anticoagulant_stop_time_min:[{required: true, message: '请输入抗凝提前停止时间', trigger: 'blur'}],
-        //   blood:[{required: true, message: '请输入抽血量', trigger: 'blur'}],
-        //   illness:[{required: true, message: '请选择病情', trigger: 'change'}],
-        //   amylaceum:[{required: true, message: '请输入葡萄糖', trigger: 'blur'}],
-        //   oxygen_uptake:[{required: true, message: '请选择是否吸氧', trigger: 'change'}],
-        //   oxygen_flow:[{required: true, message: '请输入吸氧流量', trigger: 'blur'}],
-        //   oxygen_time:[{required: true, message: '请输入吸氧时长', trigger: 'blur'}],
-        //   hemodialysis_pipelines_count:[{required: true, message: '请输入透析管路支数', trigger: 'blur'}],
-        //   hemodialysis_pipelines:[{required: true, message: '请选择透析管路', trigger: 'change'}],
-        //   puncture_needle:[{required: true, message: '请输入穿刺针', trigger: 'blur'}],
-        //   puncture_needle_count:[{required: true, message: '请输入穿刺针支数', trigger: 'blur'}],
-        //   epo:[{required: true, message: '请选择促红素', trigger: 'change'}],
-        //   epo_count:[{required: true, message: '请输入促红素支数', trigger: 'blur'}],
-        //   max_ultrafiltration_rate:[{required: true, message: '请输入最大超滤率', trigger: 'blur'}],
-        //   admin_user_id:[{required: true, message: '处方医生', trigger: 'blur'}],
-        //   // remark:[{required: true, message: '请输入备注', trigger: 'blur'}]
-        // }
       }
 
     },
@@ -3811,10 +3730,8 @@ mu
         var filedList = store.getters.xt_user.fileds
         for (let i = 0; i < filedList.length; i++) {
           if (filedList[i].module == 1 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
-
             return true
           }
-
         }
         return false
       },
@@ -3829,8 +3746,8 @@ mu
           filedList[i].is_write == 1&&
           filedList[i].is_show == 1
         ) {
-          console.log(filedList[i],'false')
-          if (name == "透析模式" || name == "透析时长") {
+          // console.log(filedList[i],'false')
+          if (name == "透析模式" || name == "透析时长" ) {
           return [
             { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
             {
@@ -3840,6 +3757,9 @@ mu
               trigger: ['blur','change']
             },
           ];
+        }
+        if(name == '钠'){
+          return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
         }
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
 
@@ -4787,6 +4707,7 @@ mu
       }
     },
     created() {
+      console.log('weretrertf',this.dialysisPrescription.sodium);
       console.log("schedual232323323232323232",this.adminRoles)
       this.illnessList = getDataConfig('hemodialysis', 'illness')
 

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

@@ -4,7 +4,7 @@
       <!-- <div class="txsj">
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-      <el-form :model="form" label-width="100px"  :rules="drugdicRules"  ref="form">
+      <el-form :model="form" label-width="100px"    ref="form">
         <el-form-item label="下机护士" >
           <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
@@ -36,7 +36,6 @@
             <el-input v-model="form.internal_fistula" readonly  @focus="showInnerDialog('7')" style="width:200px"></el-input>
         </el-form-item>
 
-
         <el-form-item label="导管: " :prop="isName('导管')"
               :rules="isCheckmust('导管')" v-if="isShowFiled('导管')">
           <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
@@ -148,9 +147,6 @@
         },
         catheter: [],
         cruorOptions: [],
-        drugdicRules: {
-         internal_fistula: [{ required: true, message: "请选择内瘘" }]
-        },
         required:false,
         education:[],
        
@@ -222,7 +218,8 @@
           filedList[i].filed_name_cn == name &&
           filedList[i].is_write == 1
             ) {
-          return [{ required: true ,message:`请输入${name}` }];
+              
+              return [{ required: true ,message:`请输入${name}` }];
             }
           }
         },

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2611,7 +2611,7 @@ export default {
         "/dialysis/print?xtdate=" +
           xtdate +
           "&xtno=" +
-          schedual.patient.dialysis_no
+          schedual.patient.dialysis_no+"&patient_id="+schedual.patient.id
       );
       //   this.patient_id = schedual.patient_id;
       //   this.date = schedual.schedule_date;

src/xt_pages/dialysis/signPrint.vue

@@ -302,6 +302,8 @@ export default {
                    }
                   }
                   for(let i=0;i<schedules.length;i++){
+                    schedules[i].sort = 0
+                    schedules[i].sort = schedules[i].device_number.sort
                     for(let j=0;j<schedules[i].parent_advice.length;j++){
                       schedules[i].parent_advice[j].childAdvice = []
                       for(let z=0;z<schedules[i].doctor_advice.length;z++){
@@ -312,7 +314,7 @@ export default {
                     }
                   }
                   console.log("scheduleMap999999999999",schedules)
-                  this.list = schedules
+                  this.list = schedules.sort(this.compare('sort'))
                 }
                
                  if(config.is_open == 1){
@@ -481,6 +483,8 @@ export default {
                   }
 
                   for(let i=0;i<schedules.length;i++){
+                    schedules[i].sort = 0
+                    schedules[i].sort = schedules[i].device_number.sort
                     for(let j=0;j<schedules[i].parent_advice.length;j++){
                       schedules[i].parent_advice[j].childAdvice = []
                       for(let z=0;z<schedules[i].doctor_advice.length;z++){
@@ -490,7 +494,9 @@ export default {
                       }
                     }
                   }
-                   this.list = schedules
+                  console.log("哈哈哈",schedules)
+                   this.list = schedules.sort(this.compare('sort'))
+                 
                    this.scheduleMap = scheduleMap  
                  }
                 console.log("this.list",this.list)

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"
@@ -1953,7 +1932,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/dialysisPrintOrderTwo.vue

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

src/xt_pages/hospitalStation/checkTemplate/printOne.vue

@@ -19,7 +19,7 @@
                     </div>
                     <div>年龄：{{advicePrint[0].patient.age?advicePrint[0].patient.age:""}}岁</div>
                 </div>
-                <div style="margin-bottom:20px;padding:10px 10px 0;">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div>
+                <div style="margin-bottom:20px;padding:10px 10px 0;" v-if="org_id!=10138&&org_id!=10278 && org_id!=0">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div>
                 <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
                     <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
                     <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>

src/xt_pages/hospitalStation/components/dialysisIndex.vue

@@ -808,7 +808,7 @@ export default {
     printOrder() {
       var xtdate = parseTime(this.date, '{y}-{m}-{d}')
       this.$router.push(
-        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no
+        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no+"&patient_id="+this.patient.id
       )
     },
     processedDialysisSchedules: function(schedules, zone_options) {

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

@@ -2017,7 +2017,7 @@
                              </el-row>
                               <el-row>
                                 <el-col :span="24">
-                                 <el-form-item label="检测结果:(EU/ml)" label-width="100px">
+                                 <el-form-item label="检测结果:(ppm)" label-width="100px">
                                      <el-input
                                         type="textarea"
                                         :rows="2"
@@ -2102,7 +2102,7 @@
                                 <el-row>
                                   <el-col :span="8">
                                     <el-form-item label="取样者:" required prop="samplerb">
-                                        <el-select style="width:150px"  v-model="qualityFormSix.samplerb">
+                                        <el-select style="width:150px"  v-model="qualityFormSix.samplerb" filterable >
                                           <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
                                         </el-select>
                                     </el-form-item>
@@ -2144,7 +2144,7 @@
                               </el-row>
                                 <el-row>
                                   <el-col :span="24">
-                                  <el-form-item label="检测结果:(EU/ml)" label-width="100px">
+                                  <el-form-item label="检测结果:(Mg/L)" label-width="100px">
                                       <el-input
                                           type="textarea"
                                           :rows="2"
@@ -2228,7 +2228,7 @@
                               <el-row>
                                 <el-col :span="8">
                                    <el-form-item label="取样者:" required prop="samplerb">
-                                      <el-select style="width:150px"  v-model="qualityFormSeven.samplerb">
+                                      <el-select style="width:150px"  v-model="qualityFormSeven.samplerb" filterable >
                                         <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
                                       </el-select>
                                    </el-form-item>
@@ -2270,7 +2270,7 @@
                              </el-row>
                               <el-row>
                                 <el-col :span="24">
-                                 <el-form-item label="检测结果:(EU/ml)" label-width="100px">
+                                 <el-form-item label="检测结果:" label-width="100px">
                                      <el-input
                                         type="textarea"
                                         :rows="2"
@@ -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/outpatientCharges/print.vue

@@ -794,7 +794,7 @@ export default {
               console.log(schedual)
               var xtdate = parseTime(schedual.schedule_date, '{y}-{m}-{d}')
               this.$router.push(
-                '/dialysis/print?xtdate=' + xtdate + '&xtno=' + schedual.patient.dialysis_no
+                '/dialysis/print?xtdate=' + xtdate + '&xtno=' + schedual.patient.dialysis_no+"&patient_id="+schedual.patient.id
               )
             //   this.patient_id = schedual.patient_id;
             //   this.date = schedual.schedule_date;

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -69,7 +69,7 @@
           <div>年龄：{{getAge(advicePrint[0].patient)?getAge(advicePrint[0].patient):""}}岁</div>
 
         </div>
-        <div style="margin-bottom: 20px; padding: 10px 10px 0">
+        <div style="margin-bottom: 20px; padding: 10px 10px 0" v-if="org_id!=10278 && org_id!=10138 && org_id!=0">
           病史摘要：{{
             history.history_of_present_illness
               ? history.history_of_present_illness

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1893,7 +1893,7 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
-
+        console.log("诊断23333333333333",this.diagnose)
         this.sick = sick
         this.diagnoses = diagnoses
         this.department = department
@@ -2004,7 +2004,7 @@
 
 
         this.diagnose = []
-
+        console.log("处方----------------------------------------------",info.id)
         if (info.id == 0) {
           if (last_info.diagnosis.length == 0) {
             this.diagnose = []
@@ -2022,6 +2022,20 @@
             this.state2 = last_info.sick_history
           }
 
+          if(this.org_id == 0 || this.org_id == 10138){
+             this.diagnose = []
+             this.diagnose.push(24)
+             this.diagnose.push(85)
+             this.diagnose.push(252)
+          }
+
+          if(this.org_id == 10278){
+             this.diagnose = []
+             this.diagnose.push(203)
+             this.diagnose.push(309)
+             this.diagnose.push(202)
+          }
+
         } else {
           this.state2 = info.sick_history
           if (this.state2 == 0) {

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -819,7 +819,7 @@ export default {
     printOrder() {
       var xtdate = parseTime(this.date, '{y}-{m}-{d}')
       this.$router.push(
-        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no
+        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no+"&patient_id="+this.patient.id
       )
     },
     processedDialysisSchedules: function(schedules, zone_options) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -656,16 +656,18 @@ export default {
       this.$refs.multipleTable3.toggleAllSelection()
     },
     printThisPage() {
-      if (this.org_id == 10138 || this.org_id == 10278) {
+      if (this.org_id == 10138 || this.org_id == 10278 ) {
         const style =
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
-        printJS({
+            
+          printJS({
           printable: 'printMain',
           type: 'html',
           style: style,
           scanStyles: false
         })
-      } else {
+      } 
+      else {
         const style =
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
         printJS({
@@ -1431,13 +1433,27 @@ export default {
 
           this.department = response.data.data.department
           this.sick = response.data.data.sick
-          this.diagnoses = response.data.data.diagnose
+          var diagnoses = response.data.data.diagnose
+          console.log("hhhhhshshsh",diagnoses.sort(this.compare('sort')))
+          if(diagnoses!=null && diagnoses.length > 0){
+            this.diagnoses = diagnoses.sort(this.compare('sort'))
+          }else{
+            this.diagnoses = []
+          }
+         
           this.additions = response.data.data.additions
 
         }
       })
 
     },
+    compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
     getList() {
       let params = {
         'record_date': this.record_date,
@@ -2016,6 +2032,7 @@ export default {
                 // this.setMonthPrescription(month_prescriptions)
 
                 this.patientInfo = response.data.data.xt_info
+                console.log("patientInfo++++++++++++++++",this.patientInfo)
                 this.hisPatientInfo = response.data.data.his_info
                 this.case_history = response.data.data.case_history
 

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,12 +13,12 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="
+      v-if="
           org_id != 10217 && org_id != 10188 &&org_id != 10318&&
           org_id != 9675 &&
           org_id != 9671 &&
           org_id != 0 &&
-          org_id != 10164 
+          org_id != 10164
         "
         ref="printOne"
         v-bind:childResponse="childResponse"
@@ -27,6 +27,7 @@
         :history="history"
         :patientid="patientid"
       ></printOne>
+      <!--   -->
       <printTwo
         v-if="
           org_id == 10217 ||
@@ -43,6 +44,7 @@
         :history="history"
         :patientid="patientid"
       ></printTwo>
+      
       <printThree
         v-if="org_id == 10318 || org_id == 0"
         ref="printThree"
@@ -52,7 +54,18 @@
         :history="history"
         :patientid="patientid"
       >
+      <!--  -->
       </printThree>
+      <printFour
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 0"
+        ref="printFour"
+        v-bind:childResponse="childResponse"
+        :patient="patient"
+        :hispatient="hispatient"
+        :history="history"
+        :patientid="patientid"
+      >
+      </printFour>
     </div>
   </div>
 </template>
@@ -68,6 +81,7 @@ import { getPatientCaseHistory } from "@/api/project/project";
 import printOne from "./recordTemplate/printOne";
 import printTwo from "./recordTemplate/printTwo";
 import printThree from "./recordTemplate/printThree";
+import printFour from "./recordTemplate/printFour";
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -75,6 +89,7 @@ export default {
     printOne,
     printTwo,
     printThree,
+    printFour
   },
   props: {
     patientid: Number,
@@ -137,7 +152,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
+        "@media print {.prescription-print{font-size: 14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.recordTitle div{width: 200px;}}";
       const style1 =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
       const style2 =
@@ -170,6 +185,23 @@ export default {
           scanStyles: false,
         });
       }
+      else if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 0){
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      
+      }
+      // if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 0){
+      //   printJS({
+      //     printable: "prescription-print",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false,
+      //   });
+      // }
     },
 
     //患者列表

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -0,0 +1,289 @@
+<template>
+    <div id='prescription-print'>
+        <div class="prescription-print" style="box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;">
+            <div class="printTitle" style="border: none;">{{orgname}} &nbsp;&nbsp; 门诊病历</div>
+            <div class="infoTitle">
+                <div>姓名：{{patient.name?patient.name:''}}</div>
+                <div>性别：
+                    <span v-if="patient.gender == 1">男</span>
+                    <span v-if="patient.gender == 2">女</span>
+                </div>
+                <div>年龄：{{getAge(patient)?getAge(patient):""}}岁</div>
+            </div>
+            <div class="infoTitle">
+                <div>婚姻状况：
+                  <span v-if="patient.marital_status == 1">未婚</span>
+                  <span v-if="patient.marital_status == 2">已婚</span>
+                  <span v-if="patient.marital_status == 3">离异</span>
+                </div>
+                <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
+                <div>病历编号：{{patient.id?patient.id:''}}</div>
+            </div>
+            <div class="infoTitle">
+                <div >医保号：{{patient.health_care_no?patient.health_care_no:''}}</div>
+                <div>联系电话：{{patient.phone?patient.phone:''}}</div>
+                <!-- <div style="flex:1;">{{patient.health_care_no?patient.health_care_no:''}}</div> -->
+            </div>
+            <!-- <div class="otherInfo">
+                <div>联系电话：{{patient.phone?patient.phone:''}}</div>
+                <div style="flex:1;">{{patient.phone?patient.phone:''}}</div>
+            </div> -->
+            <div class="otherInfo">
+                <div>通讯地址：</div>
+                <div style="flex:1;">{{patient.home_address?patient.home_address:''}}</div>
+            </div>
+            <!-- <div class="otherInfo">
+                <div>药物过敏史：</div>
+                <div style="flex:1;">{{patient.past_history?patient.past_history:''}}</div>
+            </div> -->
+            <!-- <div class="otherInfo">
+                <div>病历编号：</div>
+                <div style="flex:1;">{{patient.id?patient.id:''}}</div>
+            </div> -->
+
+            <div class="printTitle" style="border: none;margin-top: 10px;">病历内容</div>
+            <div class=" recordTitle" style=" border-bottom: 2px solid black;">
+                <div style="width: 230px;">科别：{{getDeparment(hispatient.departments)?getDeparment(hispatient.departments):''}}</div>
+                <div style="">姓名：{{patient.name?patient.name:''}}</div> 
+                <div >性别：
+                    <span v-if="patient.gender == 1">男</span>
+                    <span v-if="patient.gender == 2">女</span>
+                </div>
+               <div >年龄：{{patient.age?patient.age:''}}岁</div> 
+            </div> 
+            <div class="otherInfo">
+                <div class="otherName">主诉：</div>
+                <div style="flex:1;">{{history.chief_conplaint?history.chief_conplaint:''}}</div>
+            </div>
+            <div class="otherInfo">
+                <div class="otherName">现病史：</div>
+                <div style="flex:1;">{{history.history_of_present_illness?history.history_of_present_illness:''}}</div>
+            </div>
+            <div class="otherInfo">
+                <div class="otherName">既往史：</div>
+                <div style="flex:1;">{{history.past_history?history.past_history:''}}</div>
+            </div>
+            <!-- <div class="otherInfo">
+                <div class="otherName">药物过敏史：</div>
+                <div style="flex:1;">{{history.allergic_history?history.allergic_history:''}}</div>
+            </div>
+            <div class="otherInfo">
+                <div class="otherName">个人史：</div>
+                <div style="flex:1;">{{history.personal_history?history.personal_history:''}}</div>
+            </div>
+            <div class="otherInfo">
+                <div class="otherName">家族史：</div>
+                <div style="flex:1;">{{history.family_history?history.family_history:''}}</div>
+            </div> -->
+            <div class="otherInfo">
+                <div class="otherName">体格检查：</div>
+                <div style="flex:1;">
+                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                    <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+                    <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+                </div>
+            </div>
+            <div class="otherInfo">
+                <div class="otherName">门诊诊断：</div>
+                <div style="flex:1;">{{history.diagnostic?history.diagnostic:''}}</div>
+            </div>
+            <div class="otherInfo">
+                <div class="otherName">门诊医嘱：</div>
+                <div style="flex:1;">{{history.doctor_advice?history.doctor_advice:''}}</div>
+            </div>
+            <div style="display:flex;justify-content: space-between;margin-bottom: 10px;">
+                <div style="margin-top:20px;">
+                    打印日期：{{ printDate }}
+                </div>
+                <div style="margin-top:20px;text-align:right;">
+                    医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
+                </div>
+            </div>
+        </div>
+    
+        <!-- <div class="prescription-print">
+            
+        </div> -->
+    </div>
+    </template>
+    <script>
+      import { jsGetAge, uParseTime } from '@/utils/tools'
+    
+    import { getDataConfig } from "@/utils/data";
+    import { getAllDoctorList,getPatientCaseHistory } from "@/api/project/project"
+    export default {
+        props:{
+          patient:Object,
+          hispatient:Object,
+          patientid:Number
+        //   history:Object,
+        },
+        data(){
+            return{
+                educationOptions:[],
+                departmentList:[],
+                orgname:'',
+                history:{},
+                printDate:''
+            }
+        },
+        methods:{
+          getAge(patient){
+            var thisLen = patient.id_card_no.length
+            var birth = ''
+            if (thisLen == 15) {
+              birth = '19' + patient.id_card_no.substr(6, 6)
+            } else {
+              birth = patient.id_card_no.substr(6, 8)
+            }
+            var births =
+              birth.substr(0, 4) +
+              '-' +
+              birth.substr(4, 2) +
+              '-' +
+              birth.substr(6, 2)
+            return jsGetAge(births, '-')
+    
+          },
+          show(val){
+    
+            this.patientid = val
+            this.getAllDoctorList()
+            this.getPatientCaseHistory()
+          },
+          getProfession(id){
+            var name = ""
+            for(let i=0;i<this.educationOptions.length;i++){
+                if(id == this.educationOptions[i].id){
+                    name = this.educationOptions[i].name
+                }
+            }
+            return name
+          },
+          getAllDoctorList(){
+               getAllDoctorList().then(response=>{
+                 if(response.data.state == 1){
+                   var doctor =  response.data.data.doctor
+    
+                   this.doctorList = doctor
+                   var department = response.data.data.department
+                   console.log("department",department)
+                   this.departmentList = department
+                 }
+               })
+           },
+          getDoctor(id){
+            var name = ""
+            for(let i=0;i<this.doctorList.length;i++){
+              if(id == this.doctorList[i].admin_user_id){
+                  name = this.doctorList[i].user_name
+              }
+            }
+            return name
+          },
+          getPatientCaseHistory(){
+    
+            const params = {
+              patient_id:this.patientid
+            }
+          console.log("病历22222",params)
+          getPatientCaseHistory(params).then(response=>{
+             if(response.data.state == 1){
+               var patient = response.data.data.patient
+            //    console.log("patinet",patient)
+               this.patient = patient
+               var history = response.data.data.history
+               console.log("中国history222222",history)
+               this.history = history
+               var hispatient = response.data.data.hispatient
+            //    console.log("hispatient",hispatient)
+               this.hispatient = hispatient
+             }
+          })
+        },
+        getDeparment(id){
+    
+         var name = ''
+         for(let i=0;i<this.departmentList.length;i++){
+             if(id == this.departmentList[i].id){
+                name = this.departmentList[i].name
+             }
+          }
+          return name
+        },
+    
+    
+        },
+        created(){
+            this.educationOptions = getDataConfig("patient", "education_types");
+            this.getAllDoctorList()
+            this.getPatientCaseHistory()
+    
+            var xtuser = this.$store.getters.xt_user
+            this.orgname = xtuser.org.org_name
+            var data = new Date();
+            var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+            var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+            this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        },
+        watch:{
+           'patientid':function(val){
+             console.log("val22332323",val)
+           }
+        }
+    }
+    </script>
+    
+    
+    <style lang="scss" scoped>
+    *{
+        margin: 0;
+        padding: 0;
+        border: 0;
+    }
+    .prescription-print{
+        // -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+        // -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+        // box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+        margin-bottom: 20px;
+        padding:20px 10px;
+        font-size: 14px;
+    }
+    .printTitle{
+        font-size: 18px;
+        text-align: center;
+        font-weight: bold;
+        border: none;
+    }
+    .infoTitle{
+        display: flex;
+        // justify-content: space-around;
+        margin-top:10px;
+        line-height: 24px;
+        padding:0 10px;
+        border: none;
+    }
+    .infoTitle div{
+        width: 200px;
+    }
+    .otherInfo{
+        display: flex;
+        margin-top:10px;
+        line-height: 24px;
+        padding:0 10px;
+    }
+    .recordTitle{
+        display: flex;
+        justify-content: space-around;
+        margin-top:10px;
+        line-height: 24px;
+        padding:0 10px;
+        // border-bottom: 2px solid #000;
+    }
+    .recordTitle div {
+        // display: inline-block;
+        width: 200px ;
+    }
+</style>
+    

src/xt_pages/user/components/PatientDetail.vue

@@ -821,10 +821,10 @@
     <!-- 打印预览 -->
     <div style="display: none">
       <div id="print-info-box">
-        <div class="print_main_content">
+        <div class="print_main_content" >
           <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
-          <div>
-            <table>
+          <div >
+            <table >
               <thead>
                 <!-- 用 thead 规定好宽度 -->
                 <tr v-show="false">
@@ -924,12 +924,12 @@
                     ></div>
                   </td>
                 </tr>
-                <tr>
+                <tr >
                   <td>
                     <div class="td_proj_title">现<br />病<br />史</div>
                   </td>
                   <td colspan="7">
-                    <div
+                    <div 
                       class="td_proj_content td_align_left"
                       v-html="patientPrint.present_history"
                     ></div>
@@ -1033,6 +1033,7 @@
         </div>
       </div>
     </div>
+    
     <div hidden="hidden">
       <div id="print-card-info">
         <div
@@ -2122,6 +2123,7 @@ export default {
   width: 960px;
   margin: 0 auto;
   padding: 0 0 20px 0;
+  /* page-break-after: always; */
 }
 .print_main_content .order_title {
   text-align: center;

src/xt_pages/user/coursePrint.vue

@@ -55,7 +55,7 @@
               <div>{{item.title}}</div>
             </div>
 
-            <div class="inline_block" style="width:100%;">
+            <div class="inline_block" style="width:100%; word-wrap: break-word; word-break: break-all;">
               <div v-html="item.content" class="printP">
 
               </div>

src/xt_pages/user/hospitalSummary.vue

@@ -98,22 +98,22 @@
                    {{hosDetail.pathology}}
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院诊断:
-                   <span v-html="hosDetail.admitting_diagnosis"></span> 
+                   <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.admitting_diagnosis"></span> 
                  </div>
                   <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院诊断:
-                   <span v-html="hosDetail.discharge_diagnosis"></span>
+                   <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.discharge_diagnosis"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院时病情:
-                   <span v-html="hosDetail.diagnosis_admission"></span>
+                   <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.diagnosis_admission"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">诊断经过:
-                   <span v-html="hosDetail.treatment"></span> 
+                   <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.treatment"></span> 
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院时病情:
-                   <span v-html="hosDetail.illness_discharge"></span> 
+                   <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.illness_discharge"></span> 
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院医嘱:
-                    <span v-html="hosDetail.discharge_advice"></span>
+                    <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.discharge_advice"></span>
                  </div>
                
               </div>
@@ -121,8 +121,6 @@
           </el-row>
         </div>
       </div>
-
-  
      
       <el-dialog title="新增出院小结" width="60%" top="5vh" :visible.sync="show_dialog">
         <div>

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -4,7 +4,7 @@
     <el-button type="primary" size="small" @click="printThisPage">打印</el-button> 
   </div>
   <div id="dialysis-print-box">
-    <div class="dialysis-print-order">
+    <div class="dialysis-print-order" style="width: 960px;">
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}出院小结</div>
       <div style="margin-float:right">病案号:{{hosDetail.sick_personnel}}</div>
@@ -82,7 +82,7 @@
             </td>   
             <td style="text-align:center;width:500px" colspan="14">
             
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px; word-wrap: break-word;word-break: break-all;">
                 {{patient.home_address}}
               </span>
             </td>   
@@ -132,7 +132,7 @@
               X线:
             </td>
             <td style="text-align:center;width:50px" colspan="3">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px; word-wrap: break-word;word-break: break-all;">
                 {{hosDetail.xray}}
               </span>
             </td>
@@ -140,7 +140,7 @@
               CT:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px; word-wrap: break-word;word-break: break-all;">
                 {{hosDetail.connecticut}}
               </span>
             </td>
@@ -148,7 +148,7 @@
               MRI:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px; word-wrap: break-word;word-break: break-all;">
                 {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
@@ -156,7 +156,7 @@
               超声:
             </td>
              <td style="text-align:center;width:100px" colspan="1">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px; word-wrap: break-word;word-break: break-all;">
                 {{hosDetail.ultrasound}}
               </span>
             </td>
@@ -164,7 +164,7 @@
               病理:
             </td>
              <td style="text-align:center;width:50px" colspan="1">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:inline-block;margin-left:10px; word-wrap: break-word;word-break: break-all;">
                 {{hosDetail.pathology}}
               </span>
             </td>
@@ -177,7 +177,7 @@
               </span>
             </td>   
             <td style="text-align:center;" colspan="14">
-              <span style="display:block;margin-left:10px;text-align:left;">
+              <span style="display:block;margin-left:10px;text-align:left; word-break: break-all;word-wrap: break-word">
                 <span v-html="hosDetail.admitting_diagnosis"></span>
               </span>
             </td>   
@@ -188,7 +188,7 @@
             </td>
              <td style="text-align:center;" colspan="14">
              
-              <span style="display:block;margin-left:10px;text-align:left;">
+              <span style="display:block;margin-left:10px;text-align:left; word-break: break-all;word-wrap: break-word">
                <span v-html="hosDetail.discharge_diagnosis"></span>  
               </span>
             </td>
@@ -200,7 +200,7 @@
             </td>
            <td colspan="14">
             
-              <span style="display:block;margin-left:10px;text-align:left;">
+              <span style="display:block;margin-left:10px;text-align:left; word-break: break-all;word-wrap: break-word">
                  <span v-html="hosDetail.diagnosis_admission"></span>
               </span>
             </td>
@@ -213,7 +213,7 @@
            
             </td>
             <td colspan="14">
-              <span style="display:block;margin-left:10px;text-align:left;">
+              <span style="display:block;margin-left:10px;text-align:left;word-break: break-all;word-wrap: break-word ">
                <span v-html="hosDetail.treatment"></span> 
               </span>
             </td>
@@ -224,9 +224,8 @@
               出院时病情:
             </td>
             <td colspan="14">
-            
-              <span style="display:block;margin-left:10px;text-align:left;">
-               <span v-html="hosDetail.illness_discharge"></span> 
+              <span style="display:block;margin-left:10px;text-align:left;word-break: break-all;word-wrap: break-word">
+               <span style="word-break: break-all; word-wrap: break-word;" v-html="hosDetail.illness_discharge"></span> 
               </span>
             </td>
           
@@ -237,7 +236,7 @@
               出院医嘱:
             </td>
             <td colspan="14">
-              <span style="display:block;margin-left:10px;text-align:left;">
+              <span style="display:block;margin-left:10px;text-align:left;word-break: break-all;word-wrap: break-word">
                 <span v-html="hosDetail.discharge_advice"></span> 
               </span>
             </td>

src/xt_pages/user/ktv.vue

@@ -175,8 +175,8 @@
                   :disabled="item.item_name == 'URR(%)' || item.item_name == 'KT/V'"
                   @input='changeInput(item)'
                 >
-                  <template slot="append" v-if="item.item_name == 'URR(%)'"><el-button type="primary" @click="calURR(form.formItem,item.value)">点击计算URR</el-button></template>
-                  <template slot="append" v-if="item.item_name == 'KT/V'"><el-button type="primary" @click="calKTV(form.formItem,item.value)">点击计算KT/V</el-button></template>
+                  <template slot="append" v-if="item.item_name == 'URR(%)'"><el-button style="background-color: #409eff; color: #000;" type="primary" @click="calURR(form.formItem,item.value)">点击计算URR</el-button></template>
+                  <template slot="append" v-if="item.item_name == 'KT/V'"><el-button style="background-color: #409eff; color: #000;" type="primary" @click="calKTV(form.formItem,item.value)">点击计算KT/V</el-button></template>
                   <template slot="append" v-else>{{ item.unit }}</template>
 
                 </el-input>

src/xt_pages/user/physiqueprinting.vue

@@ -68,7 +68,7 @@
 
           </div>
           <h3 style="text-align: center; margin: 20px 0px;">病史内容</h3>
-          <div>
+          <div style="word-break: break-all; word-wrap: break-word;">
             <div v-html="item.content"></div>
           </div>
           <h3 v-if="item.XtPatientPhysiqueCheck.id > 0" style="text-align: center; margin: 30px 0px 10px 0px;">体格检查</h3>