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

src/api/manage.js

     method:"Delete",
     data:data,
   })
+}
+
+export function getInformationManaList(params){
+  return request({
+    url:"/api/manage/getinformationmanalist",
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/device/objectTableDisinfectTwo.vue

                     </template>
                 </el-table-column>
 
-                <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
+                <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 }} -->
                                 <td>负责人</td>
                                 <td>医疗垃圾桶<br/>1000mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td>体温计<br/>75%酒精<br/>擦拭</td>
+                                <td>体温计<br/>75%酒精<br/>浸泡</td>
                                 <td>负责人</td>
                                 <td>体温枪<br/>75%酒精<br/>擦拭</td>
                                 <td>负责人</td>
               this.form.third_modifications = list.third_modifications?list.third_modifications:""
               this.form.third_creator = list.third_creator
 
-              this.form.fourth_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
-              this.form.fourth_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.fourth_disinfection_water = list.fourth_disinfection_water?list.fourth_disinfection_water:""
+              this.form.fourth_disinfection_methods = list.fourth_disinfection_methods?list.fourth_disinfection_methods:""
               this.form.fourth_disinfection_time = list.fourth_disinfection_time?list.fourth_disinfection_time:""
-              this.form.fourth_start_time  =this.getTimeThree(list.third_start_time)
-              this.form.fourth_end_time = this.getTimeThree(list.third_end_time)
-              this.form.fourth_total_time = list.third_total_time? list.third_total_time:""
-              this.form.fourth_is_check = list.third_is_check.toString()
-              this.form.fourth_modifications = list.third_modifications?list.third_modifications:""
-              this.form.fourth_creator = list.third_creator
+              this.form.fourth_start_time  =this.getTimeThree(list.fourth_start_time)
+              this.form.fourth_end_time = this.getTimeThree(list.fourth_end_time)
+              this.form.fourth_total_time = list.fourth_total_time? list.fourth_total_time:""
+              this.form.fourth_is_check = list.fourth_is_check.toString()
+              this.form.fourth_modifications = list.fourth_modifications?list.fourth_modifications:""
+              this.form.fourth_creator = list.fourth_creator
 
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
               this.form.last_end_time = this.getTimeThree(list.last_end_time)

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

               </div>
               岁
             </div>
-            <div class="inline_block">
-              门诊：
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
+                门诊：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 1"></check-box>
+                </div>
+              </div>
+            <div class="inline_block" v-if="record.receive_assessment.condition==1">
+              住院：
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
                 </div>
                 岁
               </div>
-              <div class="inline_block">
+              <div class="inline_block" v-if="record.receive_assessment.condition!=1">
                 门诊：
                 <div class="under_line" style="width: 30px; text-align: center">
                   <check-box :checked="record.patient.source == 1"></check-box>
                 </div>
               </div>
+              <div class="inline_block" v-if="record.receive_assessment.condition==1">
+                住院：
+                <div class="under_line" style="width: 30px; text-align: center">
+                  <check-box :checked="record.patient.source == 1"></check-box>
+                </div>
+              </div>
               <div class="inline_block">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

                         <td width="10">第</td>
                         <td width="50">
                             <div class="under-line">
-                            {{ record.patient.total_dialysis + record.patient.user_sys_before_count }}
+                            <!-- {{ record.patient.total_dialysis + record.patient.user_sys_before_count }} -->
+
+                             {{ record.Count }}
                             </div>
                         </td>
                         <td width="80">次透析</td>

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

               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
+                  if(response.data.code == 600000008){
+                     this.infoDialogVisible = true
+                   }
                   return false;
                 } else {
                   this.$notify({
           response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
+              if(response.data.code == 600000008){
+               this.infoDialogVisible = true
+              }
               return false
             } else {
               this.$notify({
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
+             if(response.data.code == 600000008){
+               this.infoDialogVisible = true
+             }
               this.exceLoading = false
               return false
             } else {
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
+              if(response.data.code == 600000008){
+               this.infoDialogVisible = true
+              }
               return false
             } else {
               this.$notify({
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
-
+                  if(response.data.code == 600000008){
+                    this.infoDialogVisible = true
+                  }
                   this.deleLoading = false
                   return false
                 } else {
             DeleteGroupAdvice(groupno, mode).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                if(response.data.code == 600000008){
+                 this.infoDialogVisible = true
+                }
                 return false
               } else {
                 this.$notify({
               this.deleLoading = false
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                if(response.data.code == 600000008){
+                   this.infoDialogVisible = true
+                }
                 return false
               } else {
                 this.$notify({
             DeleteDoctorAdvice(this.currentRow.id, mode).then(response => {
               this.deleLoading = false
               if (response.data.state == 0) {
+                 if(response.data.code == 600000008){
+                  this.infoDialogVisible = true
+                 }
                 this.$message.error(response.data.msg)
                 return false
               } else {
         return true
       }
       ,
-
-
+      mergeSpan({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex != 2) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      }
+      ,
       handleSpanTempArr() {
         this.tempArr = []
 
         // });
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        console.log("hhhhhhhhhh",this.tempArrOne)
-        //合并单元格
-        if (columnIndex === 0 || columnIndex === 1 ) {
-          const _row = this.tempArrOne[rowIndex];
-          const _col = _row > 0 ? 1 : 0;
-          console.log("_row====",_row)
-          console.log("_row----------",_col)
-          return {
-            rowspan: _row,
-            colspan: _col
-          };
-        }
-        // if (columnIndex === 0) {
-        //   if (rowIndex % 2 === 0) {
-        //     return {
-        //       rowspan: 2,
-        //       colspan: 1
-        //     }
-        //   } else {
-        //     return {
-        //       rowspan: 0,
-        //       colspan: 0
-        //     }
-        //   }
-        // }
 
-        // if (columnIndex === 1) {
-        //   if (rowIndex % 2 === 0) {
-        //     return {
-        //       rowspan: 2,
-        //       colspan: 1
-        //     }
-        //   } else {
-        //     return {
-        //       rowspan: 0,
-        //       colspan: 0
-        //     }
-        //   }
-        // }
+        if (columnIndex === 0) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
+
+        if (columnIndex === 1) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
           selected_date:this.selected_date,
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.date,
-          module:4,
+          module:2,
           remark:this.remark,
         }
         saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
-             this.$message.success("提交成功!")
+             this.$message.success("审核成功!")
              this.infoDialogVisible = false
            }
         })
       }
+
     },
     created() {
 

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

 <template>
+  <div>
   <div>
   <el-dialog
     title="接诊评估"
           >{{ item.name }}
         </el-radio>
       </el-radio-group>
-     
+
       </el-form-item>
 
       <el-form-item
           >高风险</el-radio
         >
       </el-radio-group>
- 
+
       </el-form-item>
 
       <div style="position: relative;">
           <!--v-if="isShow('跌倒风险预防措施')" 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"
     </div>
   </el-dialog>
 
-  
+
   <el-dialog
       title="提示"
       :visible.sync="infoDialogVisible"
             </span>
           </el-row>
         </el-form>
-         
+
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="infoDialogVisible = false">取 消</el-button>
     },
     // 复选框跌倒风险措施
     precautionchange(){
-     
+
       if(this.precautionTwo.length>0){
         this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
       }
             this.arr.push(this.precaution_arr[i].id);
           }
         }
-      } 
+      }
       // this.precautionchange()
       var obj = this.arr.join(",");
       this.receiveTreatmentAsses.precaution = obj;
       let ParamsQuery = this.receiveTreatmentAsses;
-      
+
       console.log("ParamsQuery", ParamsQuery);
       ParamsQuery["patient"] = this.patient.id;
       ParamsQuery["record_date"] = this.record_date;
           postAccepts(ParamsQuery).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+               if(response.data.code == 600000008){
+                 this.infoDialogVisible = true
+               }
               return false;
             } else {
               this.$notify({
     isCheckmust(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
         ) {
-          // name == '跌倒风险预防措施' && filedList[i].is_write == 1
+          // name == '跌倒风险预防措施' && this.precautionTwo.length<=0
           if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
             return [
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
                 trigger: ['blur','change']
               },
             ];
-          } 
+          }
           else if(name == "跌倒风险预防措施"){
             if(this.precautionTwo.length<=0){
               this.isrequired=false
               return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
-              
+
             }
             this.precautionchange()
             this.isrequired=true
             // return [{ required: true, message: '',trigger: ['blur','change'] }];
           }else{
             return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
-            
+
           }
-          
+
         }
       }
     },
     //   for (let i = 0; i < filedList.length; i++) {
     //     if (
     //       filedList[i].module == 2 &&
-    //       filedList[i].filed_name_cn == name 
-          
+    //       filedList[i].filed_name_cn == name &&
+    //       filedList[i].is_write == 1
     //     ) {
-    //       // &&filedList[i].is_write == 1
-    //       if (name == "跌倒风险预防措施") {
-    //         if(this.precautionTwo.length<=0){
-    //             return [
-    //             { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
-    //             {
-    //               required: true,
-    //               pattern: /^[1-9]\d*$/,
-    //               message: `请选择${name}`,
-    //               trigger: ['blur','change']
-    //             },
-    //           ];
-    //         }
-    //         this.precautionchange()
-    //         return[{ required: true, message: '',trigger: ['blur','change'] }]
-    //         // this.$refs.receiveTreatmentAsses.clearValidate('precautionTwo');
-             
-    //       } 
-          
+    //       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']
+    //           },
+    //         ];
+    //       }
     //     }
     //   }
     // },
           }
         });
     },
