Przeglądaj źródła

患者详情完成

seimin 2 lat temu
rodzic
commit
372dd7c227

+ 3 - 4
pages/orderDetail/orderDetail.vue

@@ -197,7 +197,7 @@
197 197
           <!-- 检查信息 -->
198 198
           <block v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']">
199 199
             <view class="inspect_item" v-for="item in orderInfo.checkList" :key="item.id"
200
-              @click="toDetail(item.id,orderInfo.taskType.associationType.value)">
200
+              @click="toDetail(item.id,'inspect')">
201 201
               <view class="inspect_item_name">
202 202
                 {{item.inspectName||'暂无'}}
203 203
               </view>
@@ -228,8 +228,7 @@
228 228
                 <uni-th align="center" width="71">科室</uni-th>
229 229
               </uni-tr>
230 230
               <!-- 表格数据行 -->
231
-              <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id"
232
-                @click.native="toDetail(data.id,orderInfo.taskType.associationType.value)">
231
+              <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id" @click.native="toDetail(data.id,'specimen')">
233 232
                 <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
234 233
                 <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
235 234
                 <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
@@ -807,7 +806,7 @@
807 806
                       border: 1px solid $defaultColor;
808 807
                       background-color: rgba(73, 184, 86, 0.1);
809 808
                     }
810
-                    
809
+
811 810
                     &.red {
812 811
                       color: #FF3B53;
813 812
                       border: 1px solid #FF3B53;

+ 52 - 299
pages/patientDetail/patientDetail.vue

@@ -8,216 +8,47 @@
8 8
       </view>
9 9
     </view>
10 10
     <!-- tab -->
11
-    <!-- 工单信息 -->
11
+    <!-- 患者信息 -->
12 12
     <view class="orderDetail_info" v-show="selectedTab === 1">
13
-      <scroll-view scroll-y class="orderDetail_infoItem" v-if="orderInfo.id">
13
+      <scroll-view scroll-y class="orderDetail_infoItem" v-if="info.id">
14 14
         <view class="orderDetail_infoItem_header">
15 15
           <view class="orderDetail_infoItem_header_title">
16 16
             <view class="icon"></view>
17 17
             <view class="taskNameAndWorkerName">
18
-              <text class="taskName"
19
-                v-if="orderInfo.taskType">{{orderInfo.isHalfInspect === 1? "半程陪检": orderInfo.taskType.taskName}}</text>
18
+              <text class="taskName">患者姓名:{{info.patientName||'暂无'}}</text>
20 19
             </view>
21 20
           </view>
22
-          <text class="orderDetail_infoItem_header_more">{{orderInfo.gdcode}}</text>
21
+          <text class="orderDetail_infoItem_header_more">床号:{{info.bedNum?info.bedNum + '床':'暂无'}}</text>
23 22
         </view>
24 23
         <view class="orderDetail_infoItem_item">
25 24
           <view class="orderDetail_infoItem_item_content">
26
-            <text class="orderDetail_infoItem_item_name">状态</text>
27
-            <text class="orderDetail_infoItem_item_value" v-if="orderInfo.gdState">{{orderInfo.gdState.name}}</text>
25
+            <text class="orderDetail_infoItem_item_name">住院号</text>
26
+            <text class="orderDetail_infoItem_item_value">{{info.residenceNo || '暂无'}}</text>
28 27
           </view>
29 28
           <view class="orderDetail_infoItem_item_content">
30
-            <text class="orderDetail_infoItem_item_name">工单日期</text>
31
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.startTime || '暂无'}}</text>
29
+            <text class="orderDetail_infoItem_item_name">护理级别</text>
30
+            <text class="orderDetail_infoItem_item_value">{{info.careLevel ?info.careLevel.name: '暂无'}}</text>
32 31
           </view>
33 32
           <view class="orderDetail_infoItem_item_content">
