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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1098,8 +1098,8 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624">ml</span> 
-                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460 && org_id!=10624">L</span>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624 || org_id ==10644">ml</span> 
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460 && org_id!=10624  && org_id!=10644">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id ==10598">
@@ -2934,6 +2934,24 @@
                         </div>
                         ml
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id ==10598 || org_id == 0">
+                        在线Kt/V：
+                        <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis
+                              .ktv
+                              ? record.assessment_after_dislysis
+                                  .ktv
+                              : "/"
+                          }}
+                        </div>
+                       
+                      </div>
                     </div>
                     <div
                       class="row"

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -724,6 +724,7 @@
                         </div>
                       </div>
                       <div
+                        v-if="org_id != 0 && org_id !=10677"
                         class="inline_block"
                         style="margin-left: 10px; flex: 1"
                       >
@@ -741,6 +742,25 @@
                         </div>
                         L
                       </div>
+                      <div
+                        v-if="org_id == 0 || org_id ==10677"
+                        class="inline_block"
+                        style="margin-left: 10px; flex: 1"
+                      >
+                        置换速度：
+                        <div
+                          class="under_line"
+                          style="width: 70px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.displace_speed
+                              ? record.prescription.displace_speed
+                              : "/"
+                          }}
+                        </div>
+                        L
+                      </div>
                       <div
                         class="inline_block"
                         style="margin-left: 10px; flex: 1"
@@ -2936,6 +2956,56 @@
                     </div>
                   </td>
                 </tr>
+
+                <tr v-if="org_id ==10677 || org_id == 0">
+                  <td>
+                    <div
+                      class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                    >
+                      <div class="inline_block" style="flex: 1">
+                        带教老师：
+                        <div
+                          class="under_line"
+                          style="width: 80px; text-align: center"
+                        >
+                          <span
+                            v-if="
+                              setAdminUserES(
+                                record.quality_nurse_id,
+                                'quality_nurse_id'
+                              ) == ''
+                            "
+                            >{{
+                              getAdminUser(
+                                record.quality_nurse_id,
+                                "quality_nurse_id"
+                              )
+                                ? getAdminUser(
+                                    record.quality_nurse_id,
+                                    "quality_nurse_id"
+                                  )
+                                : "/"
+                            }}</span
+                          >
+                          <img
+                            class="es-img"
+                            :src="
+                              setAdminUserES(
+                                record.quality_nurse_id,
+                                'quality_nurse_id'
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                            style="height: 40px"
+                          />
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -100,9 +100,9 @@ export default {
         return []
       }
     },
-    // dialysis_date:{
-    //   type:String
-    // }
+    dialysis_date:{
+      type:String
+    }
   },
   computed: {
     created_time: function() {
@@ -165,10 +165,19 @@ export default {
     }
   },
   created() {
+   
     // this.dialysis_time = parseTime(this.dialysis_date, '{y}-{m}-{d}')
     // this.dialysis_time = this.dialysis_date ? parseTime(this.dialysis_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-    this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+    // this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+
+    
   },
+  watch:{
+    dialysis_date:function(){
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh我爱中国",this.dialysis_date)
+      this.dialysis_time = this.dialysis_date
+    }
+  }
 }
 </script>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -453,7 +453,7 @@
         </li>
 
         <li v-if="isShow('单超时长')">
-          <label>单超时长(h): </label>
+          <label>单超时长(min): </label>
           <span class="content">{{this.prescription.single_time}}</span>
         </li>
 

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

@@ -211,7 +211,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="isShows('单超时长') && dialysisPrescription.is_water == 1">
-                        <el-form-item label="单超时长(h)：" prop="single_time" :rules="isCheckmust('单超时长')">
+                        <el-form-item label="单超时长(min)：" prop="single_time" :rules="isCheckmust('单超时长')">
                             <el-input v-model="dialysisPrescription.single_time"></el-input>
                         </el-form-item>
                     </el-col>

src/xt_pages/dialysis/details/index.vue