-    saveInformation(){
+
+   saveInformation(){
         var params = {
           selected_date:this.selected_date,
           patient_id:this.$route.query.patient_id,
     },
   },
   created() {
-    
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
     this.record_date = date
     // 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/adviceDialog/AddGroupAdvice.vue

         }
       }
       
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10517){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

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

               ((template_id == 6 &&
                 org_id != 9919 &&
                 org_id != 10191 &&
+                org_id!=10478 &&
                 template_id != 43 &&
                 template_id != 47) ||
                 org_id == 9779 ||
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

             </div>
             岁
           </div>
-          <div class="inline_block">
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
             门诊：
             <div class="under_line" style="width: 30px; text-align: center">
               <check-box :checked="patientInfo_source_1"></check-box>
             </div>
           </div>
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
+            住院：
+            <div class="under_line" style="width: 30px; text-align: center">
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
+            </div>
+          </div>
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
               </div>
               岁
             </div>
-            <div class="inline_block">
-              门诊：
-              <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="patientInfo_source_1"></check-box>
-              </div>
+            <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
+            门诊：
+            <div class="under_line" style="width: 30px; text-align: center">
+              <check-box :checked="patientInfo_source_1"></check-box>
             </div>
+          </div>
+          <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
+            住院：
+            <div class="under_line" style="width: 30px; text-align: center">
+              <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
+            </div>
+          </div>
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

           <div>
             <div>
               <div style="display:inline-block; ;">病历号：
-                {{patientInfo.record_number }}
+                {{patientInfo.record_number?patientInfo.record_number:"" }}
               </div>
               <div style="display:inline-block;margin-left: 90px;">
                 姓名：{{ patientInfo.name }}
                 <td colspan="3" style="border:1px solid black">
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
                     上机前病情：
-                    {{ predialysis.befor_symptoms ? predialysis.befor_symptoms : "/" }}
+                    <!-- {{ predialysis.symptom_before_dialysis ? predialysis.symptom_before_dialysis : "/" }} -->
+                    {{ predialysis.befor_symptoms? predialysis.befor_symptoms:"" }}
                   </div>
 
                 </td>
                 <td colspan="3">
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
                     疾病诊断：
-                    <!-- {{ patientInfo.diagnose }} -->
-                    {{getDiagnosis(prescriptionInfo.patient_diagnosis) }}
+                    {{ getDiagnosis(prescriptionInfo.patient_diagnosis) }}
                   </div>
                 </td>
               </tr>
                     <span v-else-if="prescription.mode_id == 6">SCUF</span>
                     <span v-else-if="prescription.mode_id == 7">IUF</span>
                     <span v-else-if="prescription.mode_id == 8">HFHD</span>
-                    <span v-else-if="prescription.mode_id == 9">PHF</span>
-                    <span v-else-if="prescription.mode_id == 10">HFR</span>
-                    <span v-else-if="prescription.mode_id == 11">HDF+HP</span>
+                    <span v-else-if="prescription.mode_id == 9">HFHD+HP</span>
+                    <span v-else-if="prescription.mode_id == 10">PHF</span>
+                    <span v-else-if="prescription.mode_id == 11">HFR</span>
                     <span v-else-if="prescription.mode_id == 12">HDF+HP</span>
                     <span v-else-if="prescription.mode_id == 13">CRRT</span>
-                    <span v-else-if="prescription.mode_id == 14">腹水回输</span>
-                 
+                  
                     <span v-else-if="prescription.mode_id == 19">IUF+HD</span>
                     <span v-else-if="prescription.mode_id == 20">UF</span>
                     <span v-else-if="prescription.mode_id == 21">HD+</span>
                     <span v-else-if="prescription.mode_id == 25">HD高通</span>
                     <span v-else-if="prescription.mode_id == 26">CVVH</span>
                     <span v-else-if="prescription.mode_id == 27">CVVHD</span>
+                    <span v-else-if="prescription.mode_id == 28">CVVHDF</span>
+                    <span v-else-if="prescription.mode_id == 29">PE</span>
+                    <span v-else-if="prescription.mode_id == 30">血浆胆红素吸附+HP</span>
+                    <span v-else-if="prescription.mode_id == 31">HPD</span>
+                    <span v-else-if="prescription.mode_id == 32">HDP</span>
                 </td>
                 <td>
                   <span
                             }}
                             </span>
                         </td >
