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

src/api/schedule.js

@@ -297,6 +297,7 @@ export function  postScheduleConfig(params) {
 
 
 export function CreateScheduleTwo(id, schedule,id_two) {
+  console.log("schedule",schedule)
   return request({
     url: '/api/schedule/create_two?patient_id=' + id+"&id_two="+id_two,
     method: 'Post',

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

@@ -1147,7 +1147,12 @@
         console.log(" this.assessmentBeforeDislysis.pathway_formation_time", moment(new Date()).format('YYYY-MM-DD'))
         console.log("hhahhahahah",assessment)
         if(assessment!=null){
-          this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
+          if(assessment.pathway_formation_time >0){
+            this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
+          }else{
+            this.assessmentBeforeDislysis.pathway_formation_time = ""
+          }
+         
           if(assessment.whether_unobstructed >0){
             this.assessmentBeforeDislysis.whether_unobstructed = assessment.whether_unobstructed.toString()
           } 

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -2,10 +2,10 @@
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10387">湖南省社会医疗保险医疗费用结算单</div>
-
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -2,7 +2,9 @@
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
+
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -349,12 +349,33 @@
 
             />
           </p>
+          <p v-if="org_id == 10510 ||org_id == 0">
+            医师：
+            <span
+              style="width: 100px; display: inline-block"
+              v-if="item.creator == ''"
+            >
+                {{ item.doctor }}
+              </span>
+            <span
+              style="width: 100px; display: inline-block"
+              v-else-if="doc_name != ''"
+            >
+                {{ doc_name }}
+              </span>
+            <img
+              style="height: 50px;"
+              :src="setAdminUserES(item.creator,item.doctor)"
+              alt=""
+              srcset=""
+
+            />
+          </p>
           <p v-else>
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
-
         <div class="actionBar">
           <p>审核：</p>
           <p>配对：</p>