Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/drugSourceCode/drugQuery.vue

             <div>{{scope.row.DrugTracCodg}}</div>
           </template>
         </el-table-column>
-
+        <el-table-column align="center" prop="name" label="上传日期">
+          <template slot-scope="scope">
+            <div>{{scope.row.UpdtTime}}</div>
+          </template>
+        </el-table-column>
 
         <el-table-column align="center" prop="total" label="批次流水号">
           <template slot-scope="scope">

src/xt_pages/outpatientDoctorStation/template/printOne.vue

 <template>
   <div id="prescriptionPrint">
-    <div v-for="(item, index) in advicePrint" :key="index"  style="page-break-after: always">
-      <div
-        id="prescription-print"
-        class="prescription-print"
-       
-      >
+    <div v-for="(item, index) in advicePrint" :key="index" style="page-break-after: always">
+      <div id="prescription-print" class="prescription-print">
         <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
           {{ orgname }}第一类精神处方笺
         </div>
         <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
           {{ orgname }}第二类精神处方笺
         </div>
-        <div
-          class="printTitle"
-          v-if="
-            prescriptions[index].med_type != '1111' &&
-            prescriptions[index].med_type != '1112'
-          "
-        >
+        <div class="printTitle" v-if="
+          prescriptions[index].med_type != '1111' &&
+          prescriptions[index].med_type != '1112'
+        ">
           {{ orgname }}处方笺
         </div>
-        <div >
+        <div>
           <div class="infoTitle">
             <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
             <p>
               科室：{{ item.info ? getDepart(item.info.departments) : "" }}
             </div>
             <div style="margin-bottom: 10px" v-if="org_id == 10537">
-              身份证号：{{newHisPatient.id_card_no | testfile}}
+              身份证号：{{ newHisPatient.id_card_no | testfile }}
             </div>
             <div style="margin-bottom: 10px" v-else>
               医保卡号：
             </div>
           </div>
         </div>
-        <div class="prescriptionBox" :style="{'min-height':org_id != 10724? '350px':'450px'}">
+        <div class="prescriptionBox" :style="{ 'min-height': org_id != 10724 ? '350px' : '450px' }">
           <div class="Rp">Rp:</div>
-          <div class="drugsBox" 
-            v-for="(it, index1) in item.advices"
-            :key="index1"
-            :style="{'page-break-after':index1==yi&&item.advices.length>7? 'always':'auto','position': 'relative'}"
-          >
-            <template v-if="index1==yi+1&&item.advices.length>7">
+          <div class="drugsBox" v-for="(it, index1) in item.advices" :key="index1"
+            :style="{ 'page-break-after': index1 == yi && item.advices.length > 7 ? 'always' : 'auto', 'position': 'relative' }">
+            <template v-if="index1 == yi + 1 && item.advices.length > 7">
 
               <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
                 {{ orgname }}第一类精神处方笺
               <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
                 {{ orgname }}第二类精神处方笺
               </div>
-              <div
-                class="printTitle"
-                v-if="
-                  prescriptions[index].med_type != '1111' &&
-                  prescriptions[index].med_type != '1112'
-                "
-              >
+              <div class="printTitle" v-if="
+                prescriptions[index].med_type != '1111' &&
+                prescriptions[index].med_type != '1112'
+              ">
                 {{ orgname }}处方笺
               </div>
               <div style="margin-bottom: 10px;">
                     科室：{{ item.info ? getDepart(item.info.departments) : "" }}
                   </div>
                   <div style="margin-bottom: 10px" v-if="org_id == 10537">
-                    身份证号：{{newHisPatient.id_card_no | testfile}}
+                    身份证号：{{ newHisPatient.id_card_no | testfile }}
                   </div>
                   <div style="margin-bottom: 10px" v-else>
                     医保卡号：
               </div>
             </template>
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index1 + 1 + "." }}</span
-              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
-              v-if="it.drug.min_unit != it.drug.dose_unit"
-              >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
-              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+              <span style="font-weight: bold">{{ index1 + 1 + "." }}</span>{{ it.advice_name ? it.advice_name : ""
+              }}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{ it.drug.dose }}{{ it.drug.dose_unit
+                }}&nbsp;*
+                &nbsp;</span>{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
                   it.drug.max_unit
                 }}&nbsp;×&nbsp; {{ it.prescribing_number
-                }}{{ it.prescribing_number_unit }}
+              }}{{ it.prescribing_number_unit }}
               <!-- <div style="display: inline-block;margin-left: 30px;" v-if="org_id ==10210 || org_id ==0">
                 <span>{{ it.price}}</span>
               </div> -->
             </div>
             <div style="margin-left: 100px">