-
                         <td style=" ">
                             <span v-if="getTime(monitor.operate_time) != ''">
                                 &nbsp;{{
 
                         <!-- <td style=" "> {{ getTime(monitor.operate_time, "{h}:{i}") }}</td> -->
                         <td style=" ">
-                          <span style="word-break: break-all;word-wrap: break-word;">
-
-                              {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
-                          </span>
+                          <!-- <span style="display:inline-block;word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
+                            {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{monitor.result}}
+                          </span> -->
+                          <div style="word-break: break-all;word-wrap: break-word; text-align: left;text-indent:2em;">
+                            {{ monitor.symptom }} {{ monitor.dispose }} {{monitor.result}}
+                          </div>
                         </td>
                         <!-- <td>
                           <span v-if="
         // this.receiverTreatmentAccess =
         //     response.data.data.receiverTreatmentAccess;
         this.assessmentafter = response.data.data.assessmentAfterDislysis;
-
-        this.prescriptionInfo =  response.data.data.prescriptionInfo
-
+        this.prescriptionInfo = response.data.data.prescriptionInfo
+        this.patientDiagnose = response.data.data.patientDiagnose
         // this.sick_condition_arr.forEach((o) => {
         //     if (this.receiverTreatmentAccess.sick_condition == o.id) {
         //     this.sick_condition = o.name;
           }
         });
         this.projects = projects;
