Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -223,7 +223,7 @@
                                 </el-button>
 
                                 <el-button
-                                  v-if="(hisPatientInfo.id_card_type != 3 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
+                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
                                   size="small"
                                   @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                   type="primary"
@@ -1770,7 +1770,8 @@ export default {
           this.loadingone = false
           return false
         } else {
-          if(response.data.data.status = 1){
+          if(response.data.data.status == 1){
+
             this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
           }
         }
@@ -3402,7 +3403,18 @@ export default {
         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
+        var time_arr = this.form.diagnosis_time.split(" ")
+        let hh = new Date().getHours();
+        let mf =
+          new Date().getMinutes() < 10
+            ? "0" + new Date().getMinutes()
+            : new Date().getMinutes();
+        let ss =
+          new Date().getSeconds() < 10
+            ? "0" + new Date().getSeconds()
+            : new Date().getSeconds();
+        var new_time  = time_arr[0] + " " + hh+":"+mf+":"+ss
+        form['begin_time'] = new_time
         form['p_type'] = med_type
         form['diagnosis'] = this.form.diagnosis.join(',')
         form['sick_type'] = this.form.sick_type