App.vue

@@ -123,7 +123,7 @@
     height: 100%;
     box-sizing: border-box;
     /* padding-top: 96rpx; */
-    font-family: "Helvetica Neue";
+    font-family: "system-ui";
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
   }

components/showModel/showModel.vue

@@ -17,6 +17,11 @@
       <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length, p2: childrenDeptList.length || busyContentList.length }">
         <view v-if="content" class="showModel__content" @click="tel()" v-html="content"></view>
         <view v-if="info" class="showModel__info">{{ info }}</view>
+        <view class="showModel__checkbox" v-if="checkBoxText">
+          <checkbox-group @change="changeIsCheck">
+            <checkbox value="isCheck" :checked="isCheck" color="#49b856" id="isCheck" /><label for="isCheck">{{checkBoxText}}</label>
+          </checkbox-group>
+        </view>
         <view class="specialCloseFlag" v-if="textareaFlag">
           <textarea
             style="width: 100%"
@@ -100,10 +105,14 @@ export default {
       time: 3, //5秒后自动关闭
       timer: null, //5秒后自动关闭，定时器
       timerFlag: false, //是否显示取消自动关闭按钮
+      isCheck: false, //是否选择
     };
   },
   watch: {
     disjunctor(newValue) {
+      if(newValue){
+        this.isCheck = false;
+      }
       if (newValue && this.operate.know == "返回") {
         this.time = 3;
         // this.timerFlag = true;
@@ -143,6 +152,11 @@ export default {
       type: String,
       default: "",
     },
+    // 复选框
+    checkBoxText: {
+      type: String,
+      default: "",
+    },
     // 拨打电话
     phone: {
       type: String,
@@ -192,6 +206,9 @@ export default {
     },
   },
   methods: {
+    changeIsCheck(e){
+      this.isCheck = e.detail.value.length > 0
+    },
     clickHandler(item){
       this.$emit('ok', item)
     },
@@ -205,11 +222,11 @@ export default {
     },
     // 确定
     ok() {
-      this.$emit("ok");
+      this.$emit("ok", { isCheck: this.isCheck });
     },
     // 否
     no() {
-      this.$emit("no");
+      this.$emit("no", { isCheck: this.isCheck });
     },
     // 取消
     cancel() {
@@ -285,7 +302,7 @@ export default {
       color: #000;
       margin: 0 auto 25rpx;
       width: 488rpx;
-      padding: 60rpx 16rpx;
+      padding: 32rpx 16rpx;
       background-color: rgb(249, 250, 251);
       border: 2rpx solid rgb(229, 233, 237);
       border-radius: 12rpx;
@@ -333,6 +350,11 @@ export default {
         font-size: 32rpx;
         color: rgb(102, 102, 102);
       }
+      .showModel__checkbox{
+        font-size: 32rpx;
+        color: rgb(102, 102, 102);
+        margin-top: 32rpx;
+      }
       .specialCloseFlag {
         width: 90%;
         height: 100%;

pages/inspectList/inspectList.vue

@@ -96,6 +96,10 @@
                   <text class="p_title">注意事项：</text>
                   <text class="p_info">{{ item.patientDTO ? item.patientDTO.remark : '' }}</text>
                 </view>
+                <view class="page_item_conts_item">
+                  <text class="p_title">医生备注：</text>
+                  <text class="p_info">{{ item.remark }}</text>
+                </view>
               </view>
             </view>
           </view>

pages/patientInformationInfo/patientInformationInfo.vue

@@ -11,7 +11,7 @@
 					<text class="info_h">待检查数</text>
 					<text class="info_b">{{ infoDATA.watingCount }}</text>
 				</view>
-				<view class="bedNum" v-if="infoDATA.careLevel">
+				<view :class="infoDATA.illnessState?'bedNum':'waitingCount'" v-if="infoDATA.careLevel">
 					<text class="info_h">护理等级</text>
 					<text class="info_b">{{ infoDATA.careLevel.name }}</text>
 				</view>
@@ -44,6 +44,9 @@
             <view class="page_item_info_title btn row">
               <view><text :class="{red: !item.yyTime}">预约时间：</text><text>{{ item.yyTime | filterSecondDate }}</text><text v-if="item.reservationNumber">（{{ item.reservationNumber }}）</text><text class="newicon newicon-weibiaoti2010104" @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30"></text></view>
             </view>
+            <view class="page_item_info_title row">
+              <text>医生备注：{{ item.remark }}</text>
+            </view>
             <view class="page_item_info_title row">
               <view>是否紧急：<text :class="{red:item.priority===1||item.priority==='1'}">{{ (item.priority===1||item.priority==='1')?'是':'否' }}</text></view>
               <view>状态：<text v-if="item.inspectState">{{ item.inspectState.name }}</text></view>
@@ -65,7 +68,7 @@
       </view>
     </view>
     <!-- 弹窗 -->
-    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+    <showModel :checkBoxText="models.checkBoxText" :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
     <!-- 弹窗 -->
     <inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1" :yy="currentInspect.yyTime"></inspectRemoveModel>
@@ -143,6 +146,7 @@
             title: "提示",
             content: `您选择<span class="red">${this.infoDATA.patientName || ""}</span>患者<span class="red">${list.length}</span>项检查，是否确认建单？`,
             icon: "warn",
+            checkBoxText: '建单并签到',
             operate: {
               ok: "确定",
               cancel: "取消",
@@ -176,6 +180,7 @@
           title: "提示",
           content: `您即将创建<span class="red">${data.patientName || ""}</span>患者前往<span class="red">${ data.execDept ? data.execDept.dept : "" }</span>进行<span class="red">${data.inspectName || ""}</span>检查，您确认吗？`,
           icon: "warn",
+          checkBoxText: '建单并签到',
           operate: {
             ok: "确定",
             cancel: "取消",
@@ -188,7 +193,46 @@
         this.getInfo(this.infoDATA.patientCode);
       },
       //建单确定
-      ok() {
+      ok(e) {
+        console.log(e)
+        if(e.isCheck){
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          post("/nurse/inspect/inspectCreateCheck", { patientCode: this.options.patientCode }).then((result) => {
+            uni.hideLoading();
+            if (result.status == 200) {
+              // 建单并签到
+              if (!this.SMFlag) {
+                return;
+              }
+              this.SMFlag = false;
+              SM().then((content) => {
+                this.SMFlag = true;
+                
+                this.buildOrderOrSign(content)
+              }).catch(err => {
+                this.SMFlag = true;
+              });
+            } else {
+              this.models.disjunctor = false;
+              this.models = {
+                disjunctor: true,
+                content: result.msg,
+                icon: "error",
+                operate: {
+                  know: "返回",
+                },
+              };
+            }
+          });
+        }else{
+          this.buildOrderOrSign()
+        }
+      },
+      // 建单/建单并签到
+      buildOrderOrSign(content){
         this.models.disjunctor = false;
         let postData = {
           deptId: this.infoDATA.department.id
@@ -206,6 +250,7 @@
             if (obj.length) {
               taskId = obj[0].id;
               let postData = {
+                code: content,
                 workOrder: {
                   sourceId: 4,
                   taskType: {
@@ -238,10 +283,10 @@
                   };
                 }
               })
-
-              post("/api/startOrder", postData).then((res) => {
+        
+              post(content ? "/nurse/inspect/inspectCreateSign" : "/api/startOrder", postData).then((res) => {
                 uni.hideLoading();
-                let msg = res.msg;
+                let msg = res.msg + (content ? ` 扫描内容:${content}` : '');
                 let icon = "error";
                 if (res.status == 200) {
                   msg = "建单成功";
@@ -430,6 +475,7 @@
 			},
 		},
 		onLoad(options) {
+      console.log('options', options);
 			this.options = options;
 			this.getInfo(this.options.patientCode);
 			// #ifdef APP-PLUS

pages/patientInformationList/patientInformationList.vue

@@ -2,11 +2,14 @@
   <view class="patientInformationList">
     <view class="page_tab">
       <view class="page_tab_bar active">
-        <view class="tab_dept">
+        <view class="tab_dept" @click="changeDept">
           {{ currenDept.dept}}
-          <text class="newicon newicon-weibiaoti2010104" @click="changeDept"></text>
+          <text class="newicon newicon-weibiaoti2010104"></text>
         </view>
       </view>
+      <view class="search-box">
+        <mSearch class="search" :mode="2" button="inside" placeholder="请输入关键字" @input="changeInp" v-model="keyword"></mSearch>
+      </view>
     </view>
     <view v-if="zxzData.length == 0" class="zwsj">
       <image class="zwsj-img" mode="widthFix" src="../../static/img/zanwushuju.png"></image>
@@ -58,6 +61,25 @@
                     <text class="p_info">{{ item.remark }}</text>
                   </view>
                 </view>
+                
+                <view class="page_item_conts_item" v-if="item.inspects && item.inspects[0]">
+                  <view class="column">
+                    <text class="p_title">检查项目：</text>
+                    <text class="p_info">{{ item.inspects[0].inspectName }}</text>
+                  </view>
+                </view>
+                
+                <view class="page_item_conts_item" v-if="item.inspects && item.inspects[0]">
+                  <view class="column">
+                    <text class="p_title">检查科室：</text>
+                    <text class="p_info">
+                      <text>{{item.inspects[0].execDept ? item.inspects[0].execDept.dept : '' }}</text>
+                    </text>
+                  </view>
+                  <view class="column" style="flex-shrink: 0;margin-left: 40rpx;">
+                    <text class="p_info">{{ item.sortYytime | yyTimeFilter }}</text>
+                  </view>
+                </view>
               </view>
             </view>
             <view class="page_item_btns">
@@ -87,7 +109,10 @@
   </view>
 </template>
 <script>
+  import mSearch from "@/components/mehaotian-search-revision/mehaotian-search-revision.vue";
   import bigScreen from "../../components/bigScreen/bigScreen.vue";
+  import dayjs from 'dayjs';
+  import debounce from 'lodash-es/debounce';
   import {
     get,
     post,
@@ -98,6 +123,7 @@
   export default {
     data() {
       return {
+        keyword: '',
         selectRadio: [], //单选框选中的数据，第一项是qrcode，第二项是名称
         // 单选框弹窗model
         models4: {
@@ -141,8 +167,49 @@
     },
     components: {
       bigScreen,
+      mSearch,
+    },
+    filters: {
+      // 自定义管道 yyTime
+      yyTimeFilter: function(data) {
+        if (data) {
+          let nDate = null;
+          if (typeof data == 'string') {
+            let arr = data.split(/[-:\s]/);
+            nDate = new Date(
+              arr[0] - 0,
+              arr[1] - 1,
+              arr[2] - 0,
+              arr[3] - 0,
+              arr[4] - 0,
+              0
+            );
+          } else if (typeof data == 'number') {
+            nDate = new Date(data);
+          }
+          const month = (nDate.getMonth() + 1).toString().padStart(2, 0);
+          const date = nDate.getDate().toString().padStart(2, 0);
+          const hour = nDate.getHours().toString().padStart(2, 0);
+          const minute = nDate.getMinutes().toString().padStart(2, 0);
+          return `${month}-${date} ${hour}:${minute}`;
+        } else {
+          return "";
+        }
+      }
     },
     methods: {
+      handleSearch: debounce(function() {
+        this.refresherrefresh();
+      }, 500),
+      //防抖搜索
+      changeInp(event) {
+        this.inputChange(event);
+      },
+      //监听输入
+      inputChange(event) {
+        this.keyword = event.detail ? event.detail.value : event;
+        this.handleSearch();
+      },
       // 获取是否需要选择陪检方式
       getInspectAndPatientTransformSend() {
         const postData = {
@@ -431,6 +498,8 @@
           idx,
           sum: 99999,
           patient: {
+            sortYytime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            keyWord: this.keyword || undefined,
             department: {
               id: this.currenDept.id,
             },
@@ -596,14 +665,21 @@
 
     .page_tab {
       width: 100%;
-      height: 96rpx;
-      display: flex;
+      height: 176rpx;
       position: fixed;
       left: 0;
       top: 0;
       z-index: 999;
+      
+      .search-box {
+        background-color: rgb(242, 242, 242);
+        .search{
+          padding: 10rpx 24rpx;
+        }
+      }
 
       .page_tab_bar {
+        height: 96rpx;
         flex: 1;
         font-size: 30rpx;
         background: #fff;
@@ -666,8 +742,8 @@
     }
 
     .page_items {
-      height: calc(100vh - 164rpx);
-      padding-top: 90rpx;
+      height: calc(100vh - 164rpx - 80rpx);
+      padding-top: 170rpx;
 
       .page_items_scroll {
         height: 100%;

pages/receipt_infopage/receipt_infopage.vue

@@ -345,6 +345,10 @@
 							  <text class="text1">是否送达</text>
 							  <text class="text2">{{ item.inspectState && item.inspectState.value=='3' ? '是':'否'}}</text>
 							</view>
+              <view class="page_item_foot_text">
+                <text class="text1">医生备注</text>
+                <text class="text2">{{ item.remark}}</text>
+              </view>
               <!-- <view class="page_item_foot_text"
                 v-show="item.inspectState.value==1||item.inspectState.value==2||item.inspectState.value==4">
                 <view class="btn" @click.stop="remove(item)">移除</view>
@@ -2376,6 +2380,9 @@
           .page_item_foot_text {
             font-size: 32rpx;
             margin-bottom: 20rpx;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
 
             &:last-of-type {
               margin-bottom: 0;
@@ -2386,8 +2393,10 @@
             }
 
             .text2 {
-              float: right;
+              max-width: 60%;
               font-weight: 700;
+              text-align: justify;
+              line-height: normal;
             }
 
             .btn {

pages/receiptpage/receiptpage.vue

@@ -112,8 +112,7 @@
               <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'inspect'">
                 <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
                 <view>
-                  预约时间 : {{ item.yyTime | yyTimeFilter
-                  }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
+                  预约时间 : {{ item.yyTime | yyTimeFilter}}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
                 <view style="font-weight: bold;">
                   患者信息 : {{ item.patient ? item.patient.patientName : "" }}({{ item.patient ? item.patient.bedNum : "" }})-{{ item.patient ? item.patient.residenceNo : "" }}
@@ -145,8 +144,7 @@
               <view class="page_item_conts" v-else-if="item.taskType.associationType.value == 'patientTransport'">
                 <view v-if="item.overdueTime">{{ item.overdueTime }}前送达</view>
                 <view>
-                  预约时间 : {{ item.yyjdTime | yyTimeFilter
-                  }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
+                  预约时间 : {{ item.yyjdTime | yyTimeFilter }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
                 <view style="font-weight: bold;">
                   患者信息 : {{ item.patient ? item.patient.patientName : "" }}({{ item.patient ? item.patient.bedNum : "" }})-{{ item.patient ? item.patient.residenceNo : "" }}
@@ -214,22 +212,29 @@
                   <text> <text class="End">终</text> 点科室 </text>
                   <text class="text_big" v-for="(dept, i) of item.endDepts" :key="i">{{ dept.dept }}</text>
                 </view>
-                <view class="page_item_cont_title" v-if="item.middleDept&&item.middleDept.length==1 && item.taskType.associationType.value == 'inspect'">
-                  <text> <text class="End">检</text> 查科室 </text>
-                  <text class="text_big" v-for="(dept, i) of item.middleDept" :key="i">{{ dept.dept }}</text>
+                <view class="page_item_cont_title page_item_cont_title_display" v-if="item.middleDept&&item.middleDept.length==1 && item.taskType.associationType.value == 'inspect'">
+                  <view>
+                    <text> <text class="End">检</text> 查科室 </text>
+                    <text class="text_big">{{ item.middleDept[0].dept }}</text>
+                  </view>
+                  <view style="text-align: right;">
+                    {{ item.middleDept[0].yyTime | yyTimeFilter}}
+                  </view>
                 </view>
 								<view class="page_item_cont_title" v-if="item.middleDept&&item.middleDept.length>1 && item.taskType.associationType.value == 'inspect'">
-								  <view v-for="(dept, i) of item.middleDept" :key="i">
-										<text> <text class="End">检</text> 查科室 </text>
-										<text class="text_big" :class="dept.signIn ? 'green': ''">{{ dept.dept }}</text>
+								  <view class="page_item_cont_title_display" v-for="(dept, i) of item.middleDept" :key="i">
+										<view>
+										  <text> <text class="End">检</text> 查科室 </text>
+										  <text class="text_big" :class="dept.signIn ? 'green': ''">{{ dept.dept }}</text>
+										</view>
+                    <view style="text-align: right;">
+                      {{ dept.yyTime | yyTimeFilter}}
+                    </view>
 									</view>
 								</view>
               </view>
             </view>
-            <view v-if="
-                item.taskType.associationType.value == 'inspect' ||
-                item.taskType.associationType.value == 'patientTransport'
-              ">
+            <!-- <view v-if="item.taskType.associationType.value == 'inspect' || item.taskType.associationType.value == 'patientTransport'"> -->
               <!-- 待抢单 -->
               <!-- <text class="red" v-if="item.gdState.value == 2">请扫描患者腕带，或者请扫描科室码</text> -->
               <!-- 待到达 -->
@@ -238,22 +243,22 @@
               <!-- <text class="red" v-if="item.gdState.value == 8">请扫描检查科室码，并扫描患者腕带</text> -->
               <!-- 待送达 -->
               <!-- <text class="red" v-if="item.gdState.value == 5">请扫描终点科室码，并扫描患者腕带</text> -->
-            </view>
-            <view v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingGet'">
+            <!-- </view> -->
+            <!-- <view v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingGet'"> -->
               <!-- 待送达 -->
               <!-- <text class="red" v-if="item.gdState.value == 5">请扫描终点科室二维码</text> -->
-            </view>
-            <view v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingSend'">
+            <!-- </view> -->
+            <!-- <view v-if="item.taskType.associationType.value == 'ordinary' && item.taskType.ordinaryField.value == 'clothingSend'"> -->
               <!-- 待到达 -->
               <!-- <text class="red" v-if="item.gdState.value == 4">请扫描起点科室二维码</text> -->
               <!-- 待送达 -->
               <!-- <text class="red" v-if="item.gdState.value == 5">请扫描终点科室二维码</text> -->
-            </view>
-            <view v-else-if="item.taskType.associationType.value == 'other'">
+            <!-- </view> -->
+            <!-- <view v-else-if="item.taskType.associationType.value == 'other'"> -->
               <!-- 待到达 -->
               <!-- <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 1">可通过扫描科室码或者拍照进行签到</text> -->
               <!-- <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 2">扫描交接人员二维码进行交接</text> -->
-            </view>
+            <!-- </view> -->
             <!-- 如果不是患者陪检，患者转运，其他，万能交接，标本配送，标本轮巡 -->
             <view class="page_item_btn" v-if="
                 selectedLabelSlots == '执行中' &&
@@ -640,7 +645,7 @@
           const minute = nDate.getMinutes().toString().padStart(2, 0);
           return `${month}-${date} ${hour}:${minute}`;
         } else {
-          return "-";
+          return "";
         }
       }
     },
@@ -3579,7 +3584,7 @@
 
                 .page_item_cont_title {
                   height: 100%;
-                  float: left;
+                  // float: left;
                 }
               }
             }

upload/production.js

@@ -1,11 +1,11 @@
 const shell = require('shelljs')
 const path = require('path');
 const config = {
-  ip: "47.113.226.223", // ssh地址
+  ip: "47.115.219.94", // ssh地址
   username: "root", // ssh 用户名
   port: 22,      //端口
   password: "DStech@123", // ssh 密码
-  path: '/home/itsm/project/html2/h5', // 上传地址,删除地址
+  path: '/home/itsm/project/front/h5', // 上传地址,删除地址
   buildPath: '../unpackage/dist/build/h5' // 本地打包后文件地址
 }
 let Client = require('ssh2-sftp-client');