+
         if (this.doctor_advices.length + this.projects.length <= 6) {
           var nl = 6 - (this.doctor_advices.length + this.projects.length);
           this.print_length = 6;
         console.log("advices",this.advices)
         console.log("this.projects", this.projects);
 
-        var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
-              if(this.projects[i].project_id ==  7620){
-                 objProject.advice_name = this.projects[i].project.project_name
-                 objProject.start_time = this.projects[i].start_time
-                 objProject.single_dose = this.projects[i].single_dose
-                 objProject.single_dose_unit = this.projects[i].unit
-                 objProject.execution_time = this.projects[i].execution_time
-                 objProject.execution_staff= this.projects[i].execution_staff
-              }
+             if(this.projects[i].type== 2){
+              this.projects[i].advice_name = this.projects[i].project.project_name
+              this.projects[i].start_time = this.projects[i].start_time
+              this.projects[i].single_dose = this.projects[i].single_dose
+              this.projects[i].single_dose_unit = this.projects[i].unit
+              this.projects[i].execution_time = this.projects[i].execution_time
+              this.projects[i].execution_staff= this.projects[i].execution_staff 
+              this.advices.push(this.projects[i])
+             }
+             
            }
         }
-        this.advices.push(objProject)
+        
 
         var tableAdvice = this.advices;
 
           this.advices = tableAdvice;
         }
 
