Browse Source

患者扫码信息修改

maotao 7 months ago
parent
commit
024e834cc1

+ 1 - 1
App.vue

@@ -128,7 +128,7 @@
128 128
   }
129 129
 
130 130
   .footerOtherMargin {
131
-    margin-bottom: 174rpx !important;
131
+    padding-bottom: 174rpx !important;
132 132
   }
133 133
 
134 134
   .red {

+ 32 - 12
pages/receipt_infopage/receipt_infopage.vue

@@ -137,15 +137,6 @@
137 137
             infoDATA.taskType.associationType.value == 'inspect' ||
138 138
             infoDATA.taskType.associationType.value == 'patientTransport'
139 139
           ">
140
-          <text class="text1">床号</text>
141
-          <text class="text2">{{
142
-            infoDATA.patient ? infoDATA.patient.bedNum : "-"
143
-          }}</text>
144
-        </view>
145
-        <view class="page_item_foot_text" v-if="
146
-            infoDATA.taskType.associationType.value == 'inspect' ||
147
-            infoDATA.taskType.associationType.value == 'patientTransport'
148
-          ">
149 140
           <text class="text1">携带设备</text>
150 141
           <text class="text2">{{ infoDATA.goods || "暂无" }}</text>
151 142
         </view>
@@ -161,10 +152,39 @@
161 152
             infoDATA.taskType.associationType.value == 'patientTransport'
162 153
           ">
163 154
           <text class="text1">患者姓名</text>
164
-          <text class="text2">{{ infoDATA.patient.patientName }}({{
165
-              infoDATA.patient.residenceNo
166
-            }})</text>
155
+          <text class="text2">{{ infoDATA.patient.patientName }}
156
+						<text v-if="infoDATA.patient.residenceNo">
157
+							({{
158
+									infoDATA.patient.residenceNo
159
+								}})
160
+						</text>
161
+						<text v-if="!infoDATA.patient.residenceNo">
162
+							({{
163
+									infoDATA.patient.cardNo
164
+								}})
165
+						</text>
166
+					</text>
167 167
         </view>
168
+				<view class="page_item_foot_text" v-if="
169
+						infoDATA.patient.residenceNo && (
170
+						infoDATA.taskType.associationType.value == 'inspect' ||
171
+						infoDATA.taskType.associationType.value == 'patientTransport')
172
+				  ">
173
+				  <text class="text1">床号</text>
174
+				  <text class="text2">{{
175
+				    infoDATA.patient ? infoDATA.patient.bedNum : "-"
176
+				  }}</text>
177
+				</view>
178
+				<view class="page_item_foot_text" v-if="
179
+						!infoDATA.patient.residenceNo && (
180
+						infoDATA.taskType.associationType.value == 'inspect' ||
181
+						infoDATA.taskType.associationType.value == 'patientTransport')
182
+				  ">
183
+				  <text class="text1">身份证号</text>
184
+				  <text class="text2">{{
185
+				    infoDATA.patient ? infoDATA.patient.identityCardNo : "-"
186
+				  }}</text>
187
+				</view>
168 188
         <view class="page_item_foot_text" v-if="
169 189
             (infoDATA.taskType.associationType.value == 'inspect' ||
170 190
             infoDATA.taskType.associationType.value == 'patientTransport')&&infoDATA.patient.careLevel

+ 2 - 2
pages/receiptpage/receiptpage.vue

@@ -116,7 +116,7 @@
116 116
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
117 117
                 </view>
118 118
                 <view>
119
-                  床号 : {{ item.patient ? item.patient.patientName : "-" }}({{
119
+                  患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
120 120
                     item.patient ? item.patient.bedNum : "-"
121 121
                   }})
122 122
                 </view>
@@ -160,7 +160,7 @@
160 160
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
161 161
                 </view>
162 162
                 <view>
163
-                  床号 : {{ item.patient ? item.patient.patientName : "-" }}({{
163
+                  患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
164 164
                     item.patient ? item.patient.bedNum : "-"
165 165
                   }})
166 166
                 </view>

+ 11 - 5
pages/scanning_Result/scanning_Result.vue

@@ -69,15 +69,21 @@
69 69
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'
70 70
       ">
71 71
       <view v-if="res.patient"> 患者姓名 : {{ res.patient || "-" }} </view>
72
-      <view v-if="res.residenceNo">
73
-        住院号 : {{ res.residenceNo || "-" }}
72
+      <view v-if="infoDATA.patientResidenceNo">
73
+        住院号 : {{ infoDATA.patientResidenceNo || "-" }}
74 74
       </view>
75
+			<view v-if="!infoDATA.patientResidenceNo">
76
+			  就诊卡号 : {{ infoDATA.patientCardNo || "-" }}
77
+			</view>
75 78
       <view v-if="res.deptName">
76 79
         住院科室 : {{ res.deptName !== "undefined" ? res.deptName : "-" }}
77 80
       </view>
78
-      <view v-if="res.bedNum">
79
-        床号 : {{ res.bedNum !== "undefined" ? res.bedNum : "-" }}
81
+      <view v-if="infoDATA.patientResidenceNo">
82
+        床号 : {{ infoDATA.bedNum ? infoDATA.bedNum : "-" }}
80 83
       </view>
84
+			<view v-if="!infoDATA.patientResidenceNo">
85
+			  身份证号 : {{ infoDATA.patientIdentityCardNo || "-" }}
86
+			</view>
81 87
       <view v-if="res.data">
82 88
         检查项目 :
83 89
         <text v-for="(data, i) in res.data" :key="i">{{
@@ -944,7 +950,7 @@
944 950
       this.RESData = options.resData;
945 951
       this.res["status"] = options.status;
946 952
       this.res["msg"] = options.msg;
947
-      console.log(options.patient);
953
+      console.log('hahhaha',options.patient);
948 954
       this.res["patient"] = options.patient;
949 955
       this.res["patientCode"] = options.patientCode;
950 956
       this.res["deptName"] = options.deptName;

+ 2 - 2
pages/scanning_all/scanning_all.vue

@@ -1075,10 +1075,10 @@
1075 1075
 
1076 1076
         .page_item {
1077 1077
           margin-top: 16rpx;
1078
-          min-height: 356rpx;
1078
+          // min-height: 356rpx;
1079 1079
           background: #fff;
1080 1080
           border-radius: 8rpx;
1081
-          overflow: hidden;
1081
+          overflow-y: auto;
1082 1082
           padding: 0 16rpx;
1083 1083
           border: 2rpx solid #e5e9ed;
1084 1084
 

+ 30 - 3
pages/scanning_code/scanning_code.vue

@@ -177,10 +177,37 @@
177 177
             infoDATA.taskType.associationType.value == 'patientTransport'
178 178
           ">
179 179
           <text class="text1">患者姓名</text>
180
-          <text class="text2">{{ infoDATA.patient.patientName }}({{
181
-              infoDATA.patient.residenceNo
182
-            }})</text>
180
+          <text class="text2">{{ infoDATA.patient.patientName }}
181
+						<text v-if="infoDATA.patient.residenceNo">
182
+							({{
183
+							    infoDATA.patient.residenceNo
184
+							  }})
185
+						</text>
186
+						<text v-if="!infoDATA.patient.residenceNo">
187
+							({{
188
+							    infoDATA.patient.cardNo
189
+							  }})
190
+						</text>
191
+					</text>
183 192
         </view>
193
+				<view class="page_item_foot_text" v-if="
194
+						!infoDATA.patient.residenceNo && 
195
+						(infoDATA.taskType.associationType.value == 'inspect' ||
196
+				    infoDATA.taskType.associationType.value == 'patientTransport')
197
+				  ">
198
+				  <text class="text1">身份证号</text>
199
+				  <text class="text2">{{ infoDATA.patient.identityCardNo }}
200
+					</text>
201
+				</view>
202
+				<view class="page_item_foot_text" v-if="
203
+						infoDATA.patient.residenceNo && 
204
+						(infoDATA.taskType.associationType.value == 'inspect' ||
205
+				    infoDATA.taskType.associationType.value == 'patientTransport')
206
+				  ">
207
+				  <text class="text1">床位</text>
208
+				  <text class="text2">{{ infoDATA.patient.bedNum }}
209
+					</text>
210
+				</view>
184 211
       </view>
185 212
       <!-- 药包 -->
186 213
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">

+ 64 - 7
pages/scanning_ins/scanning_ins.vue

@@ -13,12 +13,22 @@
13 13
         </view>
14 14
         <view class="Scanning_cont">
15 15
           <view>
16
-            <text>患者姓名 : {{ infoDATA.patientName || "-" }}({{
17
-                infoDATA.bedNum || "-"
18
-              }})</text>
16
+            <text>患者姓名 : {{ infoDATA.patientName || "-" }}
17
+							<text v-if="infoDATA.residenceNo">
18
+								({{
19
+								  infoDATA.bedNum || "-"
20
+								}})
21
+							</text>
22
+							<text v-if="!infoDATA.residenceNo">
23
+								({{
24
+								  infoDATA.cardNo || "-"
25
+								}})
26
+							</text>
27
+							</text>
19 28
             <button @click="getInspectList()">查看检查</button>
20 29
           </view>
21
-          <view>住院号 : {{ infoDATA.residenceNo || "-" }}</view>
30
+          <view v-if="infoDATA.residenceNo">住院号 : {{ infoDATA.residenceNo || "-" }}</view>
31
+					<view v-if="!infoDATA.residenceNo">身份证号 : {{ infoDATA.identityCardNo || "-" }}</view>
22 32
           <view>住院科室 :
23 33
             {{ infoDATA.department ? infoDATA.department.dept : "-" }}
24 34
           </view>
@@ -200,7 +210,9 @@
200 210
       <view class="foot_btn2" v-if="workData && workData.length > 0 && isShow">
201 211
         <!-- <view class="btn1" @click="allStart(typeData)">一键操作</view> -->
202 212
         <view class="btn1" @click="getInspectAndPatientTransform(typeData)">一键操作</view>
203
-        <view class="btn1" @click="scanDept()">送回病房</view>
213
+        <!-- <view class="btn1" @click="scanDept()">送回病房</view> -->
214
+				<view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
215
+				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
204 216
         <view class="btn2" @click="showAlert">知道了</view>
205 217
       </view>
206 218
       <!-- <view class="foot_btn2" v-if="
@@ -212,11 +224,13 @@
212 224
         <!-- <view class="btn1" @click="help">{{
213 225
           infoDATA.focusPatient == 1 ? "无需帮助" : "需要帮助"
214 226
         }}</view> -->
215
-        <view class="btn3" @click="scanDept()">送回病房</view>
227
+        <view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
228
+				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
216 229
         <view class="btn3" @click="showAlert">知道了</view>
217 230
       </view>
218 231
       <view class="foot_btn2" v-if="!isShow">
219
-        <view class="btn3" @click="scanDept()">送回病房</view>
232
+				<view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
233
+				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
220 234
         <view class="btn3" @click="showAlert">知道了</view>
221 235
       </view>
222 236
     </view>
@@ -294,6 +308,7 @@
294 308
         animationData: {}, //动画
295 309
         isShow: true, //是否显示“一键操作”
296 310
         currentStartDept: {}, //扫描的起点科室
311
+				addService:null //是否开启允许追加服务
297 312
       };
298 313
     },
299 314
     methods: {
@@ -544,6 +559,12 @@
544 559
           },
545 560
         };
546 561
       },
