新分支

.idea/shelf/Uncommitted_changes_before_Update_at_2023_4_26_15_16_[Changes]/AssessmentAfterDislysis.vue

@@ -601,7 +601,7 @@
             </el-form-item>
        </el-col>
        <el-col :span="8" v-if="isShow('累计血容量')">
-            <el-form-item label="累计血容量(L)："  label-width="150px" :prop="isName('累计血容量')" :rules="isCheckmust('累计血容量')">
+            <el-form-item label="透析血容量(L)："  label-width="150px" :prop="isName('透析血容量')" :rules="isCheckmust('透析血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
         </el-col>

src/api/patient.js

@@ -1093,4 +1093,13 @@ export function getPatientCriticalOneList(params){
     method:"get",
     params:params,
   })
+}
+
+export function deleteSolution(id,params){
+  
+  return request({
+    url:"/api/patient/deletesolution?id="+id,
+    method:"Get",
+    params:params,
+  })
 }

src/api/stock.js

@@ -121,7 +121,7 @@ export function GetGoodType(params) {
 }
 
 export function createGoodInfo(params) {
-  console.log('prams', params)
+
   return request({
     url: '/api/stock/good/info/create',
     method: 'post',

src/xt_pages/data/components/consumables.vue

@@ -1576,8 +1576,8 @@
          }
          console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
 
-         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码','批准文号','医保等级']
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code','number','medical_insurance_level']
+         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码','批准文号','医保等级',"注册编码"]
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code','number','medical_insurance_level','register_number']
 
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
 

src/xt_pages/data/components/drugs.vue

@@ -1533,7 +1533,7 @@
 
 
          console.log("this.table",this.list)
-
+         
          for(let i=0;i<this.list.length;i++){
           for(let j=0;j<this.drugCategoryList.length;j++){
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
@@ -1566,11 +1566,28 @@
 
              }
            }
+           
           this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
+
+          if(this.list[i].is_special_diseases == 1 ){
+             this.list[i].is_special_diseases_name ="是"
+          }
+
+          if(this.list[i].is_special_diseases == 2 ||this.list[i].is_special_diseases == 0  ){
+             this.list[i].is_special_diseases_name ="否"
+          }
+
+          if(this.list[i].lmt_used_flag == 1 ){
+             this.list[i].lmt_used_flag_name ="是"
+          }
+
+          if(this.list[i].lmt_used_flag == 2 ||this.list[i].lmt_used_flag == 0  ){
+             this.list[i].lmt_used_flag_name ="否"
+          }
          }
 
-         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码','批准文号','医保等级']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code','number','medical_insurance_level']
+         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码','批准文号','医保等级','是否特病目录','限制性用药']
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code','number','medical_insurance_level','is_special_diseases_name','lmt_used_flag_name']
 
          const data = this.formatJson(filterVal,this.list)
 

src/xt_pages/dialysis/batch_print/batch_print_order_fiftynine.vue

@@ -916,9 +916,7 @@
                             record.assessment_before_dislysis.weight_before
                               ? parseFloat(
                                   record.assessment_before_dislysis
-                                    .weight_before -
-                                    record.assessment_before_dislysis
-                                      .additional_weight
+                                    .weight_before
                                 ).toFixed(1)
                               : "/"
                           }}
