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

src/views/layout/Layout.vue

@@ -346,4 +346,7 @@ export default {
   .new-main-container{
     width: calc(100% - 220px);
   }
+  .sidebar-container{
+    transform: translate3d(0, 0, 0) !important;
+  }
 </style>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -165,7 +165,7 @@
                   <div class="inline_block" style="margin-left:90px;">
                     体重增加：
                     <div class="under_line" style="width: 50px;text-align: center">
-                      {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}
+                      {{ predialysis.weight_before > 0 && lastafterdialysis.weight_after > 0 ? parseFloat(predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2): "/" }}
                     </div>
                     kg
                   </div>
@@ -574,7 +574,7 @@
                   <tbody>
                     <tr>
                       <td colspan="9" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                        检测记录
+                        监测记录
                       </td>
                     </tr>
                     <tr>
@@ -611,12 +611,17 @@
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template>
+                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
                             {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="9" style="line-height:25px;text-align:left;">
+                        医师记录：{{ summary.special_record ? summary.special_record : '' }}
+                      </td>
+                    </tr>
                   </tbody>
                 </table>
               </td>
@@ -1191,11 +1196,11 @@ export default {
           this.monitors[index].end = ''
           if (Object.keys(monitor).length > 0 && index > 1) {
             if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
-              this.monitors[index].end = '【结束透析】'
+              this.monitors[index].end = '【结束透析】回血100ml/min'
               tempmonitorflag = false
             }
             if (tempmonitorflag && index == this.monitors.length - 1) {
-              this.monitors[index].end = '【结束透析】'
+              this.monitors[index].end = '【结束透析】回血100ml/min'
             }
           }
         }

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -82,8 +82,8 @@
     </el-form>
 
     <span slot="footer" class="dialog-footer">
-    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
-    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
+    <el-button @click="cancel('formValue')">取 消</el-button>
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
   </span>
   </el-dialog>
 

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -389,8 +389,35 @@
                       }
                     })
                     that.num = num
+                    let newTotal = 0
+                    for (var i = that.info.transBody.outputlist2.length - 1; i >= 0; i--) {
+                      if(that.info.transBody.outputlist2[i].aka111 == '07') {
+                        console.log('0707007')
+                        newTotal += that.info.transBody.outputlist2[i].bka058
+                      }
+                      if(that.info.transBody.outputlist2[i].aka111 == '19'){
+                        console.log('191919')
+                        newTotal += that.info.transBody.outputlist2[i].bka058
+                      }
+                      console.log(8888888,that.info.transBody.outputlist2)
+                    }
+                    console.log(1111111111111)
+                    let aka111obj = {
+                      aka111:'99',
+                      bka058:newTotal
+                    }
+                    console.log('aka111obj',aka111obj)
+                    let newOutputlist2 = []
+                    newOutputlist2.push(aka111obj)
+                    that.info.transBody.outputlist2.map(item => {
+                      if(item.aka111 != '07' && item.aka111 != '19'){
+                        newOutputlist2.push(item)
+                      }
+                    })
+                    that.info.transBody.outputlist2 = newOutputlist2
+                    console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
-
+                    
                   }
                 }
               })

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -9,7 +9,7 @@
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
-                  <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient_name ? info.patient_name : ''}}</span></div>
+                  <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient_name ? info.patient_name.indexOf("（") > -1 ? info.patient_name.substring(0,info.patient_name.indexOf("（")) : info.patient_name : ''}}</span></div>
                   <div>性别：<span style="display:inline-block;width:30px;">{{info.patient_info.transBody.aac004 == '1' ? '男' : '女'}}</span></div>
                   <div>年龄：<span style="display:inline-block;width:50px;">{{info.patient_info.transBody.bae093 ? info.patient_info.transBody.bae093 : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;min-width:80px;">{{info.patient_info.transBody.outputlist1 ? getName(info.patient_info.transBody.outputlist1) : ''}}</span>
@@ -85,7 +85,7 @@
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
-                  <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</span></div>
+                  <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name.indexOf("（") > -1 ? balanceAccounts.patient.name.substring(0,balanceAccounts.patient.name.indexOf("（")) : balanceAccounts.patient.name : ''}}</span></div>
                   <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span></div>
                   <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
                   <div>费别：<span style="display:inline-block;width:80px;">自费</span>
