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

src/api/his/his.js

 }
 
 export function createHisPrescription(data, params) {
-  console.log('param2323232323233223233223332322323', params)
+  console.log('param2323232323233223233223332322323', data, params)
   return request({
     url: '/api/hisprescription/create',
     method: 'post',
   })
 }
 
-
-
-
-
 export function createFaPiao(params) {
   return request({
     url: '/api/fapiao/create',
   })
 }
 
-
 export function postFaPiaoIsUse(params) {
   return request({
     url: '/api/fapiao/is_use',
   })
 }
 
-
-
 export function deleteNCDSRecord(params) {
   return request({
     url: '/api/psn/ncds/delete',
   })
 }
 
-
 export function getBaiLinRecord(params) {
   return request({
     url: '/api/bailin/export',
   })
 }
 
-
+export function getHisDoctorAdviceInfo(id, params) {
+  return request({
+    url: '/api/his/gethistdoctoradviceinfo?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
 

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

                                 <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 23">
                                 血浆胆红素吸附
                                 </div>
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 24">
+                                  I-HDF
+                                </div>
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 25">
+                                  HD高通
+                                </div>
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 26">
+                                  CVVH
+                                </div>
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 27">
+                                  CVVHD
+                                </div>
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 28">
+                                  CVVHDF
+                                </div>
+                                <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id == 29">
+                                  PE
+                                </div>
                             </div>
                             <div class="inline_block" style="flex:1;">
                                 置换方式：

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

               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             </template>
           </el-table-column>
+          <el-table-column
+            prop="displacement_quantity"
+            align="center"
+            label="置换量(ml/h)"
+            width="100"
+            v-if=" isShow('置换量') && (template_id == 43)" >
+            <template slot-scope="scope">
+              {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="displacement_quantity"
             align="center"
             label="置换量(ml)"
             width="100"
-            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)" >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29&& template_id != 43)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" 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)">
+           <el-col :span="8" v-if=" isShow('置换量') &&  (template_id == 43)">
+            <el-form-item label="置换量(ml/h)：">
+              <el-input v-model="form.displacement_quantity"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" 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!=43)">
             <el-form-item label="置换量(L)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" 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)">
+          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
             <el-form-item label="置换量(ml)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " 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" 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)" 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)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

                       <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
                         血浆胆红素吸附
                       </div>
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 24">
+                        I-HDF
+                      </div>
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 25">
+                        HD高通
+                      </div>
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 26">
+                        CVVH
+                      </div>
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 27">
+                        CVVHD
+                      </div>
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 28">
+                        CVVHDF
+                      </div>
+                      <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 29">
+                        PE
+                      </div>
                     </div>
                     <div class="inline_block" style="flex:1;">
                       置换方式：
                         {{ predialysis.machine_type ? predialysis.machine_type : '' }}
                       </div>
                     </div>