34
-            <text class="orderDetail_infoItem_item_name">总耗时</text>
35
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.showTimeNum || '暂无'}}</text>
36
-          </view>
37
-          <view class="orderDetail_infoItem_item_content">
38
-            <text class="orderDetail_infoItem_item_name">申请科室</text>
39
-            <text
40
-              class="orderDetail_infoItem_item_value">{{orderInfo.createDeptDTO?(deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'暂无'}}</text>
41
-          </view>
42
-          <view class="orderDetail_infoItem_item_content">
43
-            <text class="orderDetail_infoItem_item_name">起点科室</text>
44
-            <text
45
-              class="orderDetail_infoItem_item_value">{{orderInfo.startDept?(deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'暂无'}}</text>
46
-          </view>
47
-          <view class="orderDetail_infoItem_item_content"
48
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
49
-            <text class="orderDetail_infoItem_item_name">中间科室</text>
50
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.middleDept || '暂无'}}</text>
51
-          </view>
52
-          <view class="orderDetail_infoItem_item_content">
53
-            <text class="orderDetail_infoItem_item_name">目标科室</text>
54
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.endDepts}}</text>
55
-          </view>
56
-          <view class="orderDetail_infoItem_item_content">
57
-            <text class="orderDetail_infoItem_item_name">支助人员</text>
58
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.worker?orderInfo.worker.name:'暂无'}}</text>
59
-          </view>
60
-          <view class="orderDetail_infoItem_item_content">
61
-            <text class="orderDetail_infoItem_item_name">联系电话</text>
62
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.worker?orderInfo.worker.phone:'暂无'}}</text>
63
-          </view>
64
-          <view class="orderDetail_infoItem_item_content"
65
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
66
-            <text class="orderDetail_infoItem_item_name">陪同情况</text>
67
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</text>
68
-          </view>
69
-          <view class="orderDetail_infoItem_item_content"
70
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
71
-            <text class="orderDetail_infoItem_item_name">预约时间</text>
72
-            <text class="orderDetail_infoItem_item_value"
73
-              v-if="orderInfo.yyjdTime">{{orderInfo.yyjdTime|formatDate('MM-dd HH:mm')}}</text>
74
-            <text class="orderDetail_infoItem_item_value" v-else>暂无</text>
75
-          </view>
76
-          <view class="orderDetail_infoItem_item_content"
77
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']">
78
-            <text class="orderDetail_infoItem_item_name">是否半程陪检</text>
79
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.isHalfInspect===1?'是':'否'}}</text>
80
-          </view>
81
-          <view class="orderDetail_infoItem_item_content"
82
-            v-if="orderInfo.drugs && orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['药品配送业务']">
83
-            <text class="orderDetail_infoItem_item_name">药包编码</text>
84
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.drugs.packid || '暂无'}}</text>
85
-          </view>
86
-          <view class="orderDetail_infoItem_item_content"
87
-            v-if="orderInfo.staticDistri && orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['静配配送']">
88
-            <text class="orderDetail_infoItem_item_name">药包编码</text>
89
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.staticDistri.packid || '暂无'}}</text>
90
-          </view>
91
-          <view class="orderDetail_infoItem_item_content"
92
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']">
93
-            <text class="orderDetail_infoItem_item_name">预计接收</text>
94
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.expectReceiveNum||'暂无'}}</text>
95
-          </view>
96
-          <view class="orderDetail_infoItem_item_content"
97
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']">
98
-            <text class="orderDetail_infoItem_item_name">实际接收</text>
99
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.actualReceiveNum||'暂无'}}</text>
100
-          </view>
101
-          <view class="orderDetail_infoItem_item_content">
102
-            <text class="orderDetail_infoItem_item_name">是否加急</text>
103
-            <text class="orderDetail_infoItem_item_value" v-if="orderInfo.emergencyType">
104
-              {{(orderInfo.emergencyType.value == 2 || orderInfo.emergencyType.value == 3)?'是':'否'}}
105
-            </text>
106
-          </view>
107
-          <view class="orderDetail_infoItem_item_content"
108
-            v-if="orderInfo.workOrderRemark && (orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['其他临床服务'])">
109
-            <text class="orderDetail_infoItem_item_name">备注信息</text>
110
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.workOrderRemark||'暂无'}}</text>
111
-          </view>
112
-          <view class="orderDetail_infoItem_item_content" v-if="orderInfo.specialCloseReason">
113
-            <text class="orderDetail_infoItem_item_name">特殊情况关闭原因</text>
114
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.specialCloseReason||'暂无'}}</text>
33
+            <text class="orderDetail_infoItem_item_name">病情级别</text>
34
+            <text class="orderDetail_infoItem_item_value">{{info.illnessState ?info.illnessState.name: '暂无'}}</text>
115 35
           </view>