@@ -140,9 +140,9 @@
                           <span v-if="item.type == 3">{{ subItem.pric }}</span>
                         </td>
                         <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number * subItem.pric }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.count * subItem.pric }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.count * subItem.pric }}</span>
+                          <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
+                          <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                          <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
                         </td>
                         <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
                       </tr>
@@ -398,6 +398,9 @@
           case '26':
             return '挂号费'
             break
+          case '99':
+            return '诊疗费'
+            break
 
         }
 

src/xt_pages/outpatientCharges/summary.vue

@@ -6,7 +6,7 @@
         <div class="app-container">
             <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
                 <div>
-                    <el-input size="small" style="width:150px;" v-model="keywords"
+                    <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction" @keyup.enter.native='searchAction'
                               class="filter-item"/>
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                                @click="searchAction">
@@ -89,6 +89,16 @@
                         <div>{{getMedType(scope.row.med_type)}}</div>
                     </template>
                 </el-table-column>
+
+                <el-table-column align="center" width="90" prop="name" label="收费类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.his_patient.balance_accounts_type != 2">医保</div>
+                        <div v-if="scope.row.his_patient.balance_accounts_type == 2">自费</div>
+                    </template>
+                </el-table-column>
+
+
+
                 <el-table-column align="center" width="100" prop="name" label="收费日期">
                     <template slot-scope="scope">
                         {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-       <template>
+       <!-- <template>
         <el-button
           style="float:right;"
           :loading="loading"
@@ -10,7 +10,7 @@
           type="primary"
           >打印</el-button
         >
-      </template>
+      </template> -->
             
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -11,7 +11,7 @@
                     <div>金额：{{ total }}</div>
                 </div>
                 <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;line-height:40px;padding:0 10px;">
-                    <div>姓名：{{advicePrint[0].patient.name?advicePrint[0].patient.name:""}}</div>
+                    <div>姓名：{{advicePrint[0].patient.name? advicePrint[0].patient.name.indexOf("（") > -1 ? advicePrint[0].patient.name.substring(0,advicePrint[0].patient.name.indexOf("（")) : advicePrint[0].patient.name:""}}</div>
                     <div>性别：
                         <span v-if="advicePrint[0].patient.gender == 1">男</span>
                         <span v-if="advicePrint[0].patient.gender == 2">女</span>
@@ -185,7 +185,7 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
+            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
             console.log("争端",this.diagnoses)
           }
        })
@@ -252,18 +252,39 @@ export default {
      },
 
      getDiagnosis(ids){
-        let id = ids.split(',')
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
+        
         var name = ""
+        let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
-            name += this.diagnoses[i].class_name + ' '
+          
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
+            // name += diagnoses[i].class_name + ' '
+            nameArr.push(this.diagnoses[i].class_name)
           }
         }
-        return name
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          if(item == '尿毒症'){
+            newNameArr.push(item)
+            nameArr.splice(index,1,'') 
+          }
+        })
+        newNameArr.push(...nameArr)
+        return newNameArr.join(' ')
      },
+     compare(property) {
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;//升序排序
+        }
+      },
      getPage(){
         this.page = 1
         this.pageArr = []

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1910,10 +1910,7 @@
           this.showTwo = true
         }
 
-        this.state2 = info.sick_history
-        if (this.state2 == 0) {
-          this.state2 = ''
-        }
+
 
         if (info.prescription_status == 0) {
           this.order_status = ''
@@ -1991,7 +1988,19 @@
 
                 }
               }