@@ -2047,10 +2045,7 @@
                             record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_after
                               ? parseFloat(
-                                  record.assessment_after_dislysis
-                                    .weight_after -
-                                    record.assessment_before_dislysis
-                                      .additional_weight
+                                  record.assessment_after_dislysis.weight_after
                                 ).toFixed(1)
                               : "/"
                           }}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1005,7 +1005,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10624">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10624 && org_id!=10290">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1031,7 +1031,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624 || org_i==10624)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10624 || org_id==10624 || org_id == 10290)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -214,6 +214,7 @@
                       <span style="width:50px;display: inline-block;">{{
                         record.prescription.anticoagulant_zongliang &&
                         (record.prescription.anticoagulant == 6 ||
+                        record.prescription.anticoagulant == 3 ||
                           record.prescription.anticoagulant == 7)
                           ? record.prescription.anticoagulant_zongliang
                           : ""

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -325,8 +325,8 @@
           <span class="content" >{{ this.record.pip_coagulation}}</span>
         </li>
        <li v-if="isShow('累计血容量')">
-          <label>累计血容量: </label>
-          <span class="content" >{{ this.record.accumulated_blood_volume}}</span>
+          <label>透析血容量: </label>
+          <span class="content" >{{ this.record.accumulated_blood_volume}}L</span>
         </li>
 
         <li v-if="isShow('输液量')">

src/xt_pages/dialysis/details/index.vue

@@ -449,7 +449,7 @@
 
                 </div>
                 <div class="printCell" style="display:flex;">
-                  <span style="display: block;width: 45%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                  <span style="display: block;width: 45%;">目标脱水量：{{ main_collection.prescription.target_ultrafiltration }}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138 || $store.getters.xt_user.org.id == 10460">ml</span>
                     <span v-else>L</span>
                   </span>
@@ -528,7 +528,7 @@
                   </span>
                 </div>
                 <div class="printCell" style="display:flex;"  v-if="org_id==10598 || org_id == 0">
-                  <span style="display: block;width: 45%;">目标脱水量：{{main_collection.prescription.prescription_water}}
+                  <span style="display: block;width: 45%;">处方脱水量：{{main_collection.prescription.prescription_water}}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                      <span v-else>L</span>
                   </span> 

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyNine.vue

@@ -852,8 +852,7 @@
                         {{
                           predialysis.weight_before
                             ? parseFloat(
-                                predialysis.weight_before -
-                                  predialysis.additional_weight
+                                predialysis.weight_before
                               ).toFixed(1)
                             : "/"
                         }}
@@ -1924,12 +1923,7 @@
                         style="width: 70px; text-align: center"
                       >
                         {{
-                          afterdialysis.weight_after
-                            ? parseFloat(
-                                afterdialysis.weight_after -
-                                  afterdialysis.additional_weight
-                              ).toFixed(1)
-                            : "/"
+                          afterdialysis.weight_after? parseFloat(afterdialysis.weight_after).toFixed(1): "/"
                         }}
                       </div>
                       kg

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2538,7 +2538,7 @@
               </div>
              
             </div>
-            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
+            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460&&org_id!=10624">
               诊断：
               <div
                 class="under_line"
@@ -2914,11 +2914,16 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
+                        <span v-if="org_id!=10598">{{
                           afterdialysis.weight_loss
                             ? afterdialysis.weight_loss
                             : "/"
-                        }}
+                           }}
+                         </span>
+                         <span v-if="org_id ==10598"> 
+                          {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
+                         </span>
+                      
                       </div>
                       kg
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -1962,6 +1962,20 @@
                       ml
                     </div>
                   </div>
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                    透析血容量：
+                      <div
+                        class="under_line"
+                        style="width: 70px; text-align: center"
+                      >
+                        {{
+                          afterdialysis.accumulated_blood_volume
+                            ? afterdialysis.accumulated_blood_volume
+                            : "/"
+                        }}
+                        L
+                   </div>
+                  </div>
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1996,21 +1996,21 @@ export default {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
-                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                      preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  || this.org_id == 0){
                       preTime = this.record_date + ' ' + '6:00'
                     } else {
-                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                      preTime = this.record_date + ' ' + '7:00'
 
                     }
                   } else if (this.schedule.schedule_type == 2) {
                      if(this.org_id == 10206  || this.org_id == 0 ){
                       preTime = this.record_date + ' ' + '10:30'
                     }else{
-                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                     preTime = this.record_date + ' ' + '11:00'
                    }
                   } else if (this.schedule.schedule_type == 3) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    preTime = this.record_date + ' ' + '17:00'
                   }
                   // preTime = nowTime
                 } else {
@@ -2165,11 +2165,11 @@ export default {
                 if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
-                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                      preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  || this.org_id == 0) {
                       preTime = this.record_date+ ' ' + '6:00'
                     } else {
-                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                      preTime = this.record_date + ' ' + '7:00'
 
                     }
                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2177,10 +2177,10 @@ export default {
                     if(this.org_id == 10206  || this.org_id == 0){
                       preTime = this.record_date + ' ' + '6:00'
                     }else {
-                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                      preTime = this.record_date + ' ' + '11:00'
                     }
                   } else if (this.schedule.schedule_type == 3) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    preTime = this.record_date + ' ' + '17:00'
                   }
                 }
 