-        this.patientDiagnose = response.data.data.patientDiagnose
+        console.log("advices-----------------",this.advices)
 
  
          
     //     return jsGetAge(val.birth, "-");
     //   }
     // },
-    getAge: function(val) {
-      if (val.id_card_no == undefined) {
-        return false
-      }
-      var thisLen = val.id_card_no.length
-      var birth = ''
-      if (thisLen == 15) {
-        birth = '19' + val.id_card_no.substr(6, 6)
-      } else {
-        birth = val.id_card_no.substr(6, 8)
+    getAge: function (val) {
+      if(val!=undefined){
+        var thisLen = val.id_card_no.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + val.id_card_no.substr(6, 6);
+        } else {
+          birth = val.id_card_no.substr(6, 8);
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+
+        var age = jsGetAge(birthtwo, "-");
+        return age;
       }
-      var birthtwo =
-        birth.substr(0, 4) +
-        '-' +
-        birth.substr(4, 2) +
-        '-' +
-        birth.substr(6, 2)
-
-      var age = jsGetAge(birthtwo, '-')
-      return age
+    
     },
-    getDiagnosis(ids){
-       
-        let nameArr = []
-        for(let i=0;i<this.patientDiagnose.length;i++){
-         if(ids.indexOf(this.patientDiagnose[i].id.toString())>-1){
-            nameArr.push(this.patientDiagnose[i].class_name)
-         }
+   
+    getDiagnosis(id) {
+      let arr = id.split(',')
+      var name = ''
+      for (let i = 0; i < this.patientDiagnose.length; i++) {
+        if (arr.indexOf(String(this.patientDiagnose[i].id)) > -1) {
+          name += this.patientDiagnose[i].class_name + ' '
         }
-        return nameArr.join(' ')
-     },
+      }
+      return name
+    }
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/management/components/WaterForm.vue

          <el-row>
             <el-col :span="8">
                 <el-form-item label="精密过滤器（MPa):"  class="st">
-                    <el-input  v-model.number="form.ultrafilter"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+                    <el-input  v-model="form.ultrafilter"  style="width:100px"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
          <el-row>
             <el-col :span="8">
                 <el-form-item label="硬度监测(mg/l):"  class="st">
-                    <el-input  v-model="form.hardness_monitoring" style="width:100px"
-                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
-                     ></el-input>
+                    <el-input  v-model="form.hardness_monitoring" style="width:100px"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">

src/xt_pages/management/components/WaterFormList.vue

           <el-table-column label="水质监测" align="center" min-width="110px">
             <el-table-column label="硬度" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:"" }}
+                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:0 }}
               </template>
             </el-table-column>
             <el-table-column label="总氯" align="center" min-width="110px">
             <el-table-column label="记录人" align="center" min-width="110px">
               <template slot-scope="scope">
                  {{ getDocName(scope.row.admin_user_id) }}
+                
               </template>
             </el-table-column>
 
          <el-row>
             <el-col :span="8">
                 <el-form-item label="精密过滤器（MPa):"  class="st">
-                    <el-input  v-model="form.ultrafilter" style="width:100px" type="number"></el-input>
+                    <el-input  v-model="form.ultrafilter" style="width:100px"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
                 <td
                   style="text-align:center;width:60px;font-size:15px"
                 >