116 36
         </view>
117 37
       </scroll-view>
118 38
     </view>
119
-    <!-- 流程信息 -->
120
-    <view class="orderDetail_info" v-show="selectedTab === 2">
121
-      <scroll-view scroll-y class="orderDetail_infoItem" v-if="logList.length">
122
-        <view class="orderDetail_infoItem_header">
123
-          <view class="orderDetail_infoItem_header_title">
124
-            <view class="icon"></view>
125
-            <view class="taskNameAndWorkerName">
126
-              <text class="taskName">流程信息</text>
127
-            </view>
128
-          </view>
129
-        </view>
130
-        <view class="orderDetail_infoItem_item process">
131
-          <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
132
-            <view class="step_infoStart">
133
-              <view class="step_name">{{step.operationName}}</view>
134
-              <view class="step_time" v-if="step.record && step.record[0]">
135
-                {{step.record[0].operationTime|formatDate('MM-dd HH:mm')}}
136
-              </view>
137
-            </view>
138
-            <view class="step_icon pda pda-icon_liucheng"
139
-              :class="{'active':(step.record&&step.record[0]&&step.record[0].operationTime)}"></view>
140
-            <view class="step_infoEnd">
141
-              <view class="step_overtime" v-if="i!=0&&step.record&&step.record.length">
142
-                耗时{{filterTime(step.record)}}
143
-              </view>
144
-              <view class="step_dept" v-if="step.record&&step.record[0]&&step.record[0].dept">
145
-                <text v-for="(dept,index) in step.record"
146
-                  :key="index">{{dept?(deptDisplay == 2?dept.deptalias:dept.dept)+',':''}}</text>
147
-              </view>
148
-            </view>
149
-          </view>
150
-        </view>
151
-      </scroll-view>
152
-    </view>
153
-    <!-- 业务信息 -->
154
-    <view class="orderDetail_info" v-show="selectedTab === 3">
39
+    <!-- 患者标本 -->
40
+    <view class="orderDetail_info" v-show="selectedTab ===2">
155 41
       <scroll-view scroll-y class="orderDetail_infoItem">
156 42
         <view class="orderDetail_infoItem_header">
157 43
           <view class="orderDetail_infoItem_header_title">
158 44
             <view class="icon"></view>
159 45
             <view class="taskNameAndWorkerName">