+
+              if(last_info.sick_history == 0){
+                this.state2 = ''
+              }else{
+                this.state2 = last_info.sick_history
+              }
+
+
             }else{
+              this.state2 = info.sick_history
+              if (this.state2 == 0) {
+                this.state2 = ''
+              }
               if(info.diagnosis.length == 0){
                 this.diagnose = []
               }else{
@@ -2660,7 +2669,7 @@
                   single_dose: temp[b].single_dose,
                   delivery_way: temp[b].delivery_way,
                   execution_frequency: temp[b].execution_frequency,
-                  retail_price: temp[b].min_price.toString(),
+                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
                   remark: '',
                   day: temp[b].drug_day ? temp[b].drug_day : 1,
                   prescribing_number: temp[b].prescribing_number,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -152,9 +152,10 @@
                 :visible.sync="centerDialogVisible"
                 width="600px"
                 center>
+                <el-button @click="allCheck">全选</el-button>
                 <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">处方笺打印</div>
                 <el-table
-                    ref="multipleTable"
+                    ref="multipleTable1"
                     :data="tableData1"
                     tooltip-effect="dark"
                     style="width: 600px"
@@ -183,7 +184,7 @@
             </el-table>
             <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">治疗单打印</div>
                 <el-table
-                    ref="multipleTable"
+                    ref="multipleTable2"
                     :data="tableData2"
                     tooltip-effect="dark"
                     style="width: 600px"
@@ -212,7 +213,7 @@
             </el-table>
             <div style="text-align:center;margin-top:10px;font-weight:bold;font-size:20px;">检验单打印</div>
                 <el-table
-                    ref="multipleTable"
+                    ref="multipleTable3"
                     :data="tableData3"
                     tooltip-effect="dark"
                     style="width: 600px"
@@ -245,9 +246,23 @@
                     title="打印"
                     :visible.sync="innerVisible"
                     append-to-body>
-                <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
-                <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
-                <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
+                  <template>
+                    <el-button
+                      style="float:right;"
+                      :loading="loading"
+                      size="small"
+                      icon="el-icon-printer"
+                      @click="printThisPage"
+                      type="primary"
+                      >打印</el-button
+                    >
+                  </template>  
+                  <div id='printMain'>
+                    <print ref="print" v-if="selecting_schs1.length > 0" :paramsObj='paramsObj'></print>
+                    <treatPrint ref="treatPrint" v-if="selecting_schs2.length > 0" :paramsObj='paramsObj2'></treatPrint>
+                    <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'></checkPrint>
+                  </div>
+                
             </el-dialog>
             <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -382,12 +397,26 @@
         // this.centerDialogVisible = true
         this.getPrescriptionList(this.patientInfo.id)
       },
+      allCheck(){
+        this.$refs.multipleTable1.toggleAllSelection();
+        this.$refs.multipleTable2.toggleAllSelection();
+        this.$refs.multipleTable3.toggleAllSelection();
+      },
       printThisPage(){
-        this.$nextTick(() => {
-          this.$refs.print.printThisPage()
-          this.$refs.treatPrint.printThisPage()
-          this.$refs.checkPrint.printThisPage()
-        })
+        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({
+          printable: "printMain",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+        this.innerVisible = false
+        // this.$nextTick(() => {
+        //   this.$refs.print.printThisPage()
+        //   this.$refs.treatPrint.printThisPage()
+        //   this.$refs.checkPrint.printThisPage()
+        // })
       },
       changeOther(patient_id){
         this.radio = 2;
@@ -1247,6 +1276,7 @@
             this.case_history = response.data.data.case_history
             this.info = response.data.data.info
             this.last_info = response.data.data.last_info
+            this.schedule = response.data.data.schedule
 
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
@@ -1384,7 +1414,14 @@
                 var preTime = "";
 
                 if (prescription.pre_time == 0) {
-                  preTime = nowTime
+                  if(this.schedule.schedule_type == 1){
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                  }else if(this.schedule.schedule_type == 2){
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                  }else if(this.schedule.schedule_type == 3){
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                  }
+                  // preTime = nowTime
                 } else {
                   preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                 }
@@ -1465,8 +1502,14 @@
                     tempProject.push(obj)
                   }
 
-
-                  var preTime = nowTime
+                  if(this.schedule.schedule_type == 1){
+                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                  }else if(this.schedule.schedule_type == 2){
+                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                  }else if(this.schedule.schedule_type == 3){
+                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                  }
+                  
 
 
                   let index = i + 1;
@@ -1551,6 +1594,19 @@
                 'p_type':2,
 
               };
+              var nowDate = new Date()
+              var nowYear = nowDate.getFullYear()
+              var nowMonth = nowDate.getMonth() + 1
+              var nowDay = nowDate.getDate()
+              var hours = nowDate.getHours()
+              var min = nowDate.getMinutes()
+              var nowTime =
+                nowYear +
+                '-' +
+                (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+                '-' +
+                (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
+                ':' + (min < 10 ? '0' + min : min)
               getPatientInfo(params).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
@@ -1569,6 +1625,7 @@
                   this.case_history = response.data.data.case_history;
                   this.info = response.data.data.info;
                   this.last_info = response.data.data.last_info
+                  this.schedule = response.data.data.schedule
 
                   this.doctors = response.data.data.doctors;
                   this.department = response.data.data.department;
@@ -1700,7 +1757,14 @@
                       var preTime = "";
 
                       if (prescription.pre_time == 0) {
-                        preTime = nowTime
+                        // preTime = nowTime
+                        if(this.schedule.schedule_type == 1){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                        }else if(this.schedule.schedule_type == 3){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                       }
@@ -1783,8 +1847,15 @@
                         }
 
 
-                        var preTime = nowTime
-
+                        // var preTime = nowTime
+                        var preTime = ''
+                        if(this.schedule.schedule_type == 1){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                        }else if(this.schedule.schedule_type == 3){
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                        }
 
 
 
@@ -1824,7 +1895,6 @@
                       }
 
                     }else{
-
                       let obj = {
                         id: 0,
                         name: '处方' + 1,
@@ -2811,8 +2881,7 @@
               });
             this.$refs.child.watchSign = 0
           }
-        }
-        else{
+        }else{
         var nowDate = new Date();
         var nowYear = nowDate.getFullYear();
         var nowMonth = nowDate.getMonth() + 1;
@@ -2895,6 +2964,7 @@
                 this.setMonthPrescription(month_prescriptions)
                 this.doctors = response.data.data.doctors
                 this.department = response.data.data.department
+                this.schedule = response.data.data.schedule
 
                 for (let i = 0; i < this.doctors.length; i++) {
                   if (this.doctors[i].user_type == 1) {
@@ -3027,7 +3097,14 @@
                     var preTime = "";
 
                     if (prescription.pre_time == 0) {
-                      preTime = nowTime
+                      // preTime = nowTime
+                      if(this.schedule.schedule_type == 1){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                      }else if(this.schedule.schedule_type == 3){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                      }
                     } else {
                       preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                     }
@@ -3110,7 +3187,15 @@
                       }
 
 
-                      var preTime = nowTime
+                      // var preTime = nowTime
+                      var preTime = ''
+                      if(this.schedule.schedule_type == 1){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                      }else if(this.schedule.schedule_type == 3){
+                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                      }
 
                       let index = i + 1;
                       let obj = {
@@ -3145,7 +3230,6 @@
                     }
 
                   }else{
-
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -3317,7 +3401,7 @@
               this.case_history = response.data.data.case_history
               this.info = response.data.data.info
               this.last_info = response.data.data.last_info
-
+              this.schedule = response.data.data.schedule
               this.doctors = response.data.data.doctors
               this.department = response.data.data.department
 
@@ -3446,9 +3530,17 @@
                   }
 
                   var preTime = "";
+                  
 
                   if (prescription.pre_time == 0) {
-                    preTime = nowTime
+                    // preTime = nowTime
+                    if(this.schedule.schedule_type == 1){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                    }else if(this.schedule.schedule_type == 3){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                    }
                   } else {
                     preTime = this.getTime(prescription.pre_time, "{y}-{m}-{d} {h}:{i}")
                   }
@@ -3531,7 +3623,15 @@
                     }
 
 