562
+			// 追加服务
563
+			additional(){
564
+			  uni.navigateTo({
565
+			    url: `/pages/outpatient/outpatientEndTaskType/outpatientEndTaskType?model=${encodeURIComponent(JSON.stringify(this.infoDATA))}`,
566
+			  });
567
+			},
547 568
       // 送回病房-扫描科室
548 569
       scanDept() {
549 570
         this.isInspectAndPatientTransform = false;
@@ -917,6 +938,41 @@
917 938
       //     }
918 939
       //   });
919 940
       // },
941
+			// 获取检查页面控制
942
+			getTaskTypeConfig(){
943
+			  uni.showLoading({
944
+			    title: "加载中",
945
+			    mask: true,
946
+			  });
947
+			  post("/simple/data/fetchDataList/taskTypeConfig", {
948
+			      "idx": 0,
949
+			      "sum": 10,
950
+			      "taskTypeConfig": {
951
+			          "taskTypeDTO": {
952
+			              "hosId": {
953
+			                  "id": this.hosId
954
+			              },
955
+			              "associationType": {
956
+			                  "key": "association_types",
957
+			                  "value": "inspect"
958
+			              }
959
+			          }
960
+			      }
961
+			  }).then((result) => {
962
+			    uni.hideLoading();
963
+			    if (result.status == 200) {
964
+			      let configs = result.list || [];
965
+			      if(configs.length){
966
+			        this.addService = configs[0].addService
967
+			      }
968
+			    } else {
969
+			      uni.showToast({
970
+			        icon: "none",
971
+			        title: result.msg || "接口获取数据失败!",
972
+			      });
973
+			    }
974
+			  });
975
+			}
920 976
     },
921 977
     onLoad(options) {
922 978
       console.log(options);
@@ -928,6 +984,7 @@
928 984
       // 送回病房建单 end
929 985
       this.hosId = uni.getStorageSync("userData").user.currentHospital.id;
930 986
       // this.getWechatFocusSwitch();
987
+			this.getTaskTypeConfig()
931 988
       this.infoDATA = JSON.parse(options.infoDATA);
932 989
       console.log(this.infoDATA);
933 990
       this.workData = JSON.parse(options.workData);

+ 1 - 1
tools/photograph.js

@@ -69,7 +69,7 @@ export function photographTool(data, deptObj) {
69 69
                           "code": result.patientBarCode,
70 70
                           "ids": [id_seimin]
71 71
                         }).then(result1 => {
72
-                          console.log(result1);
72
+                          console.log('result1=====',result1);
73 73
                           uni.hideLoading();
74 74
                           if (result1.status == 200) {
75 75
                             uni.showToast({