160
-              <text class="taskName">业务信息</text>
161
-            </view>
162
-          </view>
163
-        </view>
164
-        <!-- 检查信息 -->
165
-        <view class="orderDetail_infoItem_item business business_inspect"
166
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者其他服务业务'])">
167
-          <!-- 患者信息 -->
168
-          <view class="inspect_info" v-if="orderInfo.patient">
169
-            <view class="inspect_info_block">
170
-              <view class="inspect_info_left">
171
-                <block v-if="orderInfo.patient.illnessState">
172
-                  <view class="inspect_info_icon red" v-if="orderInfo.patient.illnessState.value === '2'">危</view>
173
-                  <view class="inspect_info_icon red" v-else-if="orderInfo.patient.illnessState.value === '3'">重</view>
174
-                </block>
175
-                <block v-if="orderInfo.patient.careLevel">
176
-                  <view class="inspect_info_icon red" v-if="orderInfo.patient.careLevel.value === '0'">特</view>
177
-                  <view class="inspect_info_icon red" v-else-if="orderInfo.patient.careLevel.value === '1'">1</view>
178
-                  <view class="inspect_info_icon green" v-else-if="orderInfo.patient.careLevel.value === '2'">2</view>
179
-                  <view class="inspect_info_icon green" v-else-if="orderInfo.patient.careLevel.value === '3'">3</view>
180
-                </block>
181
-                <view class="inspect_info_name">{{orderInfo.patient.patientName}}</view>
182
-              </view>
183
-              <view class="inspect_info_right">
184
-                {{orderInfo.patient.bedNum}}床
185
-              </view>
186
-            </view>
187
-            <view class="inspect_info_block">
188
-              <view class="inspect_info_left">
189
-                {{orderInfo.patient.patientCode}}
190
-              </view>
191
-              <view class="inspect_info_right"
192
-                v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']">
193
-                待检{{orderInfo.checkList.length}}
194
-              </view>
46
+              <text class="taskName">标本信息</text>
195 47
             </view>
196 48
           </view>
197
-          <!-- 检查信息 -->
198
-          <block v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']">
199
-            <view class="inspect_item" v-for="item in orderInfo.checkList" :key="item.id"
200
-              @click="toDetail(item.id,orderInfo.taskType.associationType.value)">
201
-              <view class="inspect_item_name">
202
-                {{item.inspectName||'暂无'}}
203
-              </view>
204
-              <view class="inspect_item_info">
205
-                <view class="inspect_item_dept">
206
-                  {{item.execDept?(deptDisplay==2?item.execDept.deptalias:item.execDept.dept):'暂无'}}
207
-                </view>
208
-                <view class="inspect_item_number">
209
-                  叫号信息 {{item.reservationNumber || '暂无'}}
210
-                </view>
211
-              </view>
212
-              <view class="inspect_item_yytime">
213
-                预约时间{{item.yyTime || '暂无'}}
214
-              </view>
215
-            </view>
216
-          </block>
217 49
         </view>
218 50
         <!-- 标本信息 -->
219
-        <view class="orderDetail_infoItem_item business business_specimen"
220
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['标本轮巡业务'])">
51
+        <view class="orderDetail_infoItem_item business business_specimen">
221 52
           <view class="inspect_specimen">
222 53
             <uni-table stripe emptyText="暂无更多数据">
223 54
               <!-- 表头行 -->
@@ -228,8 +59,7 @@
228 59
                 <uni-th align="center" width="71">科室</uni-th>
229 60
               </uni-tr>
230 61
               <!-- 表格数据行 -->
231
-              <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id"
232
-                @click.native="toDetail(data.id,orderInfo.taskType.associationType.value)">
62
+              <uni-tr v-for="data in info.specimens" :key="data.id" @click.native="toDetail(data.id,'specimen')">
233 63
                 <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
234 64
                 <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
235 65
                 <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
@@ -247,62 +77,44 @@
247 77
             </uni-table>
248 78
           </view>
249 79
         </view>
250
-        <!-- 药品信息 -->
251
-        <view class="orderDetail_infoItem_item business business_drugsBag"
252
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['静配配送'])">
253
-          <!-- 检查信息 -->
254
-          <block v-if="orderInfo.drugs&&orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务']">
255
-            <view class="drugsBag_item">
256
-              <view class="drugsBag_item_name">
257
-                发药单号
258
-              </view>
259
-              <view class="drugsBag_item_value">
260
-                {{orderInfo.drugs.packid || '暂无'}}
261
-              </view>
80
+      </scroll-view>
81
+    </view>
82
+    <!-- 患者检查 -->
83
+    <view class="orderDetail_info" v-show="selectedTab === 3">
84
+      <scroll-view scroll-y class="orderDetail_infoItem">
85
+        <view class="orderDetail_infoItem_header">
86
+          <view class="orderDetail_infoItem_header_title">
87
+            <view class="icon"></view>
88
+            <view class="taskNameAndWorkerName">
89
+              <text class="taskName">检查信息</text>
262 90
             </view>