-                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-                >&nbsp;&nbsp;<span
-              >{{ it.execution_frequency }}&nbsp;{{
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.execution_frequency
+                }}&nbsp;{{
                   it.delivery_way
-                }}&nbsp;</span
-              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+                }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
             <!-- 单价 -->
             <div style="display: inline-block;position: relative; top:-38px;left: 80%;"
-              v-if="org_id ==10210 || org_id ==0">
-                <span>{{ it.price}}</span>
+              v-if="org_id == 10210">
+              <span>{{ it.price }}</span>
             </div>
-            <template v-if="index1==yi&&item.advices.length>7">
+            <template v-if="index1 == yi && item.advices.length > 7">
               <div class="doctorBox">
                 <p v-if="org_id == 10217">
                   医师：
-                  <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=""
-                    v-else
-                  />
+                  <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="" v-else />
                 </p>
                 <p v-if="org_id == 10510 || org_id == 10265">
                   医师：
-                  <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=""
-                    v-else
-                  />
+                  <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="" v-else />
                 </p>
-                <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265">
+                <p v-if="org_id != 10217 && org_id != 10510 && org_id != 10265">
                   医师： {{ item.doctor ? item.doctor : "" }}
                 </p>
                 <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
             </template>
           </div>
 
-          <div
-            class="drugsBox"
-            v-for="(it, i) in item.additionalcharge"
-            :key="i"
-          >
+          <div class="drugsBox" v-for="(it, i) in item.additionalcharge" :key="i">
             <div class="drugsOne">
               {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
                 it.count
             </div>
           </div>
 
-          <div
-            class="drugsBox"
-            v-for="(it, index) in item.project"
-            :key="index"
-          >
+          <div class="drugsBox" v-for="(it, index) in item.project" :key="index">
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
-              >{{
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span>{{
                 it.type == 2
                   ? getProjectName(it.project_id)
                     ? getProjectName(it.project_id)
               }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
             </div>
             <div style="margin-left: 100px">
-              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
-            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span>&nbsp;&nbsp;<span>{{ it.delivery_way
+                }}</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
           </div>
 
-          <div
-            class="drugsBox"
-            v-for="(it, i) in item.additionalcharge"
-            :key="i"
-          >
+          <div class="drugsBox" v-for="(it, i) in item.additionalcharge" :key="i">
             <div class="drugsOne">
               {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
                 it.price.toFixed(2)
         <div class="doctorBox">
           <p v-if="org_id == 10217">
             医师：
-            <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=""
-              v-else
-            />
+            <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="" v-else />
           </p>
-          <p v-if="org_id == 10510  || org_id == 10265 || org_id ==0">
+          <p v-if="org_id == 10510 || org_id == 10265">
             医师：
-            <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=""
-              v-else
-            /> &nbsp;&nbsp;
-            <span v-if="org_id == 10265 || 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="" v-else />
+            &nbsp;&nbsp;
+            <span v-if="org_id == 10265 || org_id == 0">
               {{ item.doctor ? item.doctor : "" }}
             </span>
-            
+
           </p>
-          <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265 && org_id !=0">
+          <p v-if="org_id != 10217 && org_id != 10510 && org_id != 10265 && org_id != 0">
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
-          <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+          <p v-if="org_id !=10751">日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+          <p v-if="org_id ==10751 || org_id == 0">日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}</p>
         </div>
         <div class="actionBar">
           <p>审核：</p>
   getHisPatientDetail,
 } from "@/api/project/project";
 import { getInitData } from "@/api/his/his";
-export default{
+export default {
   props: {
     patient_id: Number,
     record_date: String,
   },
   data() {
     return {
-      doc_name:"",
+      doc_name: "",
       doctorList: [],
       advicePrint: {},
-      yi:4,
-      arr:[],
-      arrs:{},
-      advicess:[],
-      page:sessionStorage.getItem('dayin'),
+      yi: 4,
+      arr: [],
+      arrs: {},
+      advicess: [],
+      page: sessionStorage.getItem('dayin'),
       patient: {},
       tableData: [],
       prescriptionInfo: [],
       operators: [],
       doctorList_1: [],
     };
-  },filters: {
-    testfile (value) {
+  }, filters: {
+    testfile(value) {
       const start = value.slice(0, 6)
       const end = value.slice(-4)
       return `${start}******${end}`
   },
   methods: {
     // 电子签名
-    setAdminUserES(id,name) {
+    setAdminUserES(id, name) {
       console.log(id)
       console.log(name)
       console.log(this.operatorMaps)
       }
     },
     getAge(patient) {
-      if(patient.id_card_no == "TWN001836483"){
+      if (patient.id_card_no == "TWN001836483") {
         return patient.age
-      }else{
+      } else {
         var thisLen = patient.id_card_no.length;
         var birth = "";
         if (thisLen == 15) {
       }
       return name;
     },
-    merge(arrA){
-      var len=arrA.lenfth
+    merge(arrA) {
+      var len = arrA.lenfth
       // for(let j=0;j<this.advicess.length;j++){
       //   for(let x=j+1;x<this.advicess.length;x++){
       //     if(this.advicess[j].groupno == this.advicess[x].groupno){
       //     }
       //   }
       // }
-      for(let j=0;j<len;j++){
-        for(let x=j+1;x<len;x++){
-          if(arrA[j].groupno == arrA[x].groupno){
-            this.arr.push(arrA.splice(x,1))
+      for (let j = 0; j < len; j++) {
+        for (let x = j + 1; x < len; x++) {
+          if (arrA[j].groupno == arrA[x].groupno) {
+            this.arr.push(arrA.splice(x, 1))
           }
         }
       }
-      console.log('777777777',this.arr);
+      console.log('777777777', this.arr);
       return this.arr
     }
   },
 <style lang="scss" scoped>
 .prescription-print {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-  0 0 60px rgba(0, 0, 0, 0.06) inset;
+    0 0 60px rgba(0, 0, 0, 0.06) inset;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-  0 0 40px rgba(0, 0, 0, 0.06) inset;
+    0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   margin-bottom: 20px;
   padding: 20px 10px;
 }
+
 .printTitle {
   font-size: 22px;
   text-align: center;
   font-weight: bold;
 }
+
 .infoTitle {
   display: flex;
   border-bottom: 2px solid #000;
   line-height: 24px;
   padding: 0 10px;
 }
+
 .infoTitle p {
   width: 200px;
 }
+
 .infoMain {
   display: flex;
   flex-wrap: wrap;
   border-bottom: 2px solid #000;
   padding: 0 10px;
 }
+
 .infoMain div {
   width: 50%;
   line-height: 24px;
 }
+
 .prescriptionBox {
   padding: 0 10px;
   min-height: 450px;
 }
+
 .Rp {
   font-size: 22px;
   font-weight: bold;
 }
+
 .drugsBox {
   padding-left: 40px;
   margin-bottom: 10px;
   position: relative;
 }
+
 .drugsBox div {
   line-height: 20px;
 }
+
 .drugsOne {
   line-height: 24px;
   display: inline-block;
 }
+
 .drugsOne span {
   margin-right: 20px;
 }
+
 .doctorBox {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
   border-bottom: 2px solid #000;
 }
-.doctorBoxs{
+
+.doctorBoxs {
   width: 100%;
   margin-right: 30px;
   text-align: right;
   line-height: 24px;
 
 }
+
 .doctorBoxtwo {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
 
 }
+
 .actionBar {
   display: flex;
   justify-content: space-between;
   line-height: 24px;
   padding: 0 10px;
 }
+
 .actionBar p {
   width: 150px;
 }

src/xt_pages/outpatientTool/labelPrint.vue

                         textPosition:"top",//设置文本的垂直位置
                         textMargin:5,//设置条形码和文本之间的间距
                         fontSize:15,//设置文本的大小
-                        margin:15//设置条形码周围的空白边距
+                        margin:0,//设置条形码周围的空白边距
+                        marginTop:0
                       })
 
                     });

src/xt_pages/user/inspection.vue

             this.queryParams.project_id = this.project.project_id
             this.queryParams.page = 1
             this.total = 0
+            console.log('bbbbbvvvv',this.queryParams);
+            
             this.fetchPatientInspections(this.queryParams)
           } else {
             this.$message.error(response.data.msg)
             }else{
               this.is_open = false
             }
-
-
             if(remind.id > 0 && remind.remind_cycle > 0){
               this.temp_remind_cycle = remind.remind_cycle
             }else{
             console.log("inspectionsMap",this.inspectionsMap)
             var items = this.project.inspection_reference
             console.log("时间",items)
-            for (var index in items) {
-             console.log("obj",items[index])
+            for(let index in items){
+              console.log("obj",items)
               // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
               var item = {}
-              for (var key in items[index]) {
+              for (let key in items[index]) {
                 //  console.log("key",key,items[index][key])
                 // console.log("item[key]",items[index])
                 item[key] = items[index][key]
               }
-
-              console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
+              console.log("item=-----------------12",item,inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
               if (item.item_id > 0) {
-
-                if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
+                if(inspectionsMap[parseInt(items[index].item_id)] == null){
+                  console.log('执行1',item.project_name,inspectionsMap[items[index].id]);
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
-                    item.value = inspectionsMap[items[index].id].inspect_value
-                    item.item_name = inspectionsMap[items[index].id].item_name
+                    if(inspectionsMap[items[index].id] !=null){
+                      item.value = inspectionsMap[items[index].id].inspect_value
+                      item.item_name = inspectionsMap[items[index].id].item_name
+                    }
                   }else{
-                    console.log('执行1');
-
-                    if(this.org_id == 10702){
+                    if((this.org_id == 10702 || this.org_id==0) && inspectionsMap[items[index].id] !=null){
                       if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
                           item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
                           item.project_name == '传染病检查'
                         item.item_name = ''
                       }
                     } else{
-                      console.log('执行2');
+                      console.log('执行2',inspectionsMap[items[index].id]);
+                      // item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                      // item.item_name = inspectionsMap[items[index].id].item_name
                       item.value = ''
                       item.item_name = ''
                     }
                   }
                 } else {
-                  console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
-                  item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
-                  item.item_name = inspectionsMap[items[index].item_id].item_name
+                  if(inspectionsMap[parseInt(items[index].item_id)] != null){
+                    console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
+                    item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                    item.item_name = inspectionsMap[items[index].item_id].item_name
+                  }
                 }
                 if(this.org_id ==10191){
-                  if(item.project_name == "乙肝定性（五项)"){
+                  if(item.project_name == "乙肝定性（五项)" && inspectionsMap[items[index].id] !=null){
                     console.log("金阿迪发到付阿打发")
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }
                 }
+                // if ((inspectionsMap[parseInt(items[index].item_id)])  == null) {
+                //   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
+                //     item.value = inspectionsMap[items[index].id].inspect_value
+                //     item.item_name = inspectionsMap[items[index].id].item_name
+                //   }else{
+                //     console.log('执行1',item.project_name,inspectionsMap[items[index].id]);
+
+                //     if(this.org_id == 10702 || this.org_id==0){
+                //       if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
+                //           item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
+                //           item.project_name == '传染病检查'
+                //         ){
+
+                //         item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                //         item.item_name = inspectionsMap[items[index].id].item_name
+                //       }else{
+                //         item.value = ''
+                //         item.item_name = ''
+                //       }
+                //     } else{
+                //       console.log('执行2');
+                //       item.value = ''
+                //       item.item_name = ''
+                //     }
+                //   }
+                // } else {
+                //   console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
+                //   item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                //   item.item_name = inspectionsMap[items[index].item_id].item_name
+                // }
+                // if(this.org_id ==10191){
+                //   if(item.project_name == "乙肝定性（五项)"){
+                //     console.log("金阿迪发到付阿打发")
+                //     item.value = inspectionsMap[items[index].id].inspect_value
+                //     item.item_name = inspectionsMap[items[index].id].item_name
+                //   }
+                // }
               } else {
-                if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
+                if(typeof(inspectionsMap[parseInt(items[index].id)])  == null){
                   continue
+                }else{
+                  console.log('执行4',inspectionsMap);
+                  item.value = inspectionsMap[items[index].id].inspect_value
+                  item.item_name = inspectionsMap[items[index].id].item_name
                 }
-                console.log('执行4',inspectionsMap);
-                item.value = inspectionsMap[items[index].id].inspect_value
-                item.item_name = inspectionsMap[items[index].id].item_name
               }
-              // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
-              // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
               item.value_direction = ''
               if (item.range_type == 1) {
                 console.log('执行5',item.value);
                   item.value_direction = '↑'
                 }
               }
-              // if(this.org_id!=10503 && this.org_id!=0){
-              //   if(item.project_name!="" && item.item_name !=''){
-              //    this.items.push(item)
-              //   }
-              // }else{
-                this.items.push(item)
-              // }
-
+              
+              this.items.push(item)
               console.log('fffff',this.items);
               if(item.value.indexOf("http") !=-1){
-
                 this.isPic = true
               }
-
+              if(this.isPic == true){
+                for(let x in this.items){
+                  if(this.items[x].value ==''){
+                    this.items.splice(x,1)
+                  }
+                }
+              }
               console.log("woowwoow",this.isPic)
               console.log("isPicwowowow",this.items)
             }
+            // for (var index in items) {
+            //  console.log("obj",items[index].id)
+            //   // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
+            //   var item = {}
+            //   for (var key in items[index]) {
+            //     //  console.log("key",key,items[index][key])
+            //     // console.log("item[key]",items[index])
+            //     item[key] = items[index][key]
+            //   }
+
+            //   console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
+            //   if (item.item_id > 0) {
+            //     if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
+            //       if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
+            //         item.value = inspectionsMap[items[index].id].inspect_value
+            //         item.item_name = inspectionsMap[items[index].id].item_name
+            //       }else{
+            //         console.log('执行1',item.project_name,inspectionsMap[items[index].id]);
+
+            //         if(this.org_id == 10702 || this.org_id==0){
+            //           if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
+            //               item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
+            //               item.project_name == '传染病检查'
+            //             ){
+
+            //             item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+            //             item.item_name = inspectionsMap[items[index].id].item_name
+            //           }else{
+            //             item.value = ''
+            //             item.item_name = ''
+            //           }
+            //         } else{
+            //           console.log('执行2');
+            //           item.value = ''
+            //           item.item_name = ''
+            //         }
+            //       }
+            //     } else {
+            //       console.log('执行3',inspectionsMap[items[index].item_id].inspect_value);
+            //       item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+            //       item.item_name = inspectionsMap[items[index].item_id].item_name
+            //     }
+            //     if(this.org_id ==10191){
+            //       if(item.project_name == "乙肝定性（五项)"){
+            //         console.log("金阿迪发到付阿打发")
+            //         item.value = inspectionsMap[items[index].id].inspect_value
+            //         item.item_name = inspectionsMap[items[index].id].item_name
+            //       }
+            //     }
+            //   } else {
+            //     if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
+            //       continue
+            //     }
+            //     console.log('执行4',inspectionsMap);
+            //     item.value = inspectionsMap[items[index].id].inspect_value
+            //     item.item_name = inspectionsMap[items[index].id].item_name
+            //   }
+            //   // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
+            //   // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
+            //   item.value_direction = ''
+            //   if (item.range_type == 1) {
+            //     console.log('执行5',item.value);
+            //     var value = parseFloat(item.value)
+            //     var range_min = parseFloat(item.range_min)
+            //     var range_max = parseFloat(item.range_max)
+            //     if (value < range_min) {
+            //       item.value_direction = '↓'
+            //     } else if (value > range_max) {
+            //       item.value_direction = '↑'
+            //     }
+            //   }
+            //   this.items.push(item)
+            //   console.log('fffff',this.items);
+            //   if(item.value.indexOf("http") !=-1){
+            //     this.isPic = true
+            //   }
+            //   console.log("woowwoow",this.isPic)
+            //   console.log("isPicwowowow",this.items)
+            // }
           }
         })
         .catch(v => {