患者详情完成

pages/orderDetail/orderDetail.vue

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

pages/patientDetail/patientDetail.vue

@@ -8,216 +8,47 @@
       </view>
     </view>
     <!-- tab -->
-    <!-- 工单信息 -->
+    <!-- 患者信息 -->
     <view class="orderDetail_info" v-show="selectedTab === 1">
-      <scroll-view scroll-y class="orderDetail_infoItem" v-if="orderInfo.id">
+      <scroll-view scroll-y class="orderDetail_infoItem" v-if="info.id">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
             <view class="icon"></view>
             <view class="taskNameAndWorkerName">
-              <text class="taskName"
-                v-if="orderInfo.taskType">{{orderInfo.isHalfInspect === 1? "半程陪检": orderInfo.taskType.taskName}}</text>
+              <text class="taskName">患者姓名:{{info.patientName||'暂无'}}</text>
             </view>
           </view>
-          <text class="orderDetail_infoItem_header_more">{{orderInfo.gdcode}}</text>
+          <text class="orderDetail_infoItem_header_more">床号:{{info.bedNum?info.bedNum + '床':'暂无'}}</text>
         </view>
         <view class="orderDetail_infoItem_item">
           <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">状态</text>
-            <text class="orderDetail_infoItem_item_value" v-if="orderInfo.gdState">{{orderInfo.gdState.name}}</text>
+            <text class="orderDetail_infoItem_item_name">住院号</text>
+            <text class="orderDetail_infoItem_item_value">{{info.residenceNo || '暂无'}}</text>
           </view>
           <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">工单日期</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.startTime || '暂无'}}</text>
+            <text class="orderDetail_infoItem_item_name">护理级别</text>
+            <text class="orderDetail_infoItem_item_value">{{info.careLevel ?info.careLevel.name: '暂无'}}</text>
           </view>
           <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">总耗时</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.showTimeNum || '暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">申请科室</text>