-                    <div class="inline_block">
+                    <div class="inline_block" style="flex:1">
                       机号：
                       <div class="under_line" style="width: 60px;text-align: center;">
                         {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
                         血浆胆红素吸附+HDF
                       </div>
-                      <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
+                      <div class="under_line" style="bwidth: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
                         血浆胆红素吸附
                       </div>
                       <div class="under_line" style="width:100px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 29">

src/xt_pages/hospitalStation/components/deskPrescription.vue

                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
                                           <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 ">
+                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
                                               <span
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
                                               <span
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
                                                 <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191">
+                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278">
                                                     {{ scope.row.stock_count }}
                                                 </span>
                         <span v-else> {{ scope.row.total }}</span>
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
         if (row.count <= 0) {
           if (selection) {
             selection.forEach(row => {
     },
     selectChange(selection, row) {
       console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191) {
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
         if (row.stock_count <= 0) {
           if (row.type == 3) {
             if (selection) {

src/xt_pages/hospitalStation/components/prescriptionTable.vue

     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" type="index" width="40" label="序号">
+        <template slot-scope="scope">{{scope.$index+1}}</template>
+      </el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
         </template>
       getAllChange(scope) {
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
           } else {
-            console.log(12)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
           }
         } else {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(123)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
           } else {
-            console.log(1234)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
           }
         }
 
         },
         deep: true
-      }
+      },
       // "prescription.project":{
       //   handler(newVal,oldVal){
       //     newVal.map((item,index) => {

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

         <div class='dialysisPage' style="padding-top:40px;">
             <!--<printOne :info="info"></printOne>-->
 
-            <print-one v-if="org_id != 10138" :info="info"></print-one>
+            <print-one v-if="org_id != 10138 && org_id != 10278" :info="info"></print-one>
             <print-two v-else :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></print-two>
         </div>
     </div>
         //   scanStyles: false
         // });
 
-        if(this.$store.getters.xt_user.org_id == 10138){
+        if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278){
           setTimeout(() => {
             const style =
             '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';

src/xt_pages/outpatientCharges/statementPrint.vue

       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4">
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4 || org_id == 10278">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
-          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4"></printThree>
+          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4 || org_id == 10278"></printThree>
           <printFour v-if="org_id == 9504 || org_id == 10028" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

 <template>
     <div>
         <div id='prescription-print' class="prescription-print">
-            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
+            <div v-if=" this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278">
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{org_code}}</div>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

 <template>
     <div>
         <div id='prescription-print3' class="prescription-print">
-            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
+            <img style="width:100%;height:80px" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle">检验申请单</div>
 
             <div style="border:1px solid #000;">
                     <div>医生签字：{{ doctor ? doctor : '' }}</div>
                 </div>
             </div>   
-            <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
+            <img style="width:100%;" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
     </div>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 ">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

 
 <script>
   import { getDictionaryDataConfig } from '@/utils/data'
-  import { delHisAddition, delHisAdvice, delHisProject, getInitData } from '@/api/his/his'
+  import { delHisAddition, delHisAdvice, delHisProject, getInitData,getHisDoctorAdviceInfo } from '@/api/his/his'
 
   export default {
     props: {
             advices: [],
             project: [],
             drugways: [],
-            efs: []
+            efs: [],
+            drugList:[],
+            adviceList:{}
           }
         }
       }
           } else {
             this.drugways = response.data.data.drugways
             this.efs = response.data.data.efs
+            this.drugList = response.data.data.drugs
           }
         })
 
       getGroup(id) {
         var name = ''
         var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
-        console.log('2235', statistics_category)
+        // console.log('2235', statistics_category)
         for (let i = 0; i < statistics_category.length; i++) {
           if (id == statistics_category[i].id) {
             name = statistics_category[i].name
       getAllChange(scope) {
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
+            // console.log(1)
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
           } else {
             console.log(12)
         }
       },
       changePrescribingNumber(scope) {
+        //  var max_number = 0 
+        //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
+        //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
+        //  }
+        //  if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //    max_number = parseInt(scope.row.prescribing_number)
+        //  }
+        //  console.log("修改的数量",max_number)
+        //  //查询该药品库存
+        //  if(this.drugList.length > 0){
+        //     var stock_number = 0
+        //     for(let i=0;i<this.drugList.length;i++){
+        //       if(scope.row.id == this.drugList[i].id){
+        //          for(let j=0;j<this.drugList[i].stock_in.length;j++){
+        //             stock_number += this.drugList[i].stock_in[j].stock_max_number * this.drugList[i].min_number + this.drugList[i].stock_in[j].stock_min_number
+        //          }
+        //       }
+        //     }
+        //     console.log("库存数量",stock_number)
+        //  }
+        // if(scope.row.advice_id > 0){
+        //   //获取该药品上一次出库的的数量
+        //   getHisDoctorAdviceInfo(scope.row.advice_id).then(response=>{
+        //     if(response.data.state == 1){
+        //        var out_count  = 0
+        //        var adviceList = response.data.data.advice
+        //        if(adviceList.prescribing_number_unit == adviceList.drug.max_number){
+        //            out_count = adviceList.prescribing_number * adviceList.drug.min_number
+        //        }
+        //        if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
+        //           out_count = adviceList.prescribing_number
+        //        }
+               
+        //        //如果更改的数量大于修改之前的数量
+        //        if(max_number > out_count){
+        //          if((max_number - out_count)>stock_number){
+        //            this.$message.error(scope.row.drug_name + '库存不足')
+        //          }
+        //        }
+        //     }
+        //   })
+        // }
+
+        // if(scope.row.advice_id == 0){
+        //    if(max_number > stock_number){
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //    }
+        // }
+        
+
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
             this.$message.error(scope.row.drug_name + '库存不足')
           num = 1
         }
         return num
-      }
+      },
+     
     }, mounted() {
       this.getInitData()
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

         this.$refs.multipleTable3.toggleAllSelection()
       },
       printThisPage() {
-        if(this.org_id == 10138){
+        if(this.org_id == 10138 || this.org_id == 10278){
           const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
           printJS({

src/xt_pages/outpatientDoctorStation/print.vue

       </template> -->
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <div v-if="org_id != 10138">
+      <div v-if="org_id != 10138 && org_id != 10278">
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
         <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
         <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-      if(this.org_id == 10138){
+      if(this.org_id == 10138 || this.org_id == 10278){
         setTimeout(() => {
           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: 90%;}}}';

src/xt_pages/outpatientDoctorStation/treatPrint.vue

       </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>
+        <printOne v-if="org_id != 10138 && org_id != 10278" 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>
         <printTwo v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
       </div>
   </div>
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-      if(this.org_id == 10138){
+      if(this.org_id == 10138 || this.org_id == 10278){
         setTimeout(() => {
           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: 90%;}}}';

src/xt_pages/qcd/basicInformationAnalysis.vue

                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
 
+                 <span v-if="item.mode_id == 'CRRT'">
+                      <p>CRRT:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
                  <span v-if="item.mode_id == '未知'">
                       <p>未知:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>

src/xt_pages/stock/detail/stockOutDetail.vue

         keywords: this.searchKey
       };
       this.cancelStockDate = [];
+      this.tableData = []
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
 
         } else {
 
           this.total = response.data.data.total;
+          var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
+            
             var obj = response.data.data.list[i];
+            total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-
+       
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
-            total: response.data.data.total_price,
+            total:total.toFixed(2),
             WarehouseOut: {
               warehouse_out_time: 0
             }
           });
+          console.log("cancelstockdate2332323322332332",this.cancelStockDate)
         }
       });
     },

