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

             </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"
         remark: "",
         project_detail: "",
         number: "1",
+        sort:0,
       },
       options: [
         { value: 1, label: "是" },
           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,
            
             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

               </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 }}
             country_content_name: '',
             remark: '',
             pinyin: '',
-            wubi: ''
+            wubi: '',
+            sort:0,
 
           },
           resetForm: {
               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()
 
               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
           }
             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) {
                 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

             <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>
           country_content_name: '',
           remark: '',
           pinyin: '',
-          wubi: ''
+          wubi: '',
+          sort:0,
 
         },
         resetForm: {

src/xt_pages/data/components/diagnosis.vue

                 {{ 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

                         </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>
           remark: '',
           project_detail: '',
           number: '',
-          item_id: ''
+          item_id: '',
+          sort:'',
         },
         options: [{
           value: 1,
             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 = ''
             }
               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

                    {{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

                 }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/dialysisPrintOrder.vue

         "/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

                    }
                   }
                   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++){
                     }
                   }
                   console.log("scheduleMap999999999999",schedules)
-                  this.list = schedules
+                  this.list = schedules.sort(this.compare('sort'))
                 }
                
                  if(config.is_open == 1){
                   }
 
                   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++){
                       }
                     }
                   }
-                   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/dialysisPrintOrderTwelve.vue

     },
     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/hospitalStation/checkTemplate/printOne.vue

                     </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

     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/home.vue

                              </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"
                                 <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>
                               </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"
                               <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>
                              </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"

src/xt_pages/outpatientCharges/print.vue

               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

           <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

 
       },
       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
 
 
         this.diagnose = []
-
+        console.log("处方----------------------------------------------",info.id)
         if (info.id == 0) {
           if (last_info.diagnosis.length == 0) {
             this.diagnose = []
             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

     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

 
           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,
                 // 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