-            <text
-              class="orderDetail_infoItem_item_value">{{orderInfo.createDeptDTO?(deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">起点科室</text>
-            <text
-              class="orderDetail_infoItem_item_value">{{orderInfo.startDept?(deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
-            <text class="orderDetail_infoItem_item_name">中间科室</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.middleDept || '暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">目标科室</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.endDepts}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">支助人员</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.worker?orderInfo.worker.name:'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">联系电话</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.worker?orderInfo.worker.phone:'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
-            <text class="orderDetail_infoItem_item_name">陪同情况</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
-            <text class="orderDetail_infoItem_item_name">预约时间</text>
-            <text class="orderDetail_infoItem_item_value"
-              v-if="orderInfo.yyjdTime">{{orderInfo.yyjdTime|formatDate('MM-dd HH:mm')}}</text>
-            <text class="orderDetail_infoItem_item_value" v-else>暂无</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']">
-            <text class="orderDetail_infoItem_item_name">是否半程陪检</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.isHalfInspect===1?'是':'否'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.drugs && orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['药品配送业务']">
-            <text class="orderDetail_infoItem_item_name">药包编码</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.drugs.packid || '暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.staticDistri && orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['静配配送']">
-            <text class="orderDetail_infoItem_item_name">药包编码</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.staticDistri.packid || '暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']">
-            <text class="orderDetail_infoItem_item_name">预计接收</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.expectReceiveNum||'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']">
-            <text class="orderDetail_infoItem_item_name">实际接收</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.actualReceiveNum||'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content">
-            <text class="orderDetail_infoItem_item_name">是否加急</text>
-            <text class="orderDetail_infoItem_item_value" v-if="orderInfo.emergencyType">
-              {{(orderInfo.emergencyType.value == 2 || orderInfo.emergencyType.value == 3)?'是':'否'}}
-            </text>
-          </view>
-          <view class="orderDetail_infoItem_item_content"
-            v-if="orderInfo.workOrderRemark && (orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['临时标本业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['标本轮巡业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['其他临床服务'])">
-            <text class="orderDetail_infoItem_item_name">备注信息</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.workOrderRemark||'暂无'}}</text>
-          </view>
-          <view class="orderDetail_infoItem_item_content" v-if="orderInfo.specialCloseReason">
-            <text class="orderDetail_infoItem_item_name">特殊情况关闭原因</text>
-            <text class="orderDetail_infoItem_item_value">{{orderInfo.specialCloseReason||'暂无'}}</text>
+            <text class="orderDetail_infoItem_item_name">病情级别</text>
+            <text class="orderDetail_infoItem_item_value">{{info.illnessState ?info.illnessState.name: '暂无'}}</text>
           </view>
         </view>
       </scroll-view>
     </view>
-    <!-- 流程信息 -->
-    <view class="orderDetail_info" v-show="selectedTab === 2">
-      <scroll-view scroll-y class="orderDetail_infoItem" v-if="logList.length">
-        <view class="orderDetail_infoItem_header">
-          <view class="orderDetail_infoItem_header_title">
-            <view class="icon"></view>
-            <view class="taskNameAndWorkerName">
-              <text class="taskName">流程信息</text>
-            </view>
-          </view>
-        </view>
-        <view class="orderDetail_infoItem_item process">
-          <view class="orderDetail_process_item" v-for="(step,i) in logList" :key="i">
-            <view class="step_infoStart">
-              <view class="step_name">{{step.operationName}}</view>
-              <view class="step_time" v-if="step.record && step.record[0]">
-                {{step.record[0].operationTime|formatDate('MM-dd HH:mm')}}
-              </view>
-            </view>
-            <view class="step_icon pda pda-icon_liucheng"
-              :class="{'active':(step.record&&step.record[0]&&step.record[0].operationTime)}"></view>
-            <view class="step_infoEnd">
-              <view class="step_overtime" v-if="i!=0&&step.record&&step.record.length">
-                耗时{{filterTime(step.record)}}
-              </view>
-              <view class="step_dept" v-if="step.record&&step.record[0]&&step.record[0].dept">
-                <text v-for="(dept,index) in step.record"
-                  :key="index">{{dept?(deptDisplay == 2?dept.deptalias:dept.dept)+',':''}}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-    <!-- 业务信息 -->
-    <view class="orderDetail_info" v-show="selectedTab === 3">
+    <!-- 患者标本 -->
+    <view class="orderDetail_info" v-show="selectedTab ===2">
       <scroll-view scroll-y class="orderDetail_infoItem">
         <view class="orderDetail_infoItem_header">
           <view class="orderDetail_infoItem_header_title">
             <view class="icon"></view>
             <view class="taskNameAndWorkerName">
-              <text class="taskName">业务信息</text>
-            </view>
-          </view>
-        </view>
-        <!-- 检查信息 -->
-        <view class="orderDetail_infoItem_item business business_inspect"
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者其他服务业务'])">
-          <!-- 患者信息 -->
-          <view class="inspect_info" v-if="orderInfo.patient">
-            <view class="inspect_info_block">
-              <view class="inspect_info_left">
-                <block v-if="orderInfo.patient.illnessState">
-                  <view class="inspect_info_icon red" v-if="orderInfo.patient.illnessState.value === '2'">危</view>
-                  <view class="inspect_info_icon red" v-else-if="orderInfo.patient.illnessState.value === '3'">重</view>
-                </block>
-                <block v-if="orderInfo.patient.careLevel">
-                  <view class="inspect_info_icon red" v-if="orderInfo.patient.careLevel.value === '0'">特</view>
-                  <view class="inspect_info_icon red" v-else-if="orderInfo.patient.careLevel.value === '1'">1</view>
-                  <view class="inspect_info_icon green" v-else-if="orderInfo.patient.careLevel.value === '2'">2</view>
-                  <view class="inspect_info_icon green" v-else-if="orderInfo.patient.careLevel.value === '3'">3</view>
-                </block>
-                <view class="inspect_info_name">{{orderInfo.patient.patientName}}</view>
-              </view>
-              <view class="inspect_info_right">
-                {{orderInfo.patient.bedNum}}床
-              </view>
-            </view>
-            <view class="inspect_info_block">
-              <view class="inspect_info_left">
-                {{orderInfo.patient.patientCode}}
-              </view>
-              <view class="inspect_info_right"
-                v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']">
-                待检{{orderInfo.checkList.length}}
-              </view>
+              <text class="taskName">标本信息</text>
             </view>
           </view>
-          <!-- 检查信息 -->
-          <block v-if="orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['患者陪检业务']">
-            <view class="inspect_item" v-for="item in orderInfo.checkList" :key="item.id"
-              @click="toDetail(item.id,orderInfo.taskType.associationType.value)">
-              <view class="inspect_item_name">
-                {{item.inspectName||'暂无'}}
-              </view>
-              <view class="inspect_item_info">
-                <view class="inspect_item_dept">
-                  {{item.execDept?(deptDisplay==2?item.execDept.deptalias:item.execDept.dept):'暂无'}}
-                </view>
-                <view class="inspect_item_number">
-                  叫号信息 {{item.reservationNumber || '暂无'}}
-                </view>
-              </view>
-              <view class="inspect_item_yytime">
-                预约时间{{item.yyTime || '暂无'}}
-              </view>
-            </view>
-          </block>
         </view>
         <!-- 标本信息 -->
-        <view class="orderDetail_infoItem_item business business_specimen"
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['临时标本业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['标本轮巡业务'])">
+        <view class="orderDetail_infoItem_item business business_specimen">
           <view class="inspect_specimen">
             <uni-table stripe emptyText="暂无更多数据">
               <!-- 表头行 -->
@@ -228,8 +59,7 @@
                 <uni-th align="center" width="71">科室</uni-th>
               </uni-tr>
               <!-- 表格数据行 -->
-              <uni-tr v-for="data in orderInfo.specimenSet" :key="data.id"
-                @click.native="toDetail(data.id,orderInfo.taskType.associationType.value)">
+              <uni-tr v-for="data in info.specimens" :key="data.id" @click.native="toDetail(data.id,'specimen')">
                 <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
                 <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
                 <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
@@ -247,62 +77,44 @@
             </uni-table>
           </view>
         </view>
-        <!-- 药品信息 -->
-        <view class="orderDetail_infoItem_item business business_drugsBag"
-          v-if="orderInfo.taskType&&(orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务'] || orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['静配配送'])">
-          <!-- 检查信息 -->
-          <block v-if="orderInfo.drugs&&orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['药品配送业务']">
-            <view class="drugsBag_item">
-              <view class="drugsBag_item_name">
-                发药单号
-              </view>
-              <view class="drugsBag_item_value">
-                {{orderInfo.drugs.packid || '暂无'}}
-              </view>
+      </scroll-view>
+    </view>
+    <!-- 患者检查 -->
+    <view class="orderDetail_info" v-show="selectedTab === 3">
+      <scroll-view scroll-y class="orderDetail_infoItem">
+        <view class="orderDetail_infoItem_header">
+          <view class="orderDetail_infoItem_header_title">
+            <view class="icon"></view>
+            <view class="taskNameAndWorkerName">
+              <text class="taskName">检查信息</text>
             </view>
-            <view class="drugsBag_item">
-              <view class="drugsBag_item_name">
-                发药科室
-              </view>
-              <view class="drugsBag_item_value">
-                {{orderInfo.drugs.launch?(deptDisplay == 2?orderInfo.drugs.launch.deptalias:orderInfo.drugs.launch.dept):'暂无'}}
-              </view>
+          </view>
+        </view>
+        <!-- 检查信息 -->
+        <view class="orderDetail_infoItem_item business business_inspect">
+          <view class="inspect_item" v-for="item in info.inspects" :key="item.id" @click="toDetail(item.id,'inspect')">
+            <view class="inspect_item_name">
+              {{item.inspectName||'暂无'}}
             </view>
-            <view class="drugsBag_item">
-              <view class="drugsBag_item_name">
-                状态
-              </view>
-              <view class="drugsBag_item_value">
-                {{orderInfo.drugs.drugsState?orderInfo.drugs.drugsState.name:'暂无'}}
+            <view class="inspect_item_info">
+              <view class="inspect_item_dept">预约时间</view>
+              <view class="inspect_item_number">
+                {{item.yyTime || '暂无'}}
               </view>
             </view>
-          </block>
-          <block v-if="orderInfo.staticDistri&&orderInfo.taskType.associationType.value==ASSOCIATION_TYPES['静配配送']">
-            <view class="drugsBag_item">
-              <view class="drugsBag_item_name">
-                发药单号
-              </view>
-              <view class="drugsBag_item_value">
-                {{orderInfo.staticDistri.packid || '暂无'}}
+            <view class="inspect_item_info">
+              <view class="inspect_item_dept">到达时间</view>
+              <view class="inspect_item_number">
+                {{item.arriveTime || '暂无'}}
               </view>
             </view>
-            <view class="drugsBag_item">
-              <view class="drugsBag_item_name">
-                发药科室
-              </view>
-              <view class="drugsBag_item_value">
-                {{orderInfo.staticDistri.launch?(deptDisplay == 2?orderInfo.staticDistri.launch.deptalias:orderInfo.staticDistri.launch.dept):'暂无'}}
+            <view class="inspect_item_info">
+              <view class="inspect_item_dept">检查状态</view>
+              <view class="inspect_item_number">
+                {{item.inspectState?item.inspectState.name:'暂无'}}
               </view>
             </view>
-            <view class="drugsBag_item">
-              <view class="drugsBag_item_name">
-                状态
-              </view>
-              <view class="drugsBag_item_value">
-                {{orderInfo.staticDistri.drugsState?orderInfo.staticDistri.drugsState.name:'暂无'}}
-              </view>
-            </view>
-          </block>
+          </view>
         </view>
       </scroll-view>
     </view>
@@ -317,8 +129,6 @@
     debounce
   } from 'lodash/function';
   import {
-    reqFetchData,
-    reqFetchWorkOrderLog,
     reqGetPatientInspectInfo,
   } from "../../request/api.js";
   import {
@@ -361,7 +171,7 @@
         // 当前选中的tab
         selectedTab: 1,
         // 工单信息
-        orderInfo: {},
+        info: {},
         // 流程信息
         logList: [],
         //底部按钮
@@ -398,34 +208,6 @@
           url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
         })
       },