src/xt_pages/user/hospitalSummaryPrint.vue

               </span>
             </td>   
             <td style="text-align:center;" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.admitting_diagnosis"></span>
               </span>
             </td>   
             <td style="text-align:center;width:300px" colspan="1">
               出院诊断:
             </td>
-             <td style="text-align:center;width:170px" colspan="11">
+             <td style="text-align:center;" colspan="11">
              
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.discharge_diagnosis"></span>  
               </span>
             </td>
             <td style="text-align:center;width:300px" colspan="1">
               入院时病情:
             </td>
-           <td style="text-align:center;width:170px" colspan="11">
+           <td colspan="11">
             
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:block;margin-left:10px;text-align:left;">
                  <span v-html="hosDetail.diagnosis_admission"></span>
               </span>
             </td>
               诊断经过:
            
             </td>
-            <td style="text-align:center;width:170px" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
+            <td colspan="11">
+              <span style="display:block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.treatment"></span> 
               </span>
             </td>
             <td style="text-align:center;width:170px" colspan="1">
               出院时病情:
             </td>
-            <td style="text-align:center;width:170px" colspan="11">
+            <td colspan="11">
             
-              <span style="display:inline-block;margin-left:10px;">
+              <span style="display:block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.illness_discharge"></span> 
               </span>
             </td>
             <td style="text-align:center;width:300px" colspan="1">
               出院医嘱:
             </td>
-            <td style="text-align:center;width:170px" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
+            <td colspan="11">
+              <span style="display:block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.discharge_advice"></span> 
               </span>
             </td>
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="4">
+            <td style="text-align:center;width:170px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
                
               </span>
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:170px" colspan="3">
               上级医师签名:
             </td>
             <td style="text-align:center;width:170px" colspan="2">