263
-            <view class="drugsBag_item">
264
-              <view class="drugsBag_item_name">
265
-                发药科室
266
-              </view>
267
-              <view class="drugsBag_item_value">
268
-                {{orderInfo.drugs.launch?(deptDisplay == 2?orderInfo.drugs.launch.deptalias:orderInfo.drugs.launch.dept):'暂无'}}
269
-              </view>
91
+          </view>
92
+        </view>
93
+        <!-- 检查信息 -->
94
+        <view class="orderDetail_infoItem_item business business_inspect">
95
+          <view class="inspect_item" v-for="item in info.inspects" :key="item.id" @click="toDetail(item.id,'inspect')">
96
+            <view class="inspect_item_name">
97
+              {{item.inspectName||'暂无'}}
270 98
             </view>
271
-            <view class="drugsBag_item">
272
-              <view class="drugsBag_item_name">
273
-                状态
274
-              </view>
275
-              <view class="drugsBag_item_value">
276
-                {{orderInfo.drugs.drugsState?orderInfo.drugs.drugsState.name:'暂无'}}
99
+            <view class="inspect_item_info">
100
+              <view class="inspect_item_dept">预约时间</view>
101
+              <view class="inspect_item_number">
102
+                {{item.yyTime || '暂无'}}
277 103
               </view>
278 104
             </view>
279
-          </block>
280
-          <block v-if="orderInfo.staticDistri&&orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['静配配送']">
281
-            <view class="drugsBag_item">
282
-              <view class="drugsBag_item_name">
283
-                发药单号
284
-              </view>
285
-              <view class="drugsBag_item_value">
286
-                {{orderInfo.staticDistri.packid || '暂无'}}
105
+            <view class="inspect_item_info">
106
+              <view class="inspect_item_dept">到达时间</view>
107
+              <view class="inspect_item_number">
108
+                {{item.arriveTime || '暂无'}}
287 109
               </view>
288 110
             </view>
289
-            <view class="drugsBag_item">
290
-              <view class="drugsBag_item_name">
291
-                发药科室
292
-              </view>
293
-              <view class="drugsBag_item_value">
294
-                {{orderInfo.staticDistri.launch?(deptDisplay == 2?orderInfo.staticDistri.launch.deptalias:orderInfo.staticDistri.launch.dept):'暂无'}}
111
+            <view class="inspect_item_info">
112
+              <view class="inspect_item_dept">检查状态</view>
113
+              <view class="inspect_item_number">
114
+                {{item.inspectState?item.inspectState.name:'暂无'}}
295 115
               </view>
296 116
             </view>
297
-            <view class="drugsBag_item">
298
-              <view class="drugsBag_item_name">
299
-                状态
300
-              </view>
301
-              <view class="drugsBag_item_value">
302
-                {{orderInfo.staticDistri.drugsState?orderInfo.staticDistri.drugsState.name:'暂无'}}
303
-              </view>
304
-            </view>
305
-          </block>
117
+          </view>
306 118
         </view>
307 119
       </scroll-view>
308 120
     </view>
@@ -317,8 +129,6 @@
317 129
     debounce
318 130
   } from 'lodash/function';
319 131
   import {
320
-    reqFetchData,
321
-    reqFetchWorkOrderLog,
322 132
     reqGetPatientInspectInfo,
323 133
   } from "../../request/api.js";
324 134
   import {
@@ -361,7 +171,7 @@
361 171
         // 当前选中的tab
362 172
         selectedTab: 1,
363 173
         // 工单信息
364
-        orderInfo: {},
174
+        info: {},
365 175
         // 流程信息
366 176
         logList: [],
367 177
         //底部按钮
@@ -398,34 +208,6 @@
398 208
           url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
399 209
         })
400 210
       },