-      // 格式化时分秒
-      // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
-      formatTime(time) {
-        let timeStr = "";
-        if (time >= 0 && time < 60) {
-          // 秒
-          timeStr = time + "秒";
-        } else if (time >= 60 && time < 3600) {
-          // 分钟
-          timeStr = Math.floor(time / 60) + "分钟";
-        } else if (time >= 3600) {
-          // 时 + 分
-          let h = "";
-          let m = "";
-          h = Math.floor(time / 3600) + "小时";
-          m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
-          timeStr = h + m;
-        }
-        return timeStr;
-      },
-      // 计算流程信息耗时
-      filterTime(step) {
-        let num = 0;
-        step.forEach((e) => {
-          num += e.difTime;
-        });
-        return this.formatTime(num / 1000);
-      },
       // 切换tab
       changeTab(id) {
         this.selectedTab = id;
@@ -434,7 +216,6 @@
             this.getInfo(this.queryParams);
             break;
           case 2:
-            this.getProcess(this.queryParams);
             break;
           case 3:
             break;
@@ -449,42 +230,14 @@
         let postData = {
           "patientCode": queryParams.patientCode
         };
-        reqGetPatientInspectInfo(queryParams.id).then(res => {
+        console.log(queryParams.patientCode)
+        reqGetPatientInspectInfo(postData).then(res => {
           uni.hideLoading();
           if (res.status == 200) {
-            // 检查科室处理
-            if (res.data.middleDept) {
-              //有检查科室的话
-              res.data.middleDept = res.data.middleDept.map(v => {
-                return this.deptDisplay == 2 ? v.deptalias : v.dept;
-              }).toString();
-            }
-            // 终点科室处理
-            res.data.endDepts = res.data.endDepts.map(v => {
-              return this.deptDisplay == 2 ? v.deptalias : v.dept;
-            }).toString();
             // 工单信息
-            this.orderInfo = res.data;
-          } else {
-            this.$refs.seiminModel.show({
-              skin: 'toast',
-              icon: 'error',
-              content: '请求失败',
-            })
-          }
-        })
-      },
-      //获取流程信息数据
-      getProcess(queryParams) {
-        uni.showLoading({
-          mask: true,
-          title: '加载中',
-        })
-        reqFetchWorkOrderLog(queryParams.id).then(res => {
-          uni.hideLoading();
-          if (res.status == 200) {
-            // 流程信息
-            this.logList = res.data;
+            res.data.specimens = res.data.specimens || [];
+            res.data.inspects = res.data.inspects || [];
+            this.info = res.data;
           } else {
             this.$refs.seiminModel.show({
               skin: 'toast',
@@ -599,7 +352,7 @@
           }
 
           .orderDetail_infoItem_header_more {
-            color: #333;
+            color: $defaultColor;
             font-weight: bold;
             font-size: 38rpx;
             @include clamp;

pages/patientList/patientList.vue

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