-                    var preTime = nowTime
+                    // var preTime = nowTime
+                    var preTime = ''
+                    if(this.schedule.schedule_type == 1){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "7:00"
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "11:00"
+                    }else if(this.schedule.schedule_type == 3){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + " " + "17:00"
+                    }
 
 
                     let index = i + 1;
@@ -3853,6 +3953,7 @@
         })
       },
       handleSelectionChange1(val) {
+        console.log('val',val)
         this.selecting_schs1 = val
       },
       handleSelectionChange2(val) {

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <template>
+      <!-- <template>
         <el-button
           style="float:right;"
           :loading="loading"
@@ -10,7 +10,7 @@
           type="primary"
           >打印</el-button
         >
-      </template>
+      </template> -->
 
     <div class='dialysisPage' style="padding-top:40px;">
       <div v-if="org_id != 10138">

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -10,14 +10,14 @@
             <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>
           </div>
           <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line"><span v-if="faber && faber.transBody">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></span></div>
             <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber && faber.transBody ? faber.transBody.aac999 : ''  }}</span></div>
             <div style="width:33%;display:flex;">处方编号：<span class="under_line">{{ item.prescription_number.substring(item.prescription_number.length-6) }}</span></div>
           </div>
 
 
           <div class="infoTitle">
-              <div>姓名：{{item.patient.name?item.patient.name:""}}</div>
+              <div>姓名：{{item.patient.name? item.patient.name.indexOf("（") > -1 ? item.patient.name.substring(0,item.patient.name.indexOf("（")) : item.patient.name :""}}</div>
               <div>性别：
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
@@ -25,9 +25,9 @@
               <div>年龄：{{item.patient.age?item.patient.age:""}}岁</div>
           </div>
           <div class="infoMain">