@@ -62,6 +62,8 @@
         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               prefix-icon="el-icon-date" @change="handleScheduleDateChange"
              :editable="false" :clearable="false"
               style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
@@ -158,7 +160,10 @@
         <!-- 透析区 -->
         <el-tab-pane label="透析区" name="second">
           <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date"  format="yyyy-MM-dd"
+             value-format="yyyy-MM-dd"
+             @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" >
+            </el-date-picker>
             <el-input size="small" style="width:25%;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
             <el-button size="small" class="filter-item" style="margin-right:20px;" type="primary" @click="searchAction">搜索</el-button>
           </div>
@@ -1479,7 +1484,7 @@ export default {
       lastDialysisPrescribe: { id: 0 },
       //
       activeName: 'first',
-      selected_date: new Date(),
+      selected_date:moment().format('YYYY-MM-DD'),
       // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
       search_keyword: '', // 确定用于搜索的关键字
       search_input: '', // 输入中的关键字
@@ -1548,6 +1553,7 @@ export default {
       // end_time2:'',
       first_monitor:{},
       last_monitor:{},
+      new_date:0,
     }
   },
   created() {
@@ -1562,19 +1568,26 @@ export default {
       this.activeName = sessionStorage.getItem("nameActive")
     }
     var patient_id = this.$route.query.patient_id
-    var date = this.$route.query.date
+    var date = moment().format('YYYY-MM-DD')
+    this.new_date = (new Date(date).getTime()/1000)-28800
+    this.dialysis_date = ""
+    this.dialysis_date = (new Date(date).getTime()/1000)-28800
+    // var date = this.$route.query.date
     this.patient_id = patient_id
-    this.date = date
-    this.dialysis_date=
+    // this.date = date
+    // this.new_date = date
+    // this.dialysis_date= date
     this.getScheduleDetail()
     this.getLongAdvice()
 
-    this.selected_date = this.$route.query.date * 1000
+    // this.selected_date = this.$route.query.date * 1000
+    // this.new_date = this.$route.query.date * 1000
     var schedule_type_selected = this.$store.getters.schedule_type_selected
     var zone_selected = this.$store.getters.zone_selected
     var patient_state_selected = this.$store.getters.patient_state_selected
     var treat_state_selected = this.$store.getters.treat_state_selected
-    var selected_date = this.$store.getters.selected_date
+    // var selected_date = this.$store.getters.selected_date
+    // console.log("日志时间2222222222222222",selected_date)
     if (schedule_type_selected) {
       this.scheduleStateVal = schedule_type_selected.schedule_type_selected
     }
@@ -1587,9 +1600,9 @@ export default {
     if (treat_state_selected) {
       this.treatStateVal = treat_state_selected.treat_state_selected
     }
-    if (selected_date.selected_date) {
-      this.selected_date = selected_date.selected_date
-    }
+    // if (selected_date.selected_date) {
+    //   this.selected_date = selected_date.selected_date.format('YYYY-MM-DD')
+    // }
 
     this.initData = {
       cmd: "queue/join",
@@ -1879,7 +1892,7 @@ export default {
     getLongAdvice() {
       const params = {
         patient_id: this.patient_id,
-        schedule_date:this.$route.query.date,
+        schedule_date:this.new_date,
 
       }
       getLongAdviceTwo(params).then(rs => {
@@ -1948,14 +1961,14 @@ export default {
     },
     getScheduleDetail: function() {
       this.loading = true
-      var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+      // var dateStr = parseTime(this.date, '{y}-{m}-{d}')
       if(this.$route.query.showView == true){
         this.loading = false
         return
       }
-      // console.log('kkkkkkk',dateStr);
+      console.log('kkkkkkk2222222222222222222',this.selected_date);
       this.doctor_advices = []
-      getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+      getDialysisScheduleDetail(this.patient_id, this.selected_date).then(rs => {
 
         var resp = rs.data
         if (resp.state == 1) {
@@ -2233,6 +2246,9 @@ export default {
       //   schedule_type: this.schedule_type_selected,
       //   schedule_date: this.selected_date,
       // })
+      console.log("index-------------",index)
+      this.new_date = (new Date(index).getTime()/1000)-28800
+      this.dialysis_date = (new Date(index).getTime()/1000)-28800
       this.selected_date = index
       this.$store.dispatch('SetSelectedDate', { selected_date: index })
       this.requestDialysisSchedules()
@@ -2331,8 +2347,9 @@ export default {
     },
     requestDialysisSchedules: function() {
 
-      var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
-      getDialysisSchedules(ymd).then(rs => {
+      // var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
+      console.log("热切吴2222222222",this.selected_date)
+      getDialysisSchedules(this.selected_date).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
@@ -2383,21 +2400,27 @@ export default {
     changePatient(schedual) {
         this.patient_id = schedual.patient_id
         this.date = schedual.schedule_date
+
+        this.new_date = schedual.schedule_date
+        this.dialysis_date = ""
+        this.dialysis_date = schedual.schedule_date
+
+        console.log("到哪去啊大大阿道夫阿道夫",this.dialysis_date)
          this.getScheduleDetail();
         console.log('schedual',schedual);
         //this.getLongAdvice();
 
         var patient_id = schedual.patient_id
-        var date = schedual.schedule_date
-        this.$router.push({
-          path: '/dialysis/details',
-          query: {
-            patient_id: patient_id,
-            date: date,
-            patient_name: schedual.patient.name,
-            mode_id:schedual.mode_id
-          }
-        })
+        // var date = schedual.schedule_date
+        // this.$router.push({
+        //   path: '/dialysis/details',
+        //   query: {
+        //     patient_id: patient_id,
+        //     date: date,
+        //     patient_name: schedual.patient.name,
+        //     mode_id:schedual.mode_id
+        //   }
+        // })
     },
     handleClick(type) {
       sessionStorage.setItem('nameActive', type.name);
@@ -2908,7 +2931,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date: this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -2923,7 +2946,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date: this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:this.$route.query.mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -2969,7 +2992,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date:this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -2982,7 +3005,7 @@ export default {
               path: '/dialysis/details',
               query: {
                 patient_id: parseInt(res.data.data.patientInfo.patient_id),
-                date: this.$route.query.date,
+                date:this.new_date,
                 patient_name: res.data.data.patientInfo.patient_name,
                 mode_id:this.$route.query.mode_id,
                 curPatientTime:res.data.data.patientInfo.create_time,
@@ -3018,7 +3041,7 @@ export default {
 
        var params = {
          patient_id:this.$route.query.patient_id,
-         record_date:this.$route.query.date,
+         record_date:this.new_date,
        }
       getInitPrintData(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -3207,7 +3207,7 @@ export default {
       this.queryParams.xtdate = xtdate;
       this.queryParams.xtno = xtno;
       this.queryParams.patient_id = patient_id
-      console.log('wwwwww121212',this.org_template_info.template_id);
+      // console.log('wwwwww121212',this.org_template_info.template_id);
       this.getDialysisRecord();
     } else {
       this.$message.error("参数不齐");

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -757,10 +757,10 @@
               <span v-if="advice.single_dose != 0"
                 >{{ advice.single_dose }}{{ advice.single_dose_unit }}</span
               >
-              <span v-if="advice.parent_id == 0 && advice.children.length == 0">{{
+              <span v-if="advice.advice_name!=undefined">{{
                 advice.delivery_way
               }}</span>
-              <span v-if="advice.parent_id == 0 && advice.children.length == 0">{{
+              <span v-if="advice.advice_name!=undefined">{{
                 advice.execution_frequency
               }}</span>
             </td>
@@ -1434,7 +1434,7 @@ export default {
             this.advices = tableAdvice;
           }
 
-          console.log(this.advices, "this.advices");
+          console.log("0000000000000000000000000000000000000000", this.advices);
 
           this.loading = false;
 
@@ -1468,8 +1468,7 @@ export default {
 
                 var doctor_advice = {
                   delivery_way: this.doctor_advices[index].delivery_way,
-                  execution_frequency:
-                    this.doctor_advices[index].execution_frequency,
+                  execution_frequency:this.doctor_advices[index].execution_frequency,
                   groupno: this.doctor_advices[index].groupno,
                   id: this.doctor_advices[index].id,
                   parent_id: this.doctor_advices[index].parent_id,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2989,6 +2989,22 @@
                       <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624"> ml</span>
                       <span v-if="org_id ==9675||org_id==10447 || org_id==10624">L</span>
                     </div>
+
+                    <div class="inline_block" style="flex: 1" v-if="org_id ==10598 || org_id == 0">
+                      在线Kt/V：
+                      <div
+                          class="under_line"
+                          style="width: 100px; text-align: center"
+                        >
+                          {{
+                            afterdialysis &&
+                            afterdialysis.ktv
+                              ? afterdialysis.ktv
+                              : "/"
+                          }}
+                        </div>
+                    </div>
+                    
                   </div>
                   <div
                     class="row"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -748,6 +748,7 @@
                       </div>
                     </div>
                     <div
+                      v-if="org_id != 0 && org_id!=10677"
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
@@ -764,6 +765,25 @@
                       </div>
                       L
                     </div>
+                    <div
+                      v-if="org_id == 0 || org_id==10677"
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                    >
+                      置换速度：
+                      <div
+                        class="under_line"
+                        style="width: 70px; text-align: center"
+                      >
+                      {{
+                              prescription &&
+                              prescription.displace_speed
+                                ? prescription.displace_speed
+                                : "/"
+                            }}
+                      </div>
+                      ml/min
+                    </div>
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
@@ -2499,6 +2519,56 @@
                   </div>
                 </td>
               </tr>
+              <tr v-if="org_id ==10677 || org_id == 0">
+                <td colspan="7">
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                  <div>
+                    <div class="inline_block" style="flex: 1">
+                      带教老师：
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.quality_nurse_id
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.quality_nurse_id
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.quality_nurse_id
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  </div>
+                  </div>
+                </td>
+              </tr>
             </tbody>
           </table>
           <!-- <div  class="print-yema">1</div> -->

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -17,7 +17,11 @@
         <el-button style="width: 100px"  size="small" @click="callElePre(3)" type="primary">处方上传</el-button>
         <el-button style="width: 100px"  size="small" @click="callElePre(4)" type="primary">处方撤销</el-button>
         <el-button style="width: 100px"  size="small" @click="callElePre(5)" type="primary">处方信息查询</el-button>
-        <el-button style="width: 100px"  size="small" @click="callElePre(6)" type="primary">处方结果查询</el-button>
+        <el-button style="width: 100px"  size="small" @click="callElePre(6)" type="primary">处方审核结果查询</el-button>
+          <el-button style="width: 100px"  size="small" @click="callElePre(7)" type="primary">处方取药结果查询</el-button>
+          <el-button style="width: 100px"  size="small" @click="callElePre(8)" type="primary">药品在售查询</el-button>
+
+
         </div>
         <el-tabs v-model="dayorMonth" @tab-click="changeDayOrMonth">
           <el-tab-pane label="日结" name="day"></el-tab-pane>
@@ -4447,9 +4451,10 @@ export default {
         case 2:
           var  that = this
           let params2 = {
-            'order_id': this.order.id,
-            'admin_user_id': this.$store.getters.xt_user.user.id,
-            'fapiao_code':this.fapiao_code,
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG002', {
             params: params2
@@ -4484,9 +4489,10 @@ export default {
         case 3:
           var  that = this
           let params3 = {
-            'order_id': this.order.id,
-            'admin_user_id': this.$store.getters.xt_user.user.id,
-            'fapiao_code':this.fapiao_code,
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG003', {
             params: params3
@@ -4521,9 +4527,10 @@ export default {
         case 4:
           var  that = this
           let params4 = {
-            'order_id': this.order.id,
-            'admin_user_id': this.$store.getters.xt_user.user.id,
-            'fapiao_code':this.fapiao_code,
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG004', {
             params: params4
@@ -4558,9 +4565,10 @@ export default {
         case 5:
           var  that = this
           let params5 = {
-            'order_id': this.order.id,
-            'admin_user_id': this.$store.getters.xt_user.user.id,
-            'fapiao_code':this.fapiao_code,
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG005', {
             params: params5
@@ -4595,9 +4603,10 @@ export default {
         case 6:
           var  that = this
           let params6 = {
-            'order_id': this.order.id,
-            'admin_user_id': this.$store.getters.xt_user.user.id,
-            'fapiao_code':this.fapiao_code,
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
           }
           axios.get('http://127.0.0.1:9532/api/CFYLJG006', {
             params: params6
@@ -4629,11 +4638,83 @@ export default {
 
             })
           break
+        case 7:
+          var  that = this
+          let params7 = {
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
+          }
+          axios.get('http://127.0.0.1:9532/api/CFYLJG007', {
+            params: params7
+          }).then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.fapiaoCodeDialogVisible = false
+              return false
+            } else {
+              that.fapiaoCodeDialogVisible = false
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
 
-      }
+                }).catch(() => {
+
+                })
 
+              } else {
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
+                that.order.is_upload_diagnose = 1
+              }
+
+            }
+          })
+            .catch(function(error) {
+
+            })
+          break
+        case 8:
+          var  that = this
+          let params8 = {
+            'admin_user_id':3626,
+            'patient_id': this.patientInfo.id,
+            'his_patient_id': this.hisPatientInfo.id,
+            'record_time':this.record_date
+          }
+          axios.get('http://127.0.0.1:9532/api/CFYLJG008', {
+            params: params8
+          }).then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.fapiaoCodeDialogVisible = false
+              return false
+            } else {
+              that.fapiaoCodeDialogVisible = false
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
 
+              } else {
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
+                that.order.is_upload_diagnose = 1
+              }
 
+            }
+          })
+            .catch(function(error) {
+
+            })
+          break
+      }
     }
   }, mounted() {
     this.request_record_date = this.record_date

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -346,6 +346,21 @@ export default {
             if(modeIdCount[i].mode_id == 32){
                modeIdCount[i].mode_id = "HDP"
             }
+            if(modeIdCount[i].mode_id == 33){
+              modeIdCount[i].mode_id = "HFD"
+            }
+            if(modeIdCount[i].mode_id == 34){
+              modeIdCount[i].mode_id = "HDF100"
+            }
+            if(modeIdCount[i].mode_id == 35){
+              modeIdCount[i].mode_id = "HDF600"
+            }
+            if(modeIdCount[i].mode_id == 36){
+              modeIdCount[i].mode_id = "HDF800"
+            }
+            if(modeIdCount[i].mode_id == 37){
+              modeIdCount[i].mode_id = "HDF1000"
+            }
           }
           this.modeIdCount = modeIdCount
 
@@ -449,6 +464,21 @@ export default {
             if(scheduleCount[i].mode_id == 32){
               scheduleCount[i].mode_id = "HDP"
             }
+            if(scheduleCount[i].mode_id == 33){
+              scheduleCount[i].mode_id = "HFD"
+            }
+            if(scheduleCount[i].mode_id == 34){
+              scheduleCount[i].mode_id = "HDF100"
+            }
+            if(scheduleCount[i].mode_id == 35){
+              scheduleCount[i].mode_id = "HDF600"
+            }
+            if(scheduleCount[i].mode_id == 36){
+              scheduleCount[i].mode_id = "HDF800"
+            }
+            if(scheduleCount[i].mode_id == 37){
+              scheduleCount[i].mode_id = "HDF1000"
+            }
           }
           this.scheduleCount = scheduleCount
           let dataInfo = {}
@@ -645,7 +675,18 @@ export default {
           patients[i].mode_id = "HPD"
         }else if(patients[i].mode_id == 32){
           patients[i].mode_id = "HDP"
+        }else if(patients[i].mode_id == 33){
+          patients[i].mode_id = "HFD"
+        }else if(patients[i].mode_id == 34){
+          patients[i].mode_id = "HDF100"
+        }else if(patients[i].mode_id == 35){
+          patients[i].mode_id = "HDF600"
+        }else if(patients[i].mode_id == 36){
+          patients[i].mode_id = "HDF800"
+        }else if(patients[i].mode_id == 37){
+          patients[i].mode_id = "HDF1000"
         }
+        
 
       }
     },
@@ -714,15 +755,20 @@ export default {
          this.DialysisData[i].PE = this.getHdModeIdCount(this.DialysisData[i].patient_id,"PE")
          this.DialysisData[i].XUEHP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"血浆胆红素吸附+HP")
          this.DialysisData[i].HPD = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HPD")
-          this.DialysisData[i].HDP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDP")
+         this.DialysisData[i].HDP = this.getHdModeIdCount(this.DialysisData[i].patient_id,"HDP")
+         this.DialysisData[i].PHF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"PHF")
+         this.DialysisData[i].HDF100 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF100")
+         this.DialysisData[i].HDF600 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF600")
+         this.DialysisData[i].HDF800 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF800")
+         this.DialysisData[i].HDF1000 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF1000")
 
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 
@@ -763,14 +809,19 @@ export default {
          this.DialysisData[i].XUEHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"血浆胆红素吸附+HP")
          this.DialysisData[i].HPD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HPD")
          this.DialysisData[i].HDP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDP")
+         this.DialysisData[i].PHF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"PHF")
+         this.DialysisData[i].HDF100 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF100")
+         this.DialysisData[i].HDF600 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF600")
+         this.DialysisData[i].HDF800 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF800")
+         this.DialysisData[i].HDF1000 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF1000")
 
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getScheduleDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 
@@ -812,14 +863,18 @@ export default {
          this.scheduleList[i].XUEHP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"血浆胆红素吸附+HP")
          this.scheduleList[i].HPD = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HPD")
          this.scheduleList[i].HDP = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDP")
-
+         this.scheduleList[i].PHF = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"PHF")
+         this.scheduleList[i].HDF100 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF100")
+         this.scheduleList[i].HDF600 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF600")
+         this.scheduleList[i].HDF800 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF800")
+         this.scheduleList[i].HDF1000 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF1000")
          this.scheduleList[i].age = this.getAge(this.scheduleList[i].id_card_no)
          this.scheduleList[i].total_count = this.getScheduleDialysisCount(this.scheduleList[i].patient_id)
        }
        console.log("hhh2323323232",this.scheduleList)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','total_count']
 
         const data = this.formatJson(filterVal, this.scheduleList)
 

src/xt_pages/workforce/components/template_table_four.vue

@@ -1830,7 +1830,9 @@ export default {
     },
     dragstartTwo(event, item) {
       console.log("start的索引", item.moveIndex);
-    },search_two: function () {
+    },
+    search_two: function () {
+      console.log("hhhhhhhhhhhhhhhhhhhhhh",this.all_patients)
       if (this.keywords.length == 0) {
         this.patients = this.all_patients;
       } else {
@@ -1838,7 +1840,8 @@ export default {
         for (let i = 0; i < this.all_patients.length; i++) {
           if (
               this.all_patients[i].name.indexOf(this.keywords) != -1 ||
-              this.all_patients[i].dialysis_no.indexOf(this.keywords) != -1
+              this.all_patients[i].dialysis_no.indexOf(this.keywords) != -1 ||
+              this.all_patients[i].first_letter.indexOf(this.keywords)!=-1
           ) {
             this.patients.push(this.all_patients[i]);
           }