@@ -2501,11 +2501,11 @@ export default {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                            preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 0){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                            preTime = this.record_date + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2513,10 +2513,10 @@ export default {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
                           }else{
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                            preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          preTime = this.record_date + ' ' + '17:00'
                         }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -2672,11 +2672,11 @@ export default {
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                            preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                            preTime = this.record_date + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2685,11 +2685,11 @@ export default {
                             preTime =this.record_date + ' ' + '10:30'
                           }else{
 
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                            preTime = this.record_date + ' ' + '11:00'
 
                           }
                         } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          preTime = this.record_date + ' ' + '17:00'
                         }
                       }
 
@@ -4226,13 +4226,13 @@ export default {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                            preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 0){
 
                             preTime = this.record_date + ' ' + '6:00'
 
                           } else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                            preTime = this.record_date + ' ' + '7:00'
 
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -4241,10 +4241,10 @@ export default {
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                            preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          preTime = this.record_date + ' ' + '17:00'
                         }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -4399,21 +4399,21 @@ export default {
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                            preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date+ ' ' + '6:00'
                           } else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                            preTime = this.record_date + ' ' + '7:00'
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
                           }else{
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                            preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          preTime = this.record_date + ' ' + '17:00'
                         }
                       }
 
@@ -4912,22 +4912,22 @@ export default {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                            preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 0){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                            preTime = this.record_date + ' ' + '7:00'
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime =this.record_date + ' ' + '10:30'
                           }else{
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                            preTime = this.record_date + ' ' + '11:00'
 
                           }
                         } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          preTime = this.record_date + ' ' + '17:00'
                         }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -5083,11 +5083,11 @@ export default {
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028) {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                            preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 ||  this.org_id == 0){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                            preTime = this.record_date + ' ' + '7:00'
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
@@ -5095,10 +5095,10 @@ export default {
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else{
-                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                            preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                          preTime = this.record_date + ' ' + '17:00'
                         }
                       }
 

src/xt_pages/stock/stockFlow.vue

@@ -52,7 +52,7 @@
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
 
-          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
+          <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
         </span>
        
       </div>

src/xt_pages/user/courseOfDisease.vue

@@ -851,7 +851,7 @@
       // nowMonth = nowDate.getMonth() + 1
       // nowDay = nowDate.getDate()
       // this.start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' +(nowDay < 10 ? '0' + nowDay : nowDay)
-      this.start_time = moment().month(moment().month() - 1).startOf('month').format('YYYY-MM-DD');
+      this.start_time = moment().month(moment().month() - 6).startOf('month').format('YYYY-MM-DD');
       console.log("start_time",this.start_time)
       this.end_time = moment().endOf('month').format('YYYY-MM-DD');
       console.log("end_time",this.end_time)

src/xt_pages/user/dialysisSolution.vue

@@ -124,6 +124,21 @@
               </el-button>
             </el-tooltip>
 
+            <el-tooltip
+                class="item"
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="deleteSolution(scope.$index, scope.row)"
+                   删除
+                ></el-button>
+               </el-tooltip>
+
           </template>
         </el-table-column>
       </el-table>
@@ -954,7 +969,8 @@
     editDialysisSolutionDetail,
     editPatientDialysisSolution,
     findePatientDialysisLongSolutions,
-    getDialysisSolutionDetailList
+    getDialysisSolutionDetailList,
+    deleteSolution
   } from '@/api/patient'
 
   import { getSystemPrescription } from '@/api/config'
@@ -2688,6 +2704,25 @@
           }
         }
         return name
+      },
+      deleteSolution(index,row){
+          this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         }).then(() => {
+          deleteSolution(row.id).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.$message.success("删除成功")
+                  this.FindePatientDialysisLongSolutions()
+              } else {
+                  this.$message.error("药品已经出库不能删除")
+              }
+            })
+          })
+          .catch(() => {
+          }) 
       }
     },
     created() {