401
-      // 格式化时分秒
402
-      // (时间小于一分钟则显示秒,时间大于一分钟则显示分钟数,如超出一小时则显示小时和分钟。)time单位:秒
403
-      formatTime(time) {
404
-        let timeStr = "";
405
-        if (time >= 0 && time < 60) {
406
-          // 秒
407
-          timeStr = time + "秒";
408
-        } else if (time >= 60 && time < 3600) {
409
-          // 分钟
410
-          timeStr = Math.floor(time / 60) + "分钟";
411
-        } else if (time >= 3600) {
412
-          // 时 + 分
413
-          let h = "";
414
-          let m = "";
415
-          h = Math.floor(time / 3600) + "小时";
416
-          m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
417
-          timeStr = h + m;
418
-        }
419
-        return timeStr;
420
-      },
421
-      // 计算流程信息耗时
422
-      filterTime(step) {
423
-        let num = 0;
424
-        step.forEach((e) => {
425
-          num += e.difTime;
426
-        });
427
-        return this.formatTime(num / 1000);
428
-      },
429 211
       // 切换tab
430 212
       changeTab(id) {
431 213
         this.selectedTab = id;
@@ -434,7 +216,6 @@
434 216
             this.getInfo(this.queryParams);
435 217
             break;
436 218
           case 2:
437
-            this.getProcess(this.queryParams);
438 219
             break;
439 220
           case 3:
440 221
             break;
@@ -449,42 +230,14 @@
449 230
         let postData = {
450 231
           "patientCode": queryParams.patientCode
451 232
         };
452
-        reqGetPatientInspectInfo(queryParams.id).then(res => {
233
+        console.log(queryParams.patientCode)
234
+        reqGetPatientInspectInfo(postData).then(res => {
453 235
           uni.hideLoading();
454 236
           if (res.status == 200) {
455
-            // 检查科室处理
456
-            if (res.data.middleDept) {
457
-              //有检查科室的话
458
-              res.data.middleDept = res.data.middleDept.map(v => {
459
-                return this.deptDisplay == 2 ? v.deptalias : v.dept;
460
-              }).toString();
461
-            }
462
-            // 终点科室处理
463
-            res.data.endDepts = res.data.endDepts.map(v => {
464
-              return this.deptDisplay == 2 ? v.deptalias : v.dept;
465
-            }).toString();
466 237
             // 工单信息
467
-            this.orderInfo = res.data;
468
-          } else {
469
-            this.$refs.seiminModel.show({
470
-              skin: 'toast',
471
-              icon: 'error',
472
-              content: '请求失败',
473
-            })
474
-          }
475
-        })
476
-      },
477
-      //获取流程信息数据
478
-      getProcess(queryParams) {
479
-        uni.showLoading({
480
-          mask: true,
481
-          title: '加载中',
482
-        })
483
-        reqFetchWorkOrderLog(queryParams.id).then(res => {
484
-          uni.hideLoading();
485
-          if (res.status == 200) {
486
-            // 流程信息
487
-            this.logList = res.data;
238
+            res.data.specimens = res.data.specimens || [];
239
+            res.data.inspects = res.data.inspects || [];
240
+            this.info = res.data;
488 241
           } else {
489 242
             this.$refs.seiminModel.show({
490 243
               skin: 'toast',
@@ -599,7 +352,7 @@
599 352
           }
600 353
 
601 354
           .orderDetail_infoItem_header_more {
602
-            color: #333;
355
+            color: $defaultColor;
603 356
             font-weight: bold;
604 357
             font-size: 38rpx;
605 358
             @include clamp;

+ 1 - 1
pages/patientList/patientList.vue

@@ -69,7 +69,7 @@
69 69
       // 跳转患者详情
70 70
       toDetail(patientCode) {
71 71
         uni.navigateTo({
72
-          url: `/pages/patientDetail/patientDetail?id=${patientCode}`
72
+          url: `/pages/patientDetail/patientDetail?patientCode=${patientCode}`
73 73
         })
74 74
       },
75 75
       //监听输入