-                {{ item.hardness_monitoring }}
+                {{ item.hardness_monitoring?item.hardness_monitoring:0 }}
                 </td>
                 <td
                   style="text-align:center;width:60px;font-size:15px"
                 </td>
 
                 <td style="text-align:center;width:70px;font-size:15px">
-                  {{ getDocName(item.admin_user_id) }}
+                  <!-- {{ getDocName(item.admin_user_id) }} -->
+
+                  <span v-if="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id) == ''">
+                     {{getDocName(item.admin_user_id)}}
+                 </span>
+                  <span v-else>
+                      <img style="height:30px;" :src="setAdminUserES(item.admin_user_id?item.admin_user_id:item.admin_user_id)" alt="" srcset="">
+                  </span>
                 </td>
 
 
            nurseList:[],
            selectCulture: [],
            hiddenShow:false,
+           operators: [],
+           operatorMaps:{},
         }
       },
       methods:{
                var total = response.data.data.total
                this.total = total
                this.adminRole = response.data.data.adminRole
-
+               this.operators = response.data.data.operators
+               if (this.operators.length > 0) {
+                var operatorsLen = this.operators.length
+                for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                    this.operatorMaps,
+                    this.operators[index].id,
+                    this.operators[index]
+                )
+               }
+              }
 
              }
           })
             this.form.snd_tank = detail.snd_tank?detail.snd_tank:""
             this.form.resin_tank = detail.resin_tank?detail.resin_tank:""
             this.form.ultrafilter = detail.ultrafilter?detail.ultrafilter:""
-            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:""
+            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:0
             this.form.total_chlorine_detection= detail.total_chlorine_detection?detail.total_chlorine_detection:""
             this.form.ph_detection = detail.ph_detection?detail.ph_detection:""
             this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid?detail.concentration_of_peroxyacetic_acid:""
         formatJson(filterVal, jsonData) {
           return jsonData.map(v => filterVal.map(j => v[j]));
         },
+        setAdminUserES(id) {
+           
+           if (id === 0) {
+           return ''
+           }
+           var user_name = ""
+           for(let i=0;i<this.operators.length;i++){
+              if(id == this.operators[i].admin_user_id){
+                 user_name = this.operators[i].url
+              }
+           }
+         
+          return user_name
+       },
       },
       created(){
-        console.log("list+++++++++++++++++++++++")
         this.getlist()
       }
     }

src/xt_pages/management/index.vue

           @click="seahcerMacherInfo()"
           >搜索</el-button
         >
+
+        <!-- <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          size="small"
+          @click="Auto()"
+          >自动生成</el-button
+        > -->
       </div>
 
       <div class="cell clearfix">
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount,deleteManageMent } from "@/api/manage";
+import { getAllMachineInfo, getAllSubregion,getUserMachTotalCount,deleteManageMent,getInformationManaList } from "@/api/manage";
 import ManageForm from "./components/ManageForm";
 
 export default {
           })
         }
       
+    },
+
+    Auto(){
+       
+      getInformationManaList().then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.$message.success("保存成功!")
+        }
+      })
     }
   },
   created() {

src/xt_pages/outpatientCharges/components/registerDialog.vue

           'certificates':this.form.certificates,
         }
 
-        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 10318 && this.form.id_card_type ==  4) ){
+        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4)) {
           try {
             //检测当前浏览器是否支持websocket模式
             window.WebSocket = window.WebSocket || window.MozWebSocket;
                       that.form.phone = patient.phone
                       that.form.id_card = patient.id_card_no
                       that.form.social_type = parseInt(response.data.data.insutype)
-
                     }
                     that.$message({ message: '读卡成功', type: 'success' })
                   }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           "admin_user_id":this.$store.getters.xt_user.user.id,
           'his_patient_id': this.hisPatientInfo.id,
         }
