患者闭环

App.vue

@@ -178,8 +178,38 @@
   .mt8{
     margin-top: 16rpx !important;
   }
+  
+  .ml24{
+    margin-left: 24rpx !important;
+  }
 
 	.check{
 		border-color:#49b856 !important;
 	}
+  
+  .primaryButton{
+    color: #fff!important;
+    background-color: #49b856!important;
+    border-color: #49b856!important;
+  }
+  
+  .text_right{
+    text-align: right!important;
+  }
+  
+  .fwb{
+    font-weight: bold!important;
+  }
+  
+  .foot_common_btns{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 24rpx;
+    display: flex;
+    align-items: center;
+    gap: 24rpx;
+    .btn{
+      flex: 1;
+    }
+  }
 </style>

pages.json

@@ -776,7 +776,24 @@
 		      "titleNView": false
 		    }
 		  }
-		}
+		},
+    {
+      "path": "pages/patientInspectLog/patientInspectLogList", // 患者闭环-列表
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/patientInspectLog/patientInspectLogDetail", // 患者闭环-详情
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+    }
   ],
   "globalStyle": {
     "navigationBarTextStyle": "black",

pages/patientInspectLog/components/patientInspectLogListFilter.vue

@@ -0,0 +1,530 @@
+<template>
+  <view>
+    <view class="container" @touchmove.stop.prevent v-if="pageData.pageRouter === 'default'">
+      <view class="container_form">
+        <view class="head">
+          <text class="name">状态</text>
+          <text class="status">{{searchData.state ? searchData.state.name : ''}}</text>
+        </view>
+        <view class="statusList">
+          <view class="statusItem" :class="{ active: searchData.state.id == item.id }" v-for="item in pageData.stateList" :key="item.id" @click="searchData.state = item;">{{item.name}}<text class="newicon newicon-xuanzejiaobiao" v-if="searchData.state.id == item.id"></text></view>
+        </view>
+        <view class="category" @click="clickPageRouter('department')">
+          <text class="name">科室</text>
+          <text class="value ellipsis">{{searchData.department ? searchData.department.dept : ''}}</text>
+        </view>
+        
+        <view class="signUser" @click="clickPageRouter('signUser')" v-if="tabActiveId != 3">
+          <text class="name">签到人</text>
+          <text class="value ellipsis">{{searchData.signUser ? searchData.signUser.name : ''}}</text>
+        </view>
+        
+        <view class="inspectUser" @click="clickPageRouter('inspectUser')" v-if="tabActiveId != 2">
+          <text class="name">出科陪检人</text>
+          <text class="value ellipsis">{{searchData.inspectUser ? searchData.inspectUser.name : ''}}</text>
+        </view>
+      </view>
+      <view class="container_foot">
+        <view class="clear" @click="clear">清除选项</view>
+        <view class="foot_btns">
+          <view class="cancel" @click="cancel">取消</view>
+          <view class="confirm" @click="confirm">确认</view>
+        </view>
+      </view>
+    </view>
+    <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'signUser'">
+      <view class="container_form">
+        <view class="hospital">
+          <text class="name">签到人</text>
+          <view class="text-input">
+            <input class="m-input" type="text" :value="signUserKeyWord" @input="signUserInput" placeholder="请输入关键字"></input>
+          </view>
+        </view>
+        
+        <scroll-view scroll-y class="signUsers">
+          <view class="signUsers_item" v-for="signUser in pageData.signUserList" :key="signUser.id" @click="clickSignUser(signUser)">{{signUser.name}}<text v-if="signUser.account">({{signUser.account}})</text></view>
+        </scroll-view>
+      </view>
+      <view class="container_foot">
+        <view class="foot_btns">
+          <view class="cancel" @click="clickPageRouter('default')">取消</view>
+        </view>
+      </view>
+    </view>
+    <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'inspectUser'">
+      <view class="container_form">
+        <view class="hospital">
+          <text class="name">出科陪检人</text>
+          <view class="text-input">
+            <input class="m-input" type="text" :value="inspectUserKeyWord" @input="inspectUserInput" placeholder="请输入关键字"></input>
+          </view>
+        </view>
+        
+        <scroll-view scroll-y class="inspectUsers">
+          <view class="inspectUsers_item" v-for="inspectUser in pageData.inspectUserList" :key="inspectUser.id" @click="clickInspectUser(inspectUser)">{{inspectUser.name}}<text v-if="inspectUser.account">({{inspectUser.account}})</text></view>
+        </scroll-view>
+      </view>
+      <view class="container_foot">
+        <view class="foot_btns">
+          <view class="cancel" @click="clickPageRouter('default')">取消</view>
+        </view>
+      </view>
+    </view>
+    <view class="container" @touchmove.stop.prevent v-else-if="pageData.pageRouter === 'department'">
+      <view class="container_form">
+        <view class="hospital">
+          <text class="name">科室</text>
+          <view class="text-input">
+            <input class="m-input" type="text" :value="departmentKeyWord" @input="departmentInput" placeholder="请输入关键字"></input>
+          </view>
+        </view>
+        
+        <scroll-view scroll-y class="categorys">
+          <view class="categorys_item" v-for="item in pageData.departmentList" :key="item.id" @click="clickDepartment(item)">{{item.dept}}</view>
+        </scroll-view>
+      </view>
+      <view class="container_foot">
+        <view class="foot_btns">
+          <view class="cancel" @click="clickPageRouter('default')">取消</view>
+        </view>
+      </view>
+    </view>
+    <view class="mask" @touchmove.stop.prevent></view>
+  </view>
+</template>
+
+<script>
+  import { get, post, SM, deleteIt, webHandle } from "../../../http/http.js";
+  import debounce from 'lodash-es/debounce'
+  export default {
+    props: {
+      // 搜索条件,看组件传参
+      evt: {
+        type: Object,
+        required: true,
+      },
+      // tab页面的id，看组件传参
+      tabActiveId: {
+        type: Number,
+        required: true,
+      }
+    },
+    data(){
+      return {
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        signUserKeyWord: '',
+        inspectUserKeyWord: '',
+        departmentKeyWord: '',
+        pageData: {
+          pageRouter: 'default',
+          signUserList: [],
+          inspectUserList: [],
+          departmentList: [],
+          stateList: [],
+        },
+        searchData: {
+          signUser: {id: 0, name: '全部'},
+          inspectUser: {id: 0, name: '全部'},
+          department: {id: 0, dept: '全部'},
+          state: {},
+        }
+      }
+    },
+    methods: {
+      // 获取状态列表
+      getStateList(){
+        let postData = {
+          "type": "list",
+          "key": "patient_inspect_state",
+        };
+        post("/common/common/getDictionary", postData).then(res => {
+          this.pageData.stateList = res || [];
+          if(this.evt.state.id){
+            this.searchData.state = this.evt.state;
+          }else{
+            // 默认出科陪检中
+            let state4 = this.pageData.stateList.find(v => v.value == 4);
+            this.searchData.state = state4 || {};
+          }
+        })
+      },
+      departmentInput(event) {
+          this.departmentKeyWord = event.detail.value;
+          this.handleDepartmentSearch(this.departmentKeyWord);
+      },
+      handleDepartmentSearch: debounce(function(keyword) {
+        this.getDepartmentList(keyword);
+      }, 500),
+      signUserInput(event) {
+          this.signUserKeyWord = event.detail.value;
+          this.handleSignUserSearch(this.signUserKeyWord);
+      },
+      handleSignUserSearch: debounce(function(keyword) {
+        this.getSignUserList(keyword);
+      }, 500),
+      inspectUserInput(event) {
+          this.inspectUserKeyWord = event.detail.value;
+          this.handleInspectUserSearch(this.inspectUserKeyWord);
+      },
+      handleInspectUserSearch: debounce(function(keyword) {
+        this.getInspectUserList(keyword);
+      }, 500),
+      // 取消
+      cancel(){
+        this.$emit("cancelEmit");
+      },
+      // 清空
+      clear(){
+        if(this.tabActiveId !== 3){
+          this.searchData.signUser = {id: 0, name: '全部'};
+        }
+        if(this.tabActiveId !== 2){
+          this.searchData.inspectUser = {id: 0, name: '全部'};
+        }
+        this.searchData.department = {id: 0, dept: '全部'};
+        let state4 = this.pageData.stateList.find(v => v.value == 4);
+        this.searchData.state = state4 || {};
+      },
+      // 确认
+      confirm(){
+        this.$emit('confirmEmit', this.searchData);
+      },
+      // 页面路由跳转
+      clickPageRouter(type){
+        this.pageData.pageRouter = type;
+        switch(type){
+          case 'signUser':
+            this.getSignUserList();
+          break;
+          case 'inspectUser':
+            this.getInspectUserList();
+          break;
+          case 'department':
+            this.getDepartmentList();
+          break;
+        }
+      },
+      // 点击科室
+      clickDepartment(department){
+        this.pageData.pageRouter = 'default';
+        this.searchData.department = department;
+      },
+      // 点击签到人
+      clickSignUser(signUser){
+        this.pageData.pageRouter = 'default';
+        this.searchData.signUser = signUser;
+      },
+      // 点击出科陪检人
+      clickInspectUser(inspectUser){
+        this.pageData.pageRouter = 'default';
+        this.searchData.inspectUser = inspectUser;
+      },
+      // 获取科室
+      getDepartmentList(keyWord){
+        uni.showLoading({
+          title: "加载中",
+        });
+        
+        let postData = {
+          idx: 0,
+          sum: 99,
+          department: {
+      			searchType: 1,
+            cascadeHosId: this.hosId,
+            dept: keyWord,
+          },
+        }
+        post("/data/fetchDataList/department", postData).then(res => {
+          uni.hideLoading();
+          if(res.status == 200){
+            let list = res.list || [];
+            this.pageData.departmentList = [{ id:0, dept: '全部' }, ...list];
+          }else{
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        })
+      },
+      // 获取签到人列表
+      getSignUserList(keyWord){
+        uni.showLoading({
+          title: "加载中",
+        });
+      	let postData = {
+      	  idx: 0,
+      	  sum: 99,
+      		user:{
+            hospital: {
+              id: this.hosId,
+            },
+            name: keyWord,
+            simpleQuery: true,
+      		}
+      	};
+
+      	post("/data/fetchDataList/user", postData).then((res) => {
+      			uni.hideLoading();
+      	    let list = res.list || [];
+      	    this.pageData.signUserList = [{ id: 0, name: '全部' }, ...list];
+      	  });
+      },
+      // 获取出科陪检人列表
+      getInspectUserList(keyWord){
+        uni.showLoading({
+          title: "加载中",
+        });
+      	let postData = {
+      	  idx: 0,
+      	  sum: 99,
+      		user:{
+            hospital: {
+              id: this.hosId,
+            },
+            name: keyWord,
+            simpleQuery: true,
+      		}
+      	};
+      
+      	post("/data/fetchDataList/user", postData).then((res) => {
+      			uni.hideLoading();
+      	    let list = res.list || [];
+      	    this.pageData.inspectUserList = [{ id: 0, name: '全部' }, ...list];
+      	  });
+      }
+    },
+    mounted() {
+      this.getStateList();
+      this.searchData.signUser = this.evt.signUser || {id: 0, name: '全部'};
+      this.searchData.inspectUser = this.evt.inspectUser || {id: 0, name: '全部'};
+      this.searchData.department = this.evt.department || {id: 0, name: '全部'};
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+.text-input {
+  width: 100%;
+  display: inline-block;
+  padding: 0 12rpx;
+  border: 1rpx solid #49B856;
+  border-radius: 8rpx;
+
+  .m-input {
+    height: 64rpx;
+    line-height: 64rpx;
+  }
+}
+.mask{
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+}
+.line{
+  content: '';
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  height: 8rpx;
+  width: 100%;
+  background-color: #EBEBEB;
+}
+.container{
+  position: fixed;
+  left: 125rpx;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  background-color: #F7F7F7;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  font-size: 28rpx;
+  
+  .container_form{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
+    .head{
+      height: 90rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background-color: #fff;
+      padding: 0 24rpx;
+      .status{
+        color: #5DAAB6;
+      }
+    }
+    .statusList{
+      display: flex;
+      gap: 16rpx 32rpx;
+      flex-wrap: wrap;
+      background-color: #fff;
+      margin-top: 24rpx;
+      padding: 16rpx 8rpx;
+      .statusItem{
+        width: 182rpx;
+        height: 60rpx;
+        background: #EEEEEE;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+        &.active{
+          background-color: #DCF2F5;
+        }
+        .newicon-xuanzejiaobiao{
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          color: #65babb;
+        }
+      }
+    }
+  }
+  
+  .hospital{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 32rpx 24rpx 24rpx;
+    background-color: #fff;
+    .name{
+      font-size: 30rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+    .value{
+      font-size: 26rpx;
+      color: #5DAAB6;
+    }
+  }
+  
+  .signUsers{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .signUsers_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .inspectUsers{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .inspectUsers_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .categorys{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .categorys_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .tabs{
+    margin-top: 16rpx;
+    background-color: #FBFBFB;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    gap: 16rpx 0;
+    padding: 24rpx 16rpx;
+    .tab{
+      width: 180rpx;
+      height: 60rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background-color: #F7F7F7;
+      font-size: 28rpx;
+      position: relative;
+      .newicon-xuanzejiaobiao{
+        opacity: 0;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        font-size: 38rpx;
+        color: #53B9BB;
+      }
+      &.active{
+        background-color: rgba(149, 220, 231, 0.30);
+        .newicon-xuanzejiaobiao{
+          opacity: 1;
+        }
+      }
+    }
+  }
+  
+  .signUser,
+  .inspectUser,
+  .category,
+  .acceptDate{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24rpx;
+    background-color: #fff;
+    margin-top: 24rpx;
+    .name{
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+  }
+  
+  .container_foot{
+    .clear{
+      padding: 24rpx;
+      font-size: 28rpx;
+      background-color: #fff;
+      margin: 0 16rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .foot_btns{
+      margin-top: 24rpx;
+      display: flex;
+      border-top: 1rpx solid #BFBFBF;
+      .cancel{
+        flex: 1;
+        background-color: #fff;
+        font-size: 32rpx;
+        padding: 24rpx;
+        display: flex;
+        justify-content: center;
+      }
+      .confirm{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 24rpx;
+        background-color: #49B856;
+        display: flex;
+        justify-content: center;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>

pages/patientInspectLog/patientInspectLogDetail.vue

@@ -0,0 +1,768 @@
+<template>
+  <view class="incidentDetail">
+    <view class="head">
+      <view class="tab" :class="{active: tab.value === dataInfo.tabActiveValue}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.value)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+    </view>
+    <scroll-view scroll-y class="body">
+      <!-- 基本信息 -->
+      <template v-if="dataInfo.tabActiveValue === '1'">
+        <view class="detail_head">
+          <text class="title">基本信息</text>
+          <view class="other">
+            <view class="status">{{dataInfo.patientInspectLogData.state ? dataInfo.patientInspectLogData.state.name : ''}}</view>
+          </view>
+        </view>
+        <view class="detail_item_wrap">
+          <view class="deital_item">
+            <text class="name">患者科室：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.deptName}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">患者姓名：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.patientName}}</text>
+            <text class="value text_value">年龄：<text v-if="dataInfo.patientInspectLogData.age !== undefined">{{dataInfo.patientInspectLogData.age }}岁</text></text>
+          </view>
+          <view class="deital_item">
+            <text class="name">住院号：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.patientCode}}</text>
+            <text class="value text_value">床号：{{dataInfo.patientInspectLogData.bedNum }}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">护理等级：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.careLevel ? dataInfo.patientInspectLogData.careLevel.name : ''}}</text>
+            <text class="value text_value">危重等级：{{dataInfo.patientInspectLogData.illnessState ? dataInfo.patientInspectLogData.illnessState.name : ''}}</text>
+          </view>
+        </view>
+
+        <view class="detail_head">
+          <text class="title">陪检信息</text>
+        </view>
+        <view class="detail_item_wrap">
+          <view class="deital_item">
+            <text class="name">陪检方式：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.tripTypeDTO ? dataInfo.patientInspectLogData.tripTypeDTO.inspectMode : ''}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">携带设备：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.goodsNames}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">出科时间：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.outDeptTime | formatDate('yyyy-MM-dd hh:mm')}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">出科人：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.backDeptUserDTO ? dataInfo.patientInspectLogData.backDeptUserDTO.name : ''}}</text>
+          </view>
+        </view>
+        
+        <view class="detail_head">
+          <text class="title">最新操作</text>
+        </view>
+        <view class="detail_item_wrap">
+          <view class="deital_item">
+            <text class="name">签到时间：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.signTime | formatDate('yyyy-MM-dd hh:mm')}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">签到人：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.signUserDTO ? dataInfo.patientInspectLogData.signUserDTO.name : ''}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">签到科室：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.signDeptDTO ? dataInfo.patientInspectLogData.signDeptDTO.dept : ''}}</text>
+          </view>
+        </view>
+        
+        <view class="detail_head">
+          <text class="title">回科信息</text>
+        </view>
+        <view class="detail_item_wrap">
+          <view class="deital_item">
+            <text class="name">回科时间：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.backDeptTime | formatDate('yyyy-MM-dd hh:mm')}}</text>
+          </view>
+          <view class="deital_item">
+            <text class="name">回科人：</text>
+            <text class="value">{{dataInfo.patientInspectLogData.backDeptUserDTO ? dataInfo.patientInspectLogData.backDeptUserDTO.name : ''}}</text>
+          </view>
+        </view>
+      </template>
+
+      <!-- 检查信息 -->
+      <template v-if="dataInfo.tabActiveValue === '2'">
+        <view class="info">
+          <view v-for="item in dataInfo.valueList" :key="item.id" class="infoItem">
+            <view class="name">检查项目：<text class="fwb">{{item.inspectName}}</text></view>
+            <view class="name">检查单号：<text>{{item.inspectCode}}</text></view>
+            <view class="name">状态：<text>{{item.inspectState ? item.inspectState.name : ''}}</text></view>
+            <view class="name">检查地点：<text>{{item.execDept ? item.execDept.dept : ''}}</text></view>
+          </view>
+        </view>
+      </template>
+
+      <!-- 流程图 -->
+      <template v-if="dataInfo.tabActiveValue === '3'">
+        <view class="process_item_wrap">
+          <view class="process_item" v-for="item in dataInfo.logList" :key="item.id">
+            <view class="process_item_top">
+              <view class="name">{{item.operationType ? item.operationType.name : '' }}</view>
+              <view class="value" v-if="item.remark">（{{item.remark}}）</view>
+            </view>
+            <view class="process_item_bottom">
+              <text class="name">{{item.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</text>
+              <text class="value" v-if="item.username">{{item.username}}</text>
+            </view>
+          </view>
+        </view>
+      </template>
+    </scroll-view>
+    <view class="foot_common_btns">
+      <button @click="toList()" type="default" class="primaryButton btn">返回</button>
+      <button v-if="dataInfo.patientInspectLogData.state.value === '4'" @click="tagClick(dataInfo.patientInspectLogData)" type="default" class="primaryButton btn">标记回科</button>
+    </view>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content" @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
+  </view>
+</template>
+
+<script>
+  import { get, post, SM, deleteIt, webHandle } from "../../http/http.js";
+  export default {
+    data(){
+      return {
+        selectData: {},
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+        dataInfo: {
+          tabs: [
+             {id: 1, name: '基本信息', value: '1', num: ''},
+             {id: 2, name: '检查信息', value: '2', num: ''},
+             {id: 3, name: '流程信息', value: '3', num: ''},
+          ],
+          tabActiveValue: 1,//当前选择的tab
+          patientInspectLogId: undefined,//闭环ID
+          patientInspectLogData: {},//闭环对象
+          valueList: [],//检查信息
+          logList: [],//流程图
+         }
+      }
+    },
+    methods: {
+      // 标记回科
+      tagClick(data){
+        this.selectData = data;
+        this.models = {
+          disjunctor: true,
+          title: "提示",
+          content: `您确认${data.patientName}患者已回科吗？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      //确定
+      ok() {
+        this.models.disjunctor = false;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/nurse/patientInspect/setPatientInspectBackDept", {
+          pilId: this.selectData.id,
+        }).then((res) => {
+          uni.hideLoading();
+          let _this = this;
+          if (res.state == 200) {
+            uni.showToast({
+              icon: "none",
+              mask: true,
+              title: "操作成功！",
+            });
+            setTimeout(() => {
+              _this.toList();
+            },300)
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        })
+      },
+      //取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
+      // 点击tab
+      clickTab(tabValue){
+       if(this.dataInfo.tabActiveValue == tabValue){
+         return;
+       }
+       this.dataInfo.tabActiveValue = tabValue;
+       this.initData()
+      },
+      // tab业务数据接口
+      initData(){
+       if(this.dataInfo.tabActiveValue === '1'){
+         
+       }else if(this.dataInfo.tabActiveValue === '2'){
+         this.getValue();
+       }else if(this.dataInfo.tabActiveValue === '3'){
+         this.getLog();
+       }
+      },
+      // 获取检查信息
+      getValue(){
+       uni.showLoading({
+         title: "加载中",
+         mask: true,
+       });
+       let postData = {
+           pilId: this.dataInfo.patientInspectLogId,
+       };
+       post(`/nurse/patientInspect/getPatientInspectList`, postData).then(res => {
+         uni.hideLoading();
+         if(res.status == 200){
+           this.dataInfo.valueList = res.list || [];
+         }else{
+           uni.showToast({
+             icon: 'none',
+             title: res.msg || '请求数据失败！'
+           });
+         }
+       })
+      },
+      // 获取流程信息
+      getLog(){
+       uni.showLoading({
+         title: "加载中",
+         mask: true,
+       });
+      let postData = {
+        "idx": 0,
+        "sum": 9999,
+        "patientInspectLogLog": {
+          "pilId": this.dataInfo.patientInspectLogId
+        }
+      };
+       post(`/simple/data/fetchDataList/patientInspectLogLog`, postData).then(res => {
+         uni.hideLoading();
+         if(res.status == 200){
+           this.dataInfo.logList = res.list || [];
+         }else{
+           uni.showToast({
+             icon: 'none',
+             title: res.msg || '请求数据失败！'
+           });
+         }
+       })
+      },
+      // 获取详情
+      getDetail(){
+       uni.showLoading({
+         title: "加载中",
+         mask: true,
+       });
+
+       get(`/simple/data/fetchData/patientInspectLog/${this.dataInfo.patientInspectLogId}`).then(res => {
+         uni.hideLoading();
+         if(res.status == 200){
+           this.dataInfo.patientInspectLogData = res.data || {};
+           this.dataInfo.logList = this.dataInfo.patientInspectLogData.logList || [];
+           
+           this.dataInfo.tabActiveValue = this.dataInfo.tabs[0].value;
+           console.log(this.dataInfo.tabActiveValue)
+           this.initData()
+         }else{
+           uni.showToast({
+             icon: 'none',
+             title: res.msg || '请求数据失败！'
+           });
+         }
+       })
+      },
+      // 返回列表
+      toList(){
+       uni.reLaunch({
+         url: `/pages/patientInspectLog/patientInspectLogList`
+       })
+      }
+    },
+    onLoad(options){
+      this.dataInfo.patientInspectLogId = options.patientInspectLogId;
+      this.getDetail();
+    }
+  }
+ //  import chunk from 'lodash-es/chunk'
+ //  import { ref, reactive } from 'vue'
+ //  import { onLoad } from '@dcloudio/uni-app'
+ //  import { api_listAttachment, api_inspectionTaskDetail, api_inspectionFormValues } from "@/http/api.js"
+ //  import { defaultColor } from '@/static/js/theme.js'
+ //  import { useSetTitle } from '@/share/useSetTitle.js'
+ //  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+
+ //  useSetTitle();
+ //  const { formatDate }  = filterFormatDate();
+
+ //  // 主题颜色
+ //  const primaryColor = ref(defaultColor)
+	
+ //  // 数据
+ //  const dataInfo = reactive({
+ //    tabs: [
+ //      {id: 1, name: '基础信息', value: '1', num: ''},
+ //      // {id: 2, name: '巡检信息', value: '2', num: ''},
+ //      {id: 3, name: '流程图', value: '3', num: ''},
+ //    ],
+ //    tabActiveValue: 0,//当前选择的tab
+ //    patientInspectLogId: undefined,//巡检执行ID
+ //    patientInspectLogData: {},//巡检执行对象
+ //    inspectionTaskImgs: [],//巡检图片
+ //    valueList: [],//巡检信息
+ //    logList: [],//流程图
+ //  })
+  
+ //  function getValuex(value){
+ //    return value.formItemConfigList ? value.formItemConfigList.map(v => v.valuex).toString() : value.valuex;
+ //  }
+
+ //  // 获取巡检信息
+ //  function getValue(){
+ //    uni.showLoading({
+ //      title: "加载中",
+ //      mask: true,
+ //    });
+ //    let postData = {
+ //        "idx": 0,
+ //        "sum": 9999,
+ //        "inspectionFormValues": {
+ //          taskId: dataInfo.patientInspectLogId,
+ //        }
+ //    };
+ //    api_inspectionFormValues(postData).then(res => {
+ //      uni.hideLoading();
+ //      if(res.status == 200){
+ //        let valueList = res.list || [];
+ //        let imgFlag = valueList.some(v => v.inspectionFormItemDTO.type.value == 7);
+
+ //        if(imgFlag){
+ //          valueList.forEach(v => {
+ //            if(v.inspectionFormItemDTO.type.value == 7){
+ //              v.valuex = [];
+ //            }
+ //          })
+ //        }
+
+ //        dataInfo.valueList = chunk(valueList, 3);
+
+ //        if(imgFlag){
+ //          getInspectionImgs();
+ //        }
+ //      }else{
+ //        uni.showToast({
+ //          icon: 'none',
+ //          title: res.msg || '请求数据失败！'
+ //        });
+ //      }
+ //    })
+ //  }
+
+ //  // 预览图片
+ //  function previewImg(index, type, imgList){
+ //    uni.previewImage({
+ //      current: index,
+ //      urls: imgList.map(v => v.previewUrl),
+ //      longPressActions: {
+ //        itemList: ['发送给朋友', '保存图片', '收藏'],
+ //        success: function(data) {
+ //          console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+ //        },
+ //        fail: function(err) {
+ //          console.log(err.errMsg);
+ //        }
+ //      }
+ //    });
+ //  }
+
+ //  // 初始化表单
+ //  function initData(){
+ //    if(dataInfo.tabActiveValue === '1'){
+      
+ //    }else if(dataInfo.tabActiveValue === '2'){
+ //      getValue();
+ //    }else if(dataInfo.tabActiveValue === '3'){
+      
+ //    }
+ //  }
+
+ //  // 点击tab
+ //  function clickTab(tabValue){
+ //    if(dataInfo.tabActiveValue == tabValue){
+ //      return;
+ //    }
+ //    dataInfo.tabActiveValue = tabValue;
+ //    initData()
+ //  }
+
+ //  // 获取巡检执行详情
+ //  function getDetail(){
+ //    uni.showLoading({
+ //      title: "加载中",
+ //      mask: true,
+ //    });
+
+ //    api_inspectionTaskDetail(dataInfo.patientInspectLogId).then(res => {
+ //      uni.hideLoading();
+ //      if(res.status == 200){
+ //        dataInfo.patientInspectLogData = res.data || {};
+ //        dataInfo.logList = dataInfo.patientInspectLogData.logList || [];
+        
+ //        // 巡检信息
+ //        if(dataInfo.patientInspectLogData.status.value === '2'){
+ //          let flag = dataInfo.tabs.some(v => v.value === '2');
+ //          !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '巡检信息', value: '2', num: ''});
+ //        }
+        
+ //        dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+ //        initData()
+ //      }else{
+ //        uni.showToast({
+ //          icon: 'none',
+ //          title: res.msg || '请求数据失败！'
+ //        });
+ //      }
+ //    })
+ //  }
+	
+ //  // 获取巡检图片
+ //  function getInspectionImgs(){
+ //    uni.showLoading({
+ //      title: "加载中",
+ //      mask: true,
+ //    });
+ //    api_listAttachment('inspection', dataInfo.patientInspectLogId).then(res => {
+ //      uni.hideLoading();
+ //      res.data = res.data || [];
+ //      res.data.forEach(v => {
+ //        v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+ //        v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+ //      })
+      
+ //      let imgList = res.data || [];
+ //      dataInfo.valueList.forEach(v => {
+ //        v.forEach(vv => {
+ //          imgList.forEach(item => {
+ //            if(vv.itemId == item.recordId){
+ //              if(vv.valuex && vv.valuex.length){
+ //                vv.valuex.push(item)
+ //              }else{
+ //                vv.valuex = [item];
+ //              }
+ //            }
+ //          })
+ //        })
+ //      })
+ //    })
+ //  }
+
+ //  // 返回巡检列表
+ //  function toList(){
+ //    uni.reLaunch({
+ //      url: `/pages/inspection/inspectionExecute/inspectionExecute`
+ //    })
+ //  }
+  
+ //  // 查看故障单
+ //  function viewIncidentDetail(incidentId){
+ //    uni.navigateTo({
+ //      url: `/pages/incidentDetail/incidentDetail?incidentId=${incidentId}`
+ //    })
+ //  }
+
+ //  onLoad((option) => {
+ //    dataInfo.patientInspectLogId = option.patientInspectLogId;
+	// 	getDetail();
+ //  })
+</script>
+
+<style lang="scss" scoped>
+.popup-content{
+	padding: 40rpx;
+}
+.incidentDetail{
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #EBEBEB;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      position: relative;
+      &:last-of-type{
+        &:after{
+          display: none;
+        }
+      }
+      // &:after{
+      //   content: '';
+      //   position: absolute;
+      //   right: 0;
+      //   top: 50%;
+      //   transform: translateY(-50%);
+      //   width: 1rpx;
+      //   height: 44rpx;
+      //   background-color: #515151;
+      // }
+      &.active{
+        color: #49B856;
+        border-color: #49B856;
+      }
+    }
+  }
+  .body{
+    margin-top: 88rpx;
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    border-top: 7rpx solid #EBEBEB;
+    .phone-filled{
+      margin-left: 5rpx;
+    }
+    .mic-filled{
+      margin-right: 100rpx;
+    }
+    .detail_item_wrap{
+      padding-bottom: 24rpx;
+    }
+    .detail_head{
+      padding: 24rpx;
+      border-top: 8rpx solid #D2D2D2;
+      border-bottom: 1rpx solid #D2D2D2;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      &:first-of-type{
+        border-top: none;
+      }
+      .title{
+        font-size: 26rpx;
+        color: #49B856;
+        padding-left: 18rpx;
+        position: relative;
+        &:before{
+          content: '';
+          width: 8rpx;
+          height: 25rpx;
+          background-color: #49B856;
+          position: absolute;
+          left: 0;
+          top: 50%;
+          transform: translateY(-50%);
+        }
+      }
+      .other{
+        display: flex;
+        align-items: center;
+        .priority{
+          font-size: 26rpx;
+          margin-right: 15rpx;
+        }
+        .status{
+          font-size: 26rpx;
+        }
+      }
+    }
+
+    .deital_item{
+      font-size: 26rpx;
+      color: #555;
+      padding: 24rpx 24rpx 0;
+      display: flex;
+      align-items: center;
+      .name{
+        width: 5em;
+        margin-right: 24rpx;
+      }
+      .value{
+        flex: 2;
+        word-break: break-all;
+        &.text_value{
+          flex: 1;
+        }
+        &.img{
+          display: flex;
+          .imgItem{
+            width: 82rpx;
+            height: 82rpx;
+            margin-right: 24rpx;
+            &:last-of-type{
+              margin-right: 0;
+            }
+          }
+					.resourceItem{
+						width: 100rpx;
+						height: 100rpx;
+						margin-right: 24rpx;
+						&:last-of-type{
+						  margin-right: 0;
+						}
+					}
+					.resourceItem-audio{
+						width: 300rpx;
+						height: 60rpx;
+					}
+        }
+      }
+    }
+
+    .summaryItem_bodyItem{
+      padding: 24rpx 24rpx 0;
+      font-size: 26rpx;
+      .summaryItem_bodyItem_top{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .value{
+          padding-left: 48rpx;
+          flex-shrink: 0;
+        }
+      }
+      .summaryItem_bodyItem_bottom{
+        margin-top: 24rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .name{
+          text-align: right;
+          flex: 1;
+        }
+        .value{
+          width: 220rpx;
+          text-align: right;
+          flex-shrink: 0;
+        }
+      }
+    }
+
+    .summaryItem_bodyItem_total{
+      text-align: right;
+      padding: 24rpx;
+      font-size: 26rpx;
+    }
+
+    .summaryItem_total{
+      text-align: center;
+      padding-top: 24rpx;
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #49B856;
+      border-top: 1rpx solid #D2D2D2;
+    }
+    
+    .info{
+      .infoItem{
+        padding: 24rpx;
+        background-color: #fff;
+        border-top: 8rpx solid #D2D2D2;
+        font-size: 24rpx;
+        &:first-of-type{
+          border-top: none;
+        }
+        .name{
+          margin-top: 24rpx;
+          &:first-of-type{
+            margin-top: 0;
+          }
+        }
+      }
+    }
+
+    .process_item_wrap{
+      padding: 38rpx;
+      .process_item{
+        &:last-of-type{
+          .process_item_bottom{
+            border-left: none;
+          }
+        }
+        .process_item_top{
+          padding-left: 30rpx;
+          display: flex;
+          align-items: center;
+          position: relative;
+          &:before{
+            content: '';
+            position: absolute;
+            left: -13rpx;
+            top: 50%;
+            width: 26rpx;
+            height: 26rpx;
+            border-radius: 50%;
+            background-color: #49B856;
+            transform: translateY(-50%);
+          }
+          .name{
+            font-size: 30rpx;
+          }
+          .value{
+            margin-left: 20rpx;
+            font-size: 22rpx;
+            color: #A1A1A1;
+						flex: 1;
+          }
+        }
+        .process_item_bottom{
+          min-height: 82rpx;
+          border-left: 1rpx solid #B7BDC6;
+          margin-top: 5rpx;
+          padding-left: 30rpx;
+          display: flex;
+          font-size: 24rpx;
+          color: #A1A1A1;
+          .value{
+            margin-left: 20rpx;
+          }
+        }
+      }
+    }
+
+    .appraise_detail{
+      padding: 24rpx 24rpx 24rpx 40rpx;
+      .appraise_detail_top{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 26rpx;
+        .name{
+          color: #A1A1A1;
+        }
+        .value{}
+      }
+      .appraise_detail_bottom{
+        font-size: 30rpx;
+        margin-top: 24rpx;
+        word-break: break-all;
+      }
+    }
+  }
+}
+</style>

pages/patientInspectLog/patientInspectLogList.vue

@@ -0,0 +1,476 @@
+<template>
+  <view class="incidentList">
+    <view class="head">
+      <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+      <view class="filter" @click="filterClick">
+        <text class="newicon newicon-shaixuan"></text>
+      </view>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toDetail(data)">
+        <view class="body_item_head ellipsis-multiline">
+          <text>
+            <text class="sign signRed">{{ data.careLevel ? data.careLevel.name : '' }}<template v-if="data.careLevel && data.illnessState">、</template>{{ data.illnessState ? data.illnessState.name : '' }}</text> {{ data.patientName }}<text v-if="data.bedNum">({{ data.bedNum }})</text>
+          </text>
+          <text>{{ data.state ? data.state.name : '' }}</text>
+        </view>
+
+        <view class="body_item_content">
+          <view class="body_item_content_p">
+            <text class="name ellipsis">住院号：{{data.patientCode}}</text>
+            <text>{{(data.patientDTO && data.patientDTO.gender) ? data.patientDTO.gender.name : ''}}<text v-if="data.age !== undefined" class="ml24">{{data.age}}</text></text>
+          </view>
+          <view class="body_item_content_p">
+            <text class="name ellipsis">患者科室：{{ data.deptDTO ? data.deptDTO.dept : '' }}</text>
+            <text>{{data.tripTypeDTO ? data.tripTypeDTO.inspectMode : ''}}</text>
+          </view>
+          <view class="body_item_content_p">
+            <text class="name ellipsis">签到信息：{{data.signDeptDTO ? data.signDeptDTO.dept : ''}}</text>
+            <text>{{data.signTime | formatDate('MM-dd hh:mm')}}</text>
+          </view>
+        </view>
+
+        <view class="body_item_foot" v-if="data.state.value === '4'">
+          <view class="btns pt0">
+            <button @click.stop="tagClick(data)" type="default" class="primaryButton btn">标记回科</button>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="toolbar" @click="scan()">
+      <text class="toolbar-icon newicon newicon-saoma"></text>
+      <text class="toolbar-sao">扫一扫</text>
+    </view>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content" @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
+    <!-- 搜索 -->
+    <patientInspectLogListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter" :tabActiveId="dataInfo.tabActiveId"></patientInspectLogListFilter>
+  </view>
+</template>
+
+<script>
+  import patientInspectLogListFilter from './components/patientInspectLogListFilter.vue';
+  import { get, post, SM, deleteIt, webHandle } from "../../http/http.js";
+  export default {
+    components:{
+      patientInspectLogListFilter,
+    },
+    onShow() {
+      this.SMFlag = true;
+    },
+    data(){
+      return {
+        selectData: {},
+        SMFlag: true,
+        loginUser: uni.getStorageSync('userData').user,
+        hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+        dataInfo: {
+          tabs: [
+            {id: 1, name: '全部', value: '1', num: ''},
+            {id: 2, name: '我带出的', value: '2', num: ''},
+            {id: 3, name: '我接收的', value: '3', num: ''},
+          ],
+          tabActiveId: 1,//当前选择的tab
+          list: [],//工单列表
+          idx: 0,//页码
+          hasMore: true,//是否有更多数据
+          isFilter: false,//筛选框开关
+          evtFilter: {
+            signUser: {id: 0, name: '全部'},
+            inspectUser: {id: 0, name: '全部'},
+            department: {id: 0, dept: '全部'},
+            state: {},
+          },//筛选框数据
+        }
+      }
+    },
+    methods: {
+      // 扫一扫
+      scan(isFlag = false) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((ress1) => {
+          this.scan_common(ress1, isFlag);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
+      // 扫一扫方法
+      scan_common(ress1, isFlag = false){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          idx: 0,
+          sum: 1,
+          patientInspectLog: {
+            hosId: this.hosId,
+            scanCode: ress1,
+          }
+        }
+        post("/simple/data/fetchDataList/patientInspectLog", postData).then((ress) => {
+          this.SMFlag = true;
+          uni.hideLoading();
+          if (ress.status == 200) {
+            let list = ress.list || [];
+            if(list.length){
+              let patientInspectLog = undefined;
+              patientInspectLog = list[0];
+              uni.navigateTo({
+                url: `/pages/patientInspectLog/patientInspectLogDetail?patientInspectLogId=${patientInspectLog.id}`
+              })
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "未查询到患者闭环信息！",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: ress.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      // 初始化
+      onLoadFn(){
+        this.getTabs();
+      },
+      // 获取tab选项
+      getTabs(){
+        this.getList(0);
+      },
+      // 获取列表信息
+      getList(idx){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        this.dataInfo.idx = idx === undefined ? this.dataInfo.idx : idx;
+        if(this.dataInfo.idx === 0){
+          this.dataInfo.list = [];
+        }
+        
+        let postData = {
+            "idx": this.dataInfo.idx,
+            "sum": 20,
+            "patientInspectLog": {
+              "hosId": this.hosId,
+            }
+        }
+        
+        let tabActiveObj = this.dataInfo.tabs.find(v => v.id == this.dataInfo.tabActiveId);
+        console.log(tabActiveObj)
+        
+        if(tabActiveObj && tabActiveObj.id){
+          if(tabActiveObj.id === 1){
+            if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.signUser && this.dataInfo.evtFilter.signUser.id){
+              postData.patientInspectLog.signUser = this.dataInfo.evtFilter.signUser.id;
+            }
+            if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.inspectUser && this.dataInfo.evtFilter.inspectUser.id){
+              postData.patientInspectLog.outDeptUser = this.dataInfo.evtFilter.inspectUser.id;
+            }
+          }else if(tabActiveObj.id === 2){
+            postData.patientInspectLog.outDeptUser = this.loginUser.id;
+            if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.signUser && this.dataInfo.evtFilter.signUser.id){
+              postData.patientInspectLog.signUser = this.dataInfo.evtFilter.signUser.id;
+            }
+          }else if(tabActiveObj.id === 3){
+            postData.patientInspectLog.signUser = this.loginUser.id;
+            if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.inspectUser && this.dataInfo.evtFilter.inspectUser.id){
+              postData.patientInspectLog.outDeptUser = this.dataInfo.evtFilter.inspectUser.id;
+            }
+          }
+        }
+      
+        if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.department && this.dataInfo.evtFilter.department.id){
+          postData.patientInspectLog.deptId = this.dataInfo.evtFilter.department.id;
+        }
+        
+        if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.state && this.dataInfo.evtFilter.state.id){
+          postData.patientInspectLog.state = this.dataInfo.evtFilter.state;
+        }
+      
+        post("/simple/data/fetchDataList/patientInspectLog", postData).then(res => {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          if(res.status == 200){
+            let list = res.list || [];
+            if(list.length){
+              this.dataInfo.hasMore = true;
+              this.dataInfo.list = this.dataInfo.idx === 0 ? list : this.dataInfo.list.concat(list);
+            }else{
+              this.dataInfo.hasMore = false;
+            }
+          }else{
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        })
+      },
+      // 详情
+      toDetail(data){
+        uni.navigateTo({
+          url: `/pages/patientInspectLog/patientInspectLogDetail?patientInspectLogId=${data.id}`
+        })
+      },
+      // 标记回科
+      tagClick(data){
+        this.selectData = data;
+        this.models = {
+          disjunctor: true,
+          title: "提示",
+          content: `将${data.patientName}患者标记为已回科，是否确认？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      //确定
+      ok() {
+        this.models.disjunctor = false;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/nurse/patientInspect/setPatientInspectBackDept", {
+          pilId: this.selectData.id,
+        }).then((res) => {
+          uni.hideLoading();
+          let _this = this;
+          if (res.state == 200) {
+            uni.showToast({
+              icon: "none",
+              mask: true,
+              title: "操作成功！",
+            });
+            setTimeout(() => {
+              _this.getList(0);
+            },300)
+          } else {
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        })
+      },
+      //取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
+      // 点击tab
+      clickTab(tabId){
+        this.dataInfo.tabActiveId = tabId;
+        if(tabId === 1){
+          this.dataInfo.evtFilter.signUser = {id: 0, name: '全部'};
+          this.dataInfo.evtFilter.inspectUser = {id: 0, name: '全部'};
+        }else if(tabId === 2){
+          this.dataInfo.evtFilter.signUser = {id: 0, name: '全部'};
+          this.dataInfo.evtFilter.inspectUser = this.loginUser;
+        }else if(tabId === 3){
+          this.dataInfo.evtFilter.signUser = this.loginUser;
+          this.dataInfo.evtFilter.inspectUser = {id: 0, name: '全部'};
+        }
+        this.getList(0);
+      },
+      // 点击筛选
+      filterClick(){
+        this.dataInfo.isFilter = true;
+      },
+      // 确认筛选
+      conformFilter(evtFilter){
+        this.dataInfo.evtFilter = evtFilter;
+        this.dataInfo.isFilter = false;
+        this.getList(0);
+      },
+      // 关闭筛选
+      cancelFilter(){
+        this.dataInfo.isFilter = false;
+      },
+    },
+    onLoad(options){
+      this.onLoadFn();
+    },
+    onTabItemTap(){
+      this.onLoadFn();
+    },
+    onPullDownRefresh(){
+      this.getList(0);
+    },
+    onReachBottom(){
+      this.dataInfo.idx += 1;
+      if (this.dataInfo.hasMore) {
+        this.getList(); // 当触底时加载更多数据
+      }
+    },
+  };
+</script>
+
+<style lang="scss" scoped>
+.toolbar {
+  position: fixed;
+  left: 0;
+  bottom: var(--window-bottom);
+  z-index: 99;
+  width: 100%;
+  height: 88rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+  background-color: #E5E8ED;
+
+  .toolbar-icon {
+    font-size: 52rpx;
+    margin-right: 16rpx;
+    color: #49B856;
+  }
+
+  .toolbar-sao {
+    font-size: 36rpx;
+    color: #333;
+  }
+}
+page{
+  height: calc(100vh - var(--window-bottom));
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: #49b856;
+        border-color: #49b856;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-bottom: calc(var(--window-bottom) + 88rpx);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+      border-bottom: 8rpx solid #EBEBEB;
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        margin: 24rpx;
+        font-size: 30rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .sign{
+          margin-right: 16rpx;
+          color: #49B856;
+          &.signRed{
+            color: #FF0000;
+          }
+        }
+      }
+      .body_item_content{
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx;
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-bottom: calc(var(--window-bottom) + 88rpx);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - var(--window-bottom) - 176rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>

pages/receiptpage/receiptpage.vue

@@ -1760,6 +1760,10 @@
             this.content.push({
               text: "患者交接",
             });
+          } else if (item.link === "wxPatientInspectLog") {
+            this.content.push({
+              text: "陪检闭环",
+            });
           }
         });
       },
@@ -2226,6 +2230,10 @@
           uni.navigateTo({
             url: "/pages/transferWorkOrder/transferWorkOrderUser",
           });
+        } else if (e.item.text === "陪检闭环") {
+          uni.navigateTo({
+            url: "/pages/patientInspectLog/patientInspectLogList",
+          });
         }
       },
       //确定

static/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe717;</span>
+                <div class="name">选择角标</div>
+                <div class="code-name">&amp;#xe717;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe644;</span>
                 <div class="name">修改</div>
                 <div class="code-name">&amp;#xe644;</div>
@@ -738,9 +744,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1747104804641') format('woff2'),
-       url('iconfont.woff?t=1747104804641') format('woff'),
-       url('iconfont.ttf?t=1747104804641') format('truetype');
+  src: url('iconfont.woff2?t=1747972897466') format('woff2'),
+       url('iconfont.woff?t=1747972897466') format('woff'),
+       url('iconfont.ttf?t=1747972897466') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -767,6 +773,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-xuanzejiaobiao"></span>
+            <div class="name">
+              选择角标
+            </div>
+            <div class="code-name">.newicon-xuanzejiaobiao
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-weibiaoti2010104"></span>
             <div class="name">
               修改
@@ -1794,6 +1809,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-xuanzejiaobiao"></use>
+                </svg>
+                <div class="name">选择角标</div>
+                <div class="code-name">#newicon-xuanzejiaobiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-weibiaoti2010104"></use>
                 </svg>
                 <div class="name">修改</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304849 */
-  src: url('~@/static/font/iconfont.woff2?t=1747104804641') format('woff2'),
-       url('~@/static/font/iconfont.woff?t=1747104804641') format('woff'),
-       url('~@/static/font/iconfont.ttf?t=1747104804641') format('truetype');
+  src: url('~@/static/font/iconfont.woff2?t=1747972897466') format('woff2'),
+       url('~@/static/font/iconfont.woff?t=1747972897466') format('woff'),
+       url('~@/static/font/iconfont.ttf?t=1747972897466') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-xuanzejiaobiao:before {
+  content: "\e717";
+}
+
 .newicon-weibiaoti2010104:before {
   content: "\e644";
 }

static/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "733991",
+      "name": "选择角标",
+      "font_class": "xuanzejiaobiao",
+      "unicode": "e717",
+      "unicode_decimal": 59159
+    },
+    {
       "icon_id": "1069107",
       "name": "修改",
       "font_class": "weibiaoti2010104",