-              <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line">{{hisPatient.number?hisPatient.number:""}}</span></div>
-              <div style="margin-bottom: 10px;display:flex;">科别：<span class="under_line">{{item.info?getDepart(item.info.departments):''}}</span></div>
-              <div style="margin-bottom: 10px;display:flex;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+              <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line" v-if="hisPatient.number">{{hisPatient.number?hisPatient.number:""}}</span></div>
+              <div style="margin-bottom: 10px;display:flex;">科别：<span class="under_line" v-if="item.info">{{item.info?getDepart(item.info.departments):''}}</span></div>
+              <div style="margin-bottom: 10px;display:flex;">临床诊断：{{ item.info.diagnosis ? getDiagnosis(item.info.diagnosis) : ''}}</div>
               <div style="margin-bottom: 10px;display:flex;">自费药品签名：<span class="under_line"></span></div>
               <!-- <div style="margin-bottom: 10px;display:flex;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div> -->
               <div style="margin-bottom: 10px;display:flex;">联系方式：<span class="under_line">{{item.patient.phone}}</span></div>
@@ -162,6 +162,7 @@ export default {
             var advicePrint =  response.data.data.advicePrint
             console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
+            this.getPage()
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
             var hisPatient = response.data.data.hisPatient
@@ -170,7 +171,7 @@ export default {
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
-            this.getPage()
+            
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
@@ -194,7 +195,7 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
+            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
             console.log("争端",this.diagnoses)
           }
        })