-        if ((this.$store.getters.xt_user.org_id == 10387) || (this.$store.getters.xt_user.org_id == 10318)){
+        if ((this.$store.getters.xt_user.org_id == 10387)){
           try {
             //检测当前浏览器是否支持websocket模式
             window.WebSocket = window.WebSocket || window.MozWebSocket;
             this.ws.onopen = function(event){
               if (that.$store.getters.xt_user.org_id == 10387){
                 that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 10318){
-                that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
-              }else if(that.$store.getters.xt_user.org_id == 4){
+              }
+              // else if(that.$store.getters.xt_user.org_id == 10318){
+              //   that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
+              // }
+              else if(that.$store.getters.xt_user.org_id == 4){
                 that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");
               }
             };

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                   </el-form-item>
 
 
-                
+
 
 
                   <el-form-item label="过敏病史: " prop="name" label-position="right">
           }
         }
       },
-      hisList: []
+      hisList: [],
+      patient_diagnose:[]
 
     }
   },
       this.teamList = []
 
     },
-    setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
+    setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses,patient_diagnose) {
       console.log("诊断23333333333333",this.diagnose)
       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
       this.curMonthPrescriptions = {}
       this.curPrescriptions = {}
+      this.patient_diagnose = patient_diagnose
       // this.$refs.tabProjectTeam.clearSelection()
 
       for (let i = 0; i < doctors.length; i++) {
 
       }
 
+      // console.log("info233333333333333333333",info.id)
+      // console.log("LAST_INFO2323232323WO",last_info.patient_diagnosis)
+      this.patient_diagnose = []
+      if(info.id == 0){
+        if (last_info.patient_diagnosis.length == 0) {
+          this.patient_diagnose = []
+        } else {
+          for (let i = 0; i < last_info.patient_diagnosis.split(",").length; i++) {
+            if(last_info.patient_diagnosis.split(',')[i].length > 0) {
+              this.patient_diagnose.push(parseInt(last_info.patient_diagnosis.split(',')[i]))
+            }
+          }
+        }
+      }
+
       if(info.id > 0){
-       
+
         if (info.patient_diagnosis.length == 0) {
           this.patient_diagnose = []
         } else {
           this.patient_diagnose = []
           for (let i = 0; i < info.patient_diagnosis.split(",").length; i++) {
-           
+
             if(info.patient_diagnosis.split(',')[i].length > 0) {
               this.patient_diagnose.push(parseInt(info.patient_diagnosis.split(',')[i]))
             }
               reg_type: this.register_type,
               patient_diagnose:str
             }
-            
+
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
                 this.prescriptions[i]['type'] = 1
             this.$message.error('科室不能为空')
             return
           }
-          
+
           var str = ""
           if(patient_diagnose!=""){
              str = this.patient_diagnose.join(',')

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             }
           }
           console.log('~~~~~00000222222',this.prescriptions)
-          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+          this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
         }
       })
 
                     //   }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
                 this.$refs.child.watchSign = 0
               }
             })
                   // }
                 }
               }
-              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+              this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
               this.$refs.child.watchSign = 0
             }
           })
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
               }
             })
 
 
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis,this.patient_diagnoses)
               }
             })
           } else {

src/xt_pages/qcd/basicInformationAnalysis.vue

       }
     },
     selectLapseTo(state) {
+      console.log("statt---23-322323",state)
       this.stateType = state;
       this.listQuery.state = state;
       //获取本月当前机构的透析模式
     },
     selectSource(source) {
       this.sourceType = source
-      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getDialysisModeType(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
       this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
     selectLapseOne(lapseto) {
       console.log("lapseto22222",lapseto)
       this.lapsetoType = lapseto
-      this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalSexCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
-      this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getDialysisModeType(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalLapseCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalSexCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalInfectiousCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalAgeCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
+      this.getTotalDialysisCount(this.listQuery.start_time,this.list.listQuery.end_time,this.lapsetoType,this.sourceType)
       this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
   },

src/xt_pages/user/components/PatientForm.vue

             // if (patietInfo.registrars_id > 0) {
             //   this.form.registrars = patietInfo.registrars_id;
             // }
+            this.form.record_number = patietInfo.record_number
             this.form.doctor = patietInfo.doctor
             if(this.form.doctor == 0){
               this.form.doctor = ""