南京中医药问题整改

components/handViewDrugsBag/handViewDrugsBag.vue

@@ -10,7 +10,7 @@
             {{name}}：
           </view>
           <view class="uni-list-cell-db">
-            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name" v-model="account"
+            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name" placeholder-style="text-align:left;" v-model="account"
               @input="bindPickerChange($event)" />
           </view>
         </view>
@@ -117,7 +117,7 @@
         type: Object,
         default: () => {
           return {
-            ok: "确认",
+            ok: "确定",
             cancel: "取消",
           };
         },
@@ -196,7 +196,7 @@
     z-index: 999;
 
     .uni-list-cell {
-      width: 90%;
+      width: 100%;
       display: flex;
       flex-direction: row;
       justify-content: space-evenly;
@@ -205,16 +205,18 @@
       margin-top: 32rpx;
 
       .uni-list-cell-left {
-        flex: 3;
         font-size: 32rpx;
         color: #666;
+        text-align: left;
+        padding-left: 24rpx;
       }
 
       .uni-list-cell-db {
         border: 1px solid #e5e9ed;
         background-color: #fff;
-        padding: 16rpx 0;
-        flex: 5;
+        padding: 16rpx;
+        flex: 1;
+        margin-right: 24rpx;
       }
 
       .uni-list-cell-db-text {

components/uni-datetime-picker/uni-datetime-picker.vue

@@ -836,7 +836,7 @@
 		overflow: hidden;
 		flex: 1;
 		line-height: 1;
-		font-size: 14px;
+		font-size: 12px;
 		height: 35px;
 		display: flex;
 		align-items: center;

main.js

@@ -46,6 +46,14 @@ Vue.filter('formatDate', function(timestamp, format){
     return '';
   }
 })
+// 日期过滤器（去掉秒）
+Vue.filter('filterSecondDate', function(dateStr){
+  if(dateStr && dateStr.length === 19){
+    return dateStr.slice(0, -3);
+  }else{
+    return dateStr;
+  }
+})
 App.mpType = 'app'
 
 const app = new Vue({

pages/patientInformationInfo/patientInformationInfo.vue

@@ -1,17 +1,16 @@
 <template>
 	<view class="patientInformationInfo" v-if="Object.keys(infoDATA).length > 0">
 		<view class="page_head">
-			<view class="title">{{ infoDATA.patientName }}</view>
-			<view class="patientCode">{{ infoDATA.residenceNo }}</view>
+			<view class="title">{{ infoDATA.patientName }}<text class="patientCode">{{ infoDATA.residenceNo }}</text></view>
 			<view class="info">
-				<view class="bedNum">
+				<view :class="(infoDATA.careLevel || infoDATA.illnessState)?'bedNum':'waitingCount'">
 					<text class="info_h">床号</text>
-					<text class="info_b">{{ infoDATA.bedNum || "-" }}</text>
+					<text class="info_b">{{ infoDATA.bedNum }}</text>
 				</view>
-				<view :class="infoDATA.careLevel?'bedNum':'waitingCount'">
+				<!-- <view :class="(infoDATA.careLevel || infoDATA.illnessState)?'bedNum':'waitingCount'">
 					<text class="info_h">待检查数</text>
 					<text class="info_b">{{ infoDATA.watingCount }}</text>
-				</view>
+				</view> -->
 				<view class="bedNum" v-if="infoDATA.careLevel">
 					<text class="info_h">护理等级</text>
 					<text class="info_b">{{ infoDATA.careLevel.name }}</text>
@@ -22,26 +21,45 @@
 				</view>
 			</view>
 		</view>
-		<view class="page_item" v-for="item in infoDATA.inspects" :key="item.id">
-			<view class="page_item_info">
-				<view class="page_item_info_title">检查项目：<text>{{ item.inspectName || "-" }}</text></view>
-				<view class="page_item_info_title">检查科室：<text>{{
-            item.execDept ? item.execDept.dept : "-"
-          }}</text></view>
-				<view class="page_item_info_title btn">预约时间：<text>{{ item.yyTime || "-" }}</text><button
-						@click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30">修改</button></view>
-				<view class="page_item_info_title">预约叫号：<text>{{ item.reservationNumber || "-" }}</text></view>
-				<view class="page_item_info_title">是否紧急：<text
-						:class="{red:item.priority===1||item.priority==='1'}">{{ (item.priority===1||item.priority==='1')?'是':'否' }}</text>
-				</view>
-			</view>
-		</view>
-		<view v-if="!infoDATA.inspects || infoDATA.inspects.length == 0" class="zwsj">
+    <scroll-view v-if="!isEmpty" scroll-y class="scrollContent">
+      <view class="page_item" v-for="(inspects, key, index) in infoDATA.inspectListMap" :key="key">
+        <view class="splitLine">
+          <view class="splitLineFlex">
+            <view class="splitLineBox"></view>
+          </view>
+          <view>{{key}}</view>
+          <view class="splitLineFlex">
+            <view class="splitLineBox"></view>
+          </view>
+        </view>
+        <view class="page_item_info" :class="{mt0: i === 0}" v-for="(item, i) in inspects" :key="item.id">
+          <view class="page_item_info_title">检查项目：<text>{{ item.inspectName }}</text></view>
+          <view class="page_item_info_title">检查科室：<text>{{ item.execDept ? item.execDept.dept : "" }}</text></view>
+          <view class="page_item_info_title btn row">
+            <view>预约时间：<text>{{ item.yyTime | filterSecondDate }}</text><text v-if="item.reservationNumber">（{{ item.reservationNumber }}）</text></view>
+            <button @click="changeYyTime(item)" v-if="item.inspectState.value == 1 || item.inspectState.value == 30">修改</button>
+          </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>
+          </view>
+          <view class="buildOrder" @click="build(item)" v-if="!item.gdId&&(item.inspectState.value==1||item.inspectState.value==30)">建单</view>
+        </view>
+      </view>
+    </scroll-view>
+		<view v-if="isEmpty" class="zwsj">
 			<image class="zwsj-img" mode="widthFix" src="../../static/img/zanwushuju.png"></image>
 			<view class="zwsj-txt">暂无检查信息</view>
 		</view>
+    <view class="toolbar" @click="Scanning()">
+      <text class="toolbar-icon newicon newicon-saoma"></text>
+      <text class="toolbar-sao">扫一扫</text>
+    </view>
 		<!-- 弹窗 -->
 		<inspectRemoveModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content" @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1"></inspectRemoveModel>
+    <!-- 弹窗 -->
+    <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>
@@ -54,15 +72,152 @@
 	export default {
 		data() {
 			return {
+        SMFlag: true,
+        isEmpty: true,
 				options: {},
 				infoDATA: {},
 				// 弹窗model1
 				models1: {
 				  disjunctor: false,
 				},
+        // 建单的对象
+        jdItem: {},
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+        //当前登录人所属科室
+        currenDept: uni.getStorageSync("userData").user.dept,
 			};
 		},
 		methods: {
+      // 建单
+      build(data) {
+        console.log(data);
+        this.jdItem = data;
+        this.models = {
+          disjunctor: true,
+          title: "提示",
+          content: `您即将创建【${data.patientName || ""}】患者前往【${
+          data.execDept ? data.execDept.dept : ""
+        }】进行【${data.inspectName || ""}】检查，您确认吗？`,
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      //建单后知道了
+      know() {
+        this.models.disjunctor = false;
+        this.getInfo(this.jdItem.patientCode);
+      },
+      //建单确定
+      ok() {
+        this.models.disjunctor = false;
+        let postData = {
+          deptId: this.currenDept.id
+        };
+        let taskId;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/nurse/getDeptTaskType", postData).then((result) => {
+          if (result.status == 200) {
+            let obj = result.data.allTaskTypes.filter(
+              (item) => item.associationType.value == "inspect"
+            );
+            if (obj.length) {
+              taskId = obj[0].id;
+              let postData = {
+                workOrder: {
+                  sourceId: 4,
+                  taskType: {
+                    id: taskId,
+                    isHalfInspect: obj[0].isHalfInspect === 1 ? 1 : 0
+                  },
+                  createDept: this.currenDept.id,
+                  startDept: {
+                    id: this.currenDept.id
+                  },
+                  patient: {
+                    patientCode: this.jdItem.patientCode
+                  },
+                  checkList: [{
+                    id: this.jdItem.id
+                  }],
+                  goods: "",
+                  worker: {
+                    id: uni.getStorageSync("userData").user.id
+                  },
+                  workerStartOrderFlag: 1,
+                },
+              };
+              //根据检查的紧急度加急
+              if (this.jdItem.priority === 1 || this.jdItem.priority === '1') {
+                postData.workOrder["urgentDetails"] = {
+                  checkStatus: {
+                    id: 329
+                  },
+                  urgentReason: '系统根据检查信息，自动进行加急',
+                };
+              }
+              post("/api/startOrder", postData).then((res) => {
+                uni.hideLoading();
+                let msg = res.msg;
+                let icon = "error";
+                if (res.status == 200) {
+                  msg = "建单成功";
+                  icon = "success";
+                }
+                this.models = {
+                  disjunctor: true,
+                  content: msg,
+                  icon: icon,
+                  operate: {
+                    know: "知道了",
+                  },
+                };
+              });
+            } else {
+              uni.hideLoading();
+              this.models = {
+                disjunctor: true,
+                content: "建单失败,科室未开通！",
+                icon: "error",
+                operate: {
+                  know: "知道了",
+                },
+              };
+            }
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: result.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //建单取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
+      // 扫一扫
+      Scanning(qrcodePrefix = '') {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
+        SM().then((content) => {
+          this.SMFlag = true;
+          this.getInfo(content);
+        }).catch(err => {
+          this.SMFlag = true;
+        });
+      },
 			// 修改预约时间->知道了
 			know1() {
 			  this.models1.disjunctor = false;
@@ -136,16 +291,8 @@
 				}).then((res) => {
 					uni.hideLoading();
 					if (res.status == 200) {
-						if (res.data.inspects && Array.isArray(res.data.inspects)) {
-							res.data.inspects = res.data.inspects.map(v => {
-								if (v.yyTime) {
-									let [date, time] = v.yyTime.split(" ");
-									v.yyTime = new Date(date).Format('yyyy-MM-dd') + " " + time.slice(0, -
-										3);
-								}
-								return v;
-							})
-						}
+            res.data.inspectListMap = res.data.inspectListMap || {};
+            this.isEmpty = Object.keys(res.data.inspectListMap).length === 0;
 						this.infoDATA = res.data;
 					} else {
 						uni.showToast({
@@ -166,13 +313,42 @@
 			webHandle("no", "wx");
 			// #endif
 		},
+    onShow() {
+      this.SMFlag = true;
+    }
 	};
 </script>
-<style lang="less">
+<style lang="less" scoped>
+  .toolbar {
+    margin-bottom: 16rpx;
+    z-index: 999;
+    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: #07863c;
+    }
+  
+    .toolbar-sao {
+      font-size: 36rpx;
+      color: #333;
+    }
+  }
 	.patientInformationInfo {
-		padding: 0 20rpx;
-
+    background-color: #F7F7F7;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
 		.zwsj {
+      flex: 1;
+      min-height: 0;
 			text-align: center;
 
 			.zwsj-img {
@@ -186,7 +362,7 @@
 				text-align: center;
 			}
 		}
-
+    
 		.page_head {
 			background-color: #49b856;
 			color: #fff;
@@ -198,9 +374,8 @@
 			}
 
 			.patientCode {
-				padding-bottom: 12rpx;
+				margin-left: 12rpx;
 				font-size: 28rpx;
-				text-align: center;
 			}
 
 			.info {
@@ -245,20 +420,58 @@
 			}
 		}
 
+    .scrollContent{
+      flex: 1;
+      min-height: 0;
+    }
 		.page_item {
-			margin-top: 16rpx;
-			margin-bottom: 16rpx;
-			background: #fff;
+			// margin-bottom: 10rpx;
 			border-radius: 8rpx;
 			overflow: hidden;
-			padding: 0 16rpx;
-			border: 2rpx solid #e5e9ed;
+      
+      .splitLine{
+        height: 50rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #8F8F8F;
+        .splitLineFlex{
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .splitLineBox{
+            width: calc(100% - 48rpx);
+            height: 1rpx;
+            background-color: #8F8F8F;
+          }
+        }
+      }
 
 			.page_item_info {
+        margin-top: 10rpx;
 				padding: 20rpx 16rpx;
 				text-align: left;
 				line-height: 60rpx;
 				font-size: 30rpx;
+        background: #fff;
+        
+        &.mt0{
+          margin-top: 0;
+        }
+        
+        .buildOrder{
+          width: 258rpx;
+          height: 72rpx;
+          background: #49B856;
+          border-radius: 6rpx;
+          margin: 0 auto;
+          color: #FFFFFF;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 30rpx;
+        }
 
 				.page_item_info_title {
 					font-weight: 700;
@@ -273,6 +486,11 @@
 							margin: 0;
 						}
 					}
+          &.row{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          }
 
 					text {
 						font-weight: normal;

pages/receipt_infopage/receipt_infopage.vue

@@ -355,7 +355,7 @@
       <!-- 如果不是静配，药配，标本配送,标本轮巡,万能交接 -->
       <template
         v-if="((!infoDATA.worker)||(infoDATA.worker&&infoDATA.worker.id == currentUserId))&&infoDATA.gdState.value != 6&&infoDATA.gdState.value != 7&&infoDATA.gdState.value != 11">
-        <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
+        <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
           (hideInspectScan != 1 || (hideInspectScan == 1 && infoDATA.gdState.value == 4)) &&
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
@@ -366,15 +366,15 @@
           !(infoDATA.taskType.associationType.value == 'other' && (infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].actionsSwitch || infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch))
         " hover-class="seimin-btn-hover">
           <smallScreen :sData="infoDATA" :sType="1">扫码</smallScreen>
-        </view>
+        </view> -->
         <!-- 其他临床服务-完成工单-待到达 -->
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">确认到达</view>
         <!-- 其他临床服务-完成工单-待送达 -->
         <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 5 && infoDATA.taskType.carryingCourses[1].actionsSwitch" class="btn2 page_item_btn" @click="otherCompleteOrder(infoDATA)" hover-class="seimin-btn-hover">完成工单</view>
         <!-- 其他临床服务-拍照 -->
-        <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].photoSwitch" class="btn2 page_item_btn" @click="photographToOther(infoDATA, 'start')" hover-class="seimin-btn-hover">拍照</view>
+        <!-- <view v-if="infoDATA.taskType.associationType.value == 'other' && infoDATA.gdState.value == 4 && infoDATA.taskType.carryingCourses[0].photoSwitch" class="btn2 page_item_btn" @click="photographToOther(infoDATA, 'start')" hover-class="seimin-btn-hover">拍照</view> -->
 
-        <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
+        <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
           infoDATA.taskType.associationType.value != 'jPBag' &&
           infoDATA.taskType.associationType.value != 'drugsBag' &&
           infoDATA.taskType.associationType.value != 'specimen' &&
@@ -382,7 +382,7 @@
           infoDATA.taskType.associationType.value != 'other' &&
           infoDATA.taskType.associationType.value != 'ordinary' &&
           infoDATA.gdState.value == 4
-        " hover-class="seimin-btn-hover">拍照</view>
+        " hover-class="seimin-btn-hover">拍照</view> -->
         <view class="btn3" @click="specialCloseClick()" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
@@ -394,7 +394,7 @@
         " hover-class="seimin-btn-hover">特殊情况关闭</view>
       </template>
       <!-- 如果不是患者陪检或患者转运或其他,万能交接 -->
-      <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
+      <!-- <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'patientTransport' &&
           infoDATA.taskType.associationType.value != 'inspect' &&
@@ -402,7 +402,7 @@
           infoDATA.taskType.associationType.value != 'ordinary'
         " hover-class="seimin-btn-hover">
         <smallScreen :sData="infoDATA" :sType="2">扫码</smallScreen>
-      </view>
+      </view> -->
       <!-- 如果是万能交接 -->
       <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']"
         v-if="infoDATA.taskType.associationType.value == 'ordinary'"

pages/receiptpage/receiptpage.vue

@@ -119,7 +119,7 @@
                   预约时间 : {{ item.yyTime | yyTimeFilter
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
-                <view>
+                <view style="font-weight: bold;">
                   患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
                     item.patient ? item.patient.bedNum : "-"
                   }})
@@ -163,7 +163,7 @@
                   预约时间 : {{ item.yyjdTime | yyTimeFilter
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
-                <view>
+                <view style="font-weight: bold;">
                   患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
                     item.patient ? item.patient.bedNum : "-"
                   }})

pages/scanning_ins/scanning_ins.vue

@@ -24,8 +24,7 @@
 								  infoDATA.cardNo || "-"
 								}})
 							</text>
-							</text>
-            <button @click="getInspectList()">查看检查</button>
+            </text>
           </view>
           <view v-if="infoDATA.residenceNo">住院号 : {{ infoDATA.residenceNo || "-" }}</view>
 					<view v-if="!infoDATA.residenceNo">身份证号 : {{ infoDATA.identityCardNo || "-" }}</view>
@@ -207,7 +206,8 @@
       </view>
 
       <view class="foot_btn1" v-if="infoDATA.residenceNo && batchCreationAndReturn == 1">
-				<view class="btn1 btn4" @click="scanDept('all')">批量送回病房</view>
+				<view class="btn3" @click="scanDept('all')">批量送回病房</view>
+				<view class="btn3" @click="getInspectList()">查看检查</view>
       </view>
       <view class="foot_btn2" v-if="workData && workData.length > 0 && isShow">
         <view class="btn1" :class="(!infoDATA.residenceNo && addService==0)?'btn5':''" @click="getInspectAndPatientTransform(typeData)">一键操作</view>
@@ -663,13 +663,17 @@
       },
       // 查看检查
       getInspectList() {
+        // uni.navigateTo({
+        //   url: `../inspectList/inspectList?id=${this.infoDATA.department.id}&dept=${this.infoDATA.department.dept}&patientCode=${this.infoDATA.patientCode}`,
+        // });
         uni.navigateTo({
-          url: `../inspectList/inspectList?id=${this.infoDATA.department.id}&dept=${this.infoDATA.department.dept}&patientCode=${this.infoDATA.patientCode}`,
+          url: `../patientInformationInfo/patientInformationInfo?patientCode=${this.infoDATA.patientCode}`,
         });
       },
       // 通知
       notice(info) {
         let postData = {
+          wechatConfigType: "hsms",
           userIds: info.worker.id + "",
           content: `您负责护送的患者${info.patient.patientName}(${info.patient.bedNum})已经检查完毕，请尽快执行工单的下一步。`,
         };
@@ -1441,33 +1445,19 @@
         justify-content: space-between;
 
         .btn1,
-        .btn2 {
+        .btn2,
+        .btn3,
+        .btn4,
+        .btn5 {
           height: 66rpx;
-          width: 32%;
+          flex: 1;
           background-image: linear-gradient(to right, #72c172, #3bb197);
           color: #fff;
           border-radius: 8rpx;
           font-size: 32rpx;
-          margin-top: 16rpx;
+          margin: 16rpx 1% 0;
           text-align: center;
         }
-
-        .btn3 {
-          height: 66rpx;
-          width: 48%;
-          background-image: linear-gradient(to right, #72c172, #3bb197);
-          color: #fff;
-          border-radius: 8rpx;
-          font-size: 32rpx;
-          margin-top: 16rpx;
-          text-align: center;
-        }
-				.btn4{
-					width: 100% !important;
-				}
-				.btn5{
-					width: 48% !important;
-				}
       }
       .foot_btn2 {
         position: fixed;
@@ -1481,33 +1471,19 @@
         justify-content: space-between;
 
         .btn1,
-        .btn2 {
+        .btn2,
+        .btn3,
+        .btn4,
+        .btn5 {
           height: 66rpx;
-          width: 32%;
+          flex: 1;
           background-image: linear-gradient(to right, #72c172, #3bb197);
           color: #fff;
           border-radius: 8rpx;
           font-size: 32rpx;
-          margin-top: 16rpx;
-          text-align: center;
-        }
-
-        .btn3 {
-          height: 66rpx;
-          width: 48%;
-          background-image: linear-gradient(to right, #72c172, #3bb197);
-          color: #fff;
-          border-radius: 8rpx;
-          font-size: 32rpx;
-          margin-top: 16rpx;
+          margin: 16rpx 1% 0;
           text-align: center;
         }
-				.btn4{
-					width: 100% !important;
-				}
-				.btn5{
-					width: 48% !important;
-				}
       }
     }
   }