@@ -209,7 +210,7 @@ export default {
        return name
      },
     getTotalOne(id) {
-
+        console.log('id',id)
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -261,18 +262,38 @@ export default {
      },
 
      getDiagnosis(ids){
-        let id = ids.split(',')
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
         var name = ""
+        let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
-            name += this.diagnoses[i].class_name + ' '
+          
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
+            // name += diagnoses[i].class_name + ' '
+            nameArr.push(this.diagnoses[i].class_name)
           }
         }
-        return name
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          if(item == '尿毒症'){
+            newNameArr.push(item)
+            nameArr.splice(index,1,'') 
+          }
+        })
+        newNameArr.push(...nameArr)
+        return newNameArr.join(' ')
      },
+     compare(property) {
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;//升序排序
+        }
+      },
      getPage(){
         this.page = 1
         this.pageArr = []
@@ -374,9 +395,10 @@ export default {
 
    },
    created(){
+      this.getPrescriptionPrint()
       this.getAllDoctorList()
       this.getInitData()
-      this.getPrescriptionPrint()
+      
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
@@ -384,6 +406,7 @@ export default {
    },
    watch:{
      ids:function(val){
+       console.log('val1111111111111111111111111111',val)
       this.ids = val
       this.getPrescriptionPrint()
     }

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-       <template>
+       <!-- <template>
         <el-button
           style="float:right;"
           :loading="loading"
@@ -10,7 +10,7 @@
           type="primary"
           >打印</el-button
         >
-      </template>
+      </template> -->
             
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne v-if="org_id != 10138" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -15,7 +15,7 @@
 
 
         <div class="infoTitle">
-            <div>姓名：{{item.patient.name?item.patient.name:""}}</div>
+            <div>姓名：{{item.patient.name? item.patient.name.indexOf("（") > -1 ? item.patient.name.substring(0,item.patient.name.indexOf("（")) : item.patient.name :""}}</div>
             <div>性别：
             <span v-if="item.patient.gender == 1">男</span>
             <span v-if="item.patient.gender == 2">女</span>
@@ -389,26 +389,47 @@ export default {
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-            this.diagnoses = response.data.data.diagnose
+            this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
             console.log("争端",this.diagnoses)
           }
        })
      },
      getDiagnosis(ids){
-        let id = ids.split(',')
+        let newIds = ids.split(',').sort(function(a,b){
+          return a-b;
+        })
+        
         var name = ""
+        let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          if(id.indexOf(this.diagnoses[i].id.toString()) > -1){
-            name += this.diagnoses[i].class_name + ' '
+          
+          if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
+            // name += diagnoses[i].class_name + ' '
+            nameArr.push(this.diagnoses[i].class_name)
           }
         }
-        return name
+        let newNameArr = []
+        nameArr.map((item,index) => {
+          if(item == '尿毒症'){
+            newNameArr.push(item)
+            nameArr.splice(index,1,'') 
+          }
+        })
+        newNameArr.push(...nameArr)
+        return newNameArr.join(' ')
      },
+     compare(property) {
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;//升序排序
+        }
+      },
      getName(list) {
-        console.log('list',list)
+        console.log('list22',list)
         let new_list = []
         for (let i = 0; i < list.length; i++) {
           if (list[i].aac031 == '1') {

src/xt_pages/workforce/remind_print_setting.vue

@@ -22,8 +22,8 @@
               <div class="signPrint">
                 <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
                 <div>姓名:{{main_collection.patient.name}}</div> 
-                <div>抗凝剂: {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}} </div> 
-                <div>总量:  
+                <div>抗凝剂: {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name + ' 5000iu/瓶' : ''}}</div> 
+                <div>用量:  
                   <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
@@ -32,7 +32,7 @@
                   <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </div> 
-                <div>用法:透析备用</div> 
+                <div>用法:静脉注射</div> 
                 <div>打印时间:{{currentDate}}</div>
               </div>
            </div>