seimin 2 weeks ago
parent
commit
74c6466c82

+ 1 - 1
pages/newDrug/checkPage/checkPage.vue

@@ -18,7 +18,7 @@
18 18
         <view class="column" v-for="item in drugsBagList" :key="item.id" @click="toDetail(item.id)">
19 19
           <view class="value1">
20 20
             <view class="">{{item.packid}}</view>
21
-            <view class="">{{item.creatTime}}</view>
21
+            <view class="">{{item.launch ? item.launch.dept : ''}}</view>
22 22
           </view>
23 23
           <view class="value2" v-if="config.showDrugsBagTypeCount == 1">{{item.drugsTypeCount}}</view>
24 24
           <view class="value3" v-if="config.showDrugsBagTypeCount == 1">{{item.drugsCount}}</view>

+ 1 - 1
pages/patientInformationInfo/patientInformationInfo.vue

@@ -39,7 +39,7 @@
39 39
           <view class="page_item_info" :class="{mt0: i === 0}" v-for="(item, i) in inspects" :key="item.id">
40 40
             <label class="page_item_info_title" style="display: inline-block;width: 100%;">
41 41
               <checkbox color="#49B856" :value="item.id + ''" :checked="item.checked" />
42
-              检查项目:<text class="bold">{{ item.inspectName }}</text></label>
42
+              检查项目:<text class="bold">{{ item.inspectName }}-{{item.inspectCode}}</text></label>
43 43
             <view class="page_item_info_title"><text :class="{red: !item.execDept}">检查科室:</text><text>{{ item.execDept ? item.execDept.dept : "" }}<text class="newicon newicon-weibiaoti2010104 fz28" @click="changeExecDept(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></text></view>
44 44
             <view class="page_item_info_title btn row">
45 45
               <view><text :class="{red: !item.yyTime}">预约时间:</text><text>{{ item.yyTime | filterSecondDate }}</text><text v-if="item.reservationNumber">({{ item.reservationNumber }})</text><text class="newicon newicon-weibiaoti2010104" @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></view>

+ 4 - 2
pages/scanning_djInfo/scanning_djInfo.vue

@@ -54,7 +54,8 @@
54 54
         <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.data.checkDept ? infoDATA.data.checkDept.dept : "" }}</text>
55 55
       </view>
56 56
       <view>患者姓名 : {{ infoDATA.data.patientName}}({{infoDATA.data.bedNum}})</view>
57
-      <view>住院号 : {{ infoDATA.data.residenceNo || '-' }}</view>
57
+      <view v-if="infoDATA.data.residenceNo">住院号 : {{ infoDATA.data.residenceNo }}</view>
58
+      <view v-else-if="infoDATA.data.patientNo">门诊号 : {{ infoDATA.data.patientNo }}</view>
58 59
     </view>
59 60
     <view class="Scanning_cont" v-if="
60 61
         (res.status == 11111 && type == 'specimenPlan') ||
@@ -69,7 +70,8 @@
69 70
         <text :class="{ red: isEndDeptRedShow }">{{ infoDATA.data.checkDept ? infoDATA.data.checkDept.dept : "" }}</text>
70 71
       </view>
71 72
       <view>患者姓名 : {{ infoDATA.data.patientName}}({{infoDATA.data.bedNum}})</view>
72
-      <view>住院号 : {{ infoDATA.data.residenceNo || '-' }}</view>
73
+      <view v-if="infoDATA.data.residenceNo">住院号 : {{ infoDATA.data.residenceNo }}</view>
74
+      <view v-else-if="infoDATA.data.patientNo">门诊号 : {{ infoDATA.data.patientNo }}</view>
73 75
     </view>
74 76
     <view class="Scanning_cont" v-if="
75 77
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'