新分支

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

         ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus +
         ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
         ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
-        +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
+        +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
 
         console.log("str000000000000000000222o2o2",str)
         this.treatmentSummary.dialysis_summary = ""

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       >
                         <span
                           style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
+                          v-if="setAdminUserES(prescription.creater) == ''"
                         >
-                          {{ getAdminUser(doctor_advices[0].advice_doctor) }}
+                          {{ getAdminUser(prescription.creater) }}
                         </span>
                         <img
                           style="height: 40px"
-                          :src="setAdminUserES(doctor_advices[0].advice_doctor)"
+                          :src="setAdminUserES(prescription.creater)"
                           alt=""
                           srcset=""
                           v-else
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-    
+   
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

           <span>保险</span>
           <span>其他</span>
         </div>
-        <div>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+        <div>就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
       </div>
 
       <div class="printTitle">{{orgname}}</div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                                     type="primary"
                                 >预结算
                                 </el-button>
+
+                                <el-button
+                                  v-if="hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
+                                  size="small"
+                                  @click="open(60,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  type="primary"
+                                >撤销就诊信息
+                                </el-button>
+
                                 <el-button
                                     v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
                                     size="small"
                                     type="primary"
                                 >撤销明细
                                 </el-button>
+
+
+
                                 <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
                                 <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
                                 <el-button v-loading="loadingtwo"
             .catch(function(error) {
             })
         }
+      }else if(index == 60){
+        var that = this
+        var ids = []
+        for (let i = 0; i < prescriptions.length; i++) {
+          ids.push(prescriptions[i].id)
+        }
+        var ids_str = ids.join(',')
+        this.temp_ids = ids_str
+        this.newLoading = true
+        var that = this
+        let form = {}
+        form['id'] = this.patientInfo.id
+        form['his_patient_id'] = this.hisPatientInfo.id
+        form['record_time'] = this.record_date
+        form['ids'] = this.temp_ids
+        form['begin_time'] = this.form.diagnosis_time
+        form['p_type'] = med_type
+        form['diagnosis'] = this.form.diagnosis.join(',')
+        form['sick_type'] = this.form.sick_type
+        form['admin_user_id'] = this.$store.getters.xt_user.user.id
+        form['org_id'] = this.$store.getters.xt_user.org_id
+        if (this.activeName == 'first') {
+          form['settle_accounts_type'] = 1
+        } else if (this.activeName == 'second') {
+          form['start_time'] = this.other_start_time
+          form['end_time'] = this.other_end_time
+          form['settle_accounts_type'] = 2
+        } else {
+          form['start_time'] = this.other_start_time_two
+          form['end_time'] = this.other_end_time_two
+          form['settle_accounts_type'] = 2
+        }
+        axios.get('http://127.0.0.1:9532/api/cancledia/get', {
+          params: form,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                  that.changeRadioAndPatient(1)
+                  that.newLoading = false
+                }).catch(() => {
+                  that.changeRadioAndPatient(1)
+                  that.newLoading = false
+                })
+              } else {
+                that.changeRadioAndPatient(1)
+                that.$message({ message: '取消成功', type: 'success', duration: 5000 })
+                that.newLoading = false
+              }
+            }
+          })
+          .catch(function(error) {
+            that.newLoading = false
+          })
+
+
+
+
       }
     },
      getName(admin_user_id) {

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

                     <span>其他</span>
                 </div>
                 <div v-if="org_id == 10460">就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
-                <div v-else>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+                <div v-else>就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
             </div>
 
             <div class="printTitle">{{orgname}}</div>

src/xt_pages/stock/stockInOrderAdd.vue

               this.recordInfo.recordData[i].license_number = val.number
               this.recordInfo.recordData[i].register_number = val.register_number
               if(val.buy_price == 0){
-               this.recordInfo.recordData[i].price = ""
+               this.recordInfo.recordData[i].price = "0"
               }else{
                 this.recordInfo.recordData[i].price = val.buy_price
               }
 
               if(val.packing_price == 0){
-               this.recordInfo.recordData[i].packing_price = ""
+               this.recordInfo.recordData[i].packing_price = "0"
               }else{
                 this.recordInfo.recordData[i].packing_price = val.packing_price
               }

src/xt_pages/stock/stockInOrderEdit.vue

             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             if(val.buy_price == 0){
-               this.recordInfo.recordData[i].price= ""
+               this.recordInfo.recordData[i].price= "0"
             }else{
                this.recordInfo.recordData[i].price = val.buy_price
             }
             if(val.packing_price == 0){
-              this.recordInfo.recordData[i].packing_price = ""
+              this.recordInfo.recordData[i].packing_price = "0"
             }else{
               this.recordInfo.recordData[i].packing_price = val.packing_price
             }

src/xt_pages/stock/stockOutOrderAdd.vue

             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             if(val.packing_price == 0){
-              this.recordInfo.recordData[i].price =""
+              this.recordInfo.recordData[i].price ="0"
             }else{
               this.recordInfo.recordData[i].price = val.packing_price
             }

src/xt_pages/stock/stockOutOrderEdit.vue

             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
             if(val.packing_price == 0){
-               this.recordInfo.recordData[i].price = ""
+               this.recordInfo.recordData[i].price = "0"
             }else{
                this.recordInfo.recordData[i].price = val.packing_price
             }

src/xt_pages/user/components/PatientForm.vue

                   </el-radio-group>
                 </el-form-item>
               </el-col>
-           
-              <el-row>
+      
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-            </el-row>
+           
 
-            <!-- <el-row>
+            
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转地址: "
                 >
-                <el-select v-model="value" placeholder="请选择">
+                <el-select v-model="form.patient_address" placeholder="请选择">
                     <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
+                      v-for="item in liuAddresslist"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name">
                     </el-option>
                  </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-  -->
-              <el-row>
+           
+ 
+             
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
-                  label="开始时间 : "
+                  label="流转开始时间 : "
                 >
                 <el-date-picker
                   size="small"
                 </el-form-item>
               </el-col>
 
-              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
-                  label="结束时间 : "
+                  label="流转结束时间 : "
                 >
                 <el-date-picker
                   size="small"
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col> -->
-              </el-row>
+              </el-col>
+           
              
 
               <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
 
               </el-col>
 
+              <el-col :span="24">
+                 <el-form-item label="传染病细分:" v-if="form.is_infectious == '2'">
+                    <el-input v-model="form.infectious_remark"></el-input>
+                 </el-form-item>
+              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="疑难内瘘 : " prop="contagions">
                  <el-radio-group v-model="form.troble_shoot">
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="过敏史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.allergic_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="体格检查">
   patient_source:0,
   patient_start_time:"",
   patient_end_time:"",
+  patient_address:"",
+  infectious_remark:"",
+  allergic_history:"",
   formItem: [
     {
       id: 0,
   dbp: "",
   showOne:true,
   treatment_plan:"",
-
 };
 
 export default {
       },
       adminUserOptions:[],
       org_id:0,
+      liuAddresslist:[]
     };
   },
   components: {
     }
   },
   created() {
-
+  this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
+  console.log("liuAddresslist",this.liuAddresslist)
    this.fetchAllAdminUsers();
-
+ 
 
     if(this.isEdit == true){
        this.showLapseto = false
     // this.rhOptions = this.$store.getters.rh;
     this.educationOptions = getDataConfig("patient", "education_types");
     this.professionOptions = getDataConfig("patient", "profession_options");
+
+  
     // this.inductionOptions = this.$store.getters.induction_options;
     this.contagionList = this.$store.getters.contagions;
     this.checkDisease = this.$store.getters.disease;