src/xt_pages/workforce/appointment.vue

           }
           
           if(this.export_type == 1){
-            console.log("进来了吗22323323223",this.tableList,this.newDay[0])
+      
             
             //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
             //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
            
             
             const filename = '排班模版'
-            console.log("multiHeaders", this.$store.getters.xt_user.org.id,)
+     
 
             if(this.$store.getters.xt_user.org.id == 10234){
               excel.export_json_to_excel1({
         if (header.length == 65) {
          
           var isHas_1 = headers.includes('区号')
-          console.log("1"+isHas_1)
+ 
           var isHas_2 = headers.includes('机号')
-          console.log("2"+isHas_2)
-
+      
 
           var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
-          console.log("3"+isHas_3)
+      
 
 
           var isHas_4 = headers.includes('')
-          console.log("4"+isHas_4)
+       
 
 
           var isHas_5 = headers.includes('_1')
-          console.log("5"+isHas_5)
+        
 
           var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
-          console.log("6"+isHas_6)
+   
 
           var isHas_7 = headers.includes('_2')
-          console.log("7"+isHas_7)
+
 
           var isHas_8 = headers.includes('_3')
-          console.log("8"+isHas_8)
+
 
           var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
-          console.log("9"+isHas_9)
+
 
           var isHas_10 = headers.includes('_4')
           console.log("10"+isHas_10)
 
               }
             });
+            console.log("data232332233223",datas)
+            console.log("failed_datas33332332",failed_datas)
+            var newSchedule = datas.sort((a,b)=>{ return a.schedule_date-b.schedule_date})
+            var start_time = ""
+            var type = 0
+            if(failed_datas.length> 0){
+              var oldSchedule = failed_datas.sort((a,b)=>{ return a.schedule_date-b.schedule_date})
+              start_time = oldSchedule[0].schedule_date
+              type = 0 
+            }
 
-
+            if(failed_datas.length== 0){
+              start_time = newSchedule[0].schedule_date   
+              type = 1
+            }
+           
+            console.log("newSchedule2323223",newSchedule)
+            console.log("oldSchedule344433434",oldSchedule)
+          
+            var length = newSchedule.length - 1
             let params = {
               schedule: datas,
-              failed_schedule: failed_datas
-
+              failed_schedule: failed_datas,
+              start_time:start_time,
+              end_time:newSchedule[length].schedule_date,
+              delete_type:type,
             }
-
+            console.log("param2323233223",params)
             //今天的时间
             var day2 = new Date()
             day2.setTime(day2.getTime())
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
             var date = day2.getFullYear() + '-' + month + '-' + day
 
-            console.log("params",params)
-            console.log("datae",date)
             exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {
                 return false
         }
 
       },
+      sortData(a, b) {
+        return a.schedule_date - b.schedule_date
+      },
       getInitDate() {
         initDate().then(response => {
           if (response.data.state == 0) {
        changeWeek(val){
        
          var start = this.getTimestamp(val) - 57600
-         console.log("val23232332323232",start)
+        
          this.start_time = this.getTime(start)
          
          this.newDay.push(this.start_time)  
                 let weekOfday = parseInt(moment().format('d')) 
                 start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
                 end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
-                console.log("start",start_time)
-                console.log("end",end_time)
+            
              }
             
             //本周
              if(this.form.lastweek == "2"){
                 start_time = this.getTimestamp(this.weekDayArr[0])
                 end_time = this.getTimestamp(this.weekDayArr[6])
-                console.log("start",start_time)
-                console.log("end",end_time)
+              
              }
 
             var label = ""
               copy_endtime:copy_endtime,
             }
          
-           console.log("param22222",params)
+   
            
            this.$refs[formName].validate(valid=>{
               if(valid){
           getScheduleTemplate().then(response=>{
              if(response.data.state == 1){
                 var template = response.data.data.template
-                console.log("模版",template)
+                
                 this.templateObj = template
              }
           })