患者扫码信息修改

App.vue

@@ -128,7 +128,7 @@
   }
 
   .footerOtherMargin {
-    margin-bottom: 174rpx !important;
+    padding-bottom: 174rpx !important;
   }
 
   .red {

pages/receipt_infopage/receipt_infopage.vue

@@ -137,15 +137,6 @@
             infoDATA.taskType.associationType.value == 'inspect' ||
             infoDATA.taskType.associationType.value == 'patientTransport'
           ">
-          <text class="text1">床号</text>
-          <text class="text2">{{
-            infoDATA.patient ? infoDATA.patient.bedNum : "-"
-          }}</text>
-        </view>
-        <view class="page_item_foot_text" v-if="
-            infoDATA.taskType.associationType.value == 'inspect' ||
-            infoDATA.taskType.associationType.value == 'patientTransport'
-          ">
           <text class="text1">携带设备</text>
           <text class="text2">{{ infoDATA.goods || "暂无" }}</text>
         </view>
@@ -161,10 +152,39 @@
             infoDATA.taskType.associationType.value == 'patientTransport'
           ">
           <text class="text1">患者姓名</text>
-          <text class="text2">{{ infoDATA.patient.patientName }}({{
-              infoDATA.patient.residenceNo
-            }})</text>
+          <text class="text2">{{ infoDATA.patient.patientName }}
+						<text v-if="infoDATA.patient.residenceNo">
+							({{
+									infoDATA.patient.residenceNo
+								}})
+						</text>
+						<text v-if="!infoDATA.patient.residenceNo">
+							({{
+									infoDATA.patient.cardNo
+								}})
+						</text>
+					</text>
         </view>
+				<view class="page_item_foot_text" v-if="
+						infoDATA.patient.residenceNo && (
+						infoDATA.taskType.associationType.value == 'inspect' ||
+						infoDATA.taskType.associationType.value == 'patientTransport')
+				  ">
+				  <text class="text1">床号</text>
+				  <text class="text2">{{
+				    infoDATA.patient ? infoDATA.patient.bedNum : "-"
+				  }}</text>
+				</view>
+				<view class="page_item_foot_text" v-if="
+						!infoDATA.patient.residenceNo && (
+						infoDATA.taskType.associationType.value == 'inspect' ||
+						infoDATA.taskType.associationType.value == 'patientTransport')
+				  ">
+				  <text class="text1">身份证号</text>
+				  <text class="text2">{{
+				    infoDATA.patient ? infoDATA.patient.identityCardNo : "-"
+				  }}</text>
+				</view>
         <view class="page_item_foot_text" v-if="
             (infoDATA.taskType.associationType.value == 'inspect' ||
             infoDATA.taskType.associationType.value == 'patientTransport')&&infoDATA.patient.careLevel

pages/receiptpage/receiptpage.vue

@@ -116,7 +116,7 @@
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
                 <view>
-                  床号 : {{ item.patient ? item.patient.patientName : "-" }}({{
+                  患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
                     item.patient ? item.patient.bedNum : "-"
                   }})
                 </view>
@@ -160,7 +160,7 @@
                   }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
                 </view>
                 <view>
-                  床号 : {{ item.patient ? item.patient.patientName : "-" }}({{
+                  患者信息 : {{ item.patient ? item.patient.patientName : "-" }}({{
                     item.patient ? item.patient.bedNum : "-"
                   }})
                 </view>

pages/scanning_Result/scanning_Result.vue

@@ -69,15 +69,21 @@
         (res.status == 200 && type == 'inspect') || type == 'patientTransport'
       ">
       <view v-if="res.patient"> 患者姓名 : {{ res.patient || "-" }} </view>
-      <view v-if="res.residenceNo">
-        住院号 : {{ res.residenceNo || "-" }}
+      <view v-if="infoDATA.patientResidenceNo">
+        住院号 : {{ infoDATA.patientResidenceNo || "-" }}
       </view>
+			<view v-if="!infoDATA.patientResidenceNo">
+			  就诊卡号 : {{ infoDATA.patientCardNo || "-" }}
+			</view>
       <view v-if="res.deptName">
         住院科室 : {{ res.deptName !== "undefined" ? res.deptName : "-" }}
       </view>
-      <view v-if="res.bedNum">
-        床号 : {{ res.bedNum !== "undefined" ? res.bedNum : "-" }}
+      <view v-if="infoDATA.patientResidenceNo">
+        床号 : {{ infoDATA.bedNum ? infoDATA.bedNum : "-" }}
       </view>
+			<view v-if="!infoDATA.patientResidenceNo">
+			  身份证号 : {{ infoDATA.patientIdentityCardNo || "-" }}
+			</view>
       <view v-if="res.data">
         检查项目 :
         <text v-for="(data, i) in res.data" :key="i">{{
@@ -944,7 +950,7 @@
       this.RESData = options.resData;
       this.res["status"] = options.status;
       this.res["msg"] = options.msg;
-      console.log(options.patient);
+      console.log('hahhaha',options.patient);
       this.res["patient"] = options.patient;
       this.res["patientCode"] = options.patientCode;
       this.res["deptName"] = options.deptName;

pages/scanning_all/scanning_all.vue

@@ -1075,10 +1075,10 @@
 
         .page_item {
           margin-top: 16rpx;
-          min-height: 356rpx;
+          // min-height: 356rpx;
           background: #fff;
           border-radius: 8rpx;
-          overflow: hidden;
+          overflow-y: auto;
           padding: 0 16rpx;
           border: 2rpx solid #e5e9ed;
 

pages/scanning_code/scanning_code.vue

@@ -177,10 +177,37 @@
             infoDATA.taskType.associationType.value == 'patientTransport'
           ">
           <text class="text1">患者姓名</text>
-          <text class="text2">{{ infoDATA.patient.patientName }}({{
-              infoDATA.patient.residenceNo
-            }})</text>
+          <text class="text2">{{ infoDATA.patient.patientName }}
+						<text v-if="infoDATA.patient.residenceNo">
+							({{
+							    infoDATA.patient.residenceNo
+							  }})
+						</text>
+						<text v-if="!infoDATA.patient.residenceNo">
+							({{
+							    infoDATA.patient.cardNo
+							  }})
+						</text>
+					</text>
         </view>
+				<view class="page_item_foot_text" v-if="
+						!infoDATA.patient.residenceNo && 
+						(infoDATA.taskType.associationType.value == 'inspect' ||
+				    infoDATA.taskType.associationType.value == 'patientTransport')
+				  ">
+				  <text class="text1">身份证号</text>
+				  <text class="text2">{{ infoDATA.patient.identityCardNo }}
+					</text>
+				</view>
+				<view class="page_item_foot_text" v-if="
+						infoDATA.patient.residenceNo && 
+						(infoDATA.taskType.associationType.value == 'inspect' ||
+				    infoDATA.taskType.associationType.value == 'patientTransport')
+				  ">
+				  <text class="text1">床位</text>
+				  <text class="text2">{{ infoDATA.patient.bedNum }}
+					</text>
+				</view>
       </view>
       <!-- 药包 -->
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">

pages/scanning_ins/scanning_ins.vue

@@ -13,12 +13,22 @@
         </view>
         <view class="Scanning_cont">
           <view>
-            <text>患者姓名 : {{ infoDATA.patientName || "-" }}({{
-                infoDATA.bedNum || "-"
-              }})</text>
+            <text>患者姓名 : {{ infoDATA.patientName || "-" }}
+							<text v-if="infoDATA.residenceNo">
+								({{
+								  infoDATA.bedNum || "-"
+								}})
+							</text>
+							<text v-if="!infoDATA.residenceNo">
+								({{
+								  infoDATA.cardNo || "-"
+								}})
+							</text>
+							</text>
             <button @click="getInspectList()">查看检查</button>
           </view>
-          <view>住院号 : {{ infoDATA.residenceNo || "-" }}</view>
+          <view v-if="infoDATA.residenceNo">住院号 : {{ infoDATA.residenceNo || "-" }}</view>
+					<view v-if="!infoDATA.residenceNo">身份证号 : {{ infoDATA.identityCardNo || "-" }}</view>
           <view>住院科室 :
             {{ infoDATA.department ? infoDATA.department.dept : "-" }}
           </view>
@@ -200,7 +210,9 @@
       <view class="foot_btn2" v-if="workData && workData.length > 0 && isShow">
         <!-- <view class="btn1" @click="allStart(typeData)">一键操作</view> -->
         <view class="btn1" @click="getInspectAndPatientTransform(typeData)">一键操作</view>
-        <view class="btn1" @click="scanDept()">送回病房</view>
+        <!-- <view class="btn1" @click="scanDept()">送回病房</view> -->
+				<view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
+				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
         <view class="btn2" @click="showAlert">知道了</view>
       </view>
       <!-- <view class="foot_btn2" v-if="
@@ -212,11 +224,13 @@
         <!-- <view class="btn1" @click="help">{{
           infoDATA.focusPatient == 1 ? "无需帮助" : "需要帮助"
         }}</view> -->
-        <view class="btn3" @click="scanDept()">送回病房</view>
+        <view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
+				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
         <view class="btn3" @click="showAlert">知道了</view>
       </view>
       <view class="foot_btn2" v-if="!isShow">
-        <view class="btn3" @click="scanDept()">送回病房</view>
+				<view class="btn3" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
+				<view class="btn3" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
         <view class="btn3" @click="showAlert">知道了</view>
       </view>
     </view>
@@ -294,6 +308,7 @@
         animationData: {}, //动画
         isShow: true, //是否显示“一键操作”
         currentStartDept: {}, //扫描的起点科室
+				addService:null //是否开启允许追加服务
       };
     },
     methods: {
@@ -544,6 +559,12 @@
           },
         };
       },
+			// 追加服务
+			additional(){
+			  uni.navigateTo({
+			    url: `/pages/outpatient/outpatientEndTaskType/outpatientEndTaskType?model=${encodeURIComponent(JSON.stringify(this.infoDATA))}`,
+			  });
+			},
       // 送回病房-扫描科室
       scanDept() {
         this.isInspectAndPatientTransform = false;
@@ -917,6 +938,41 @@
       //     }
       //   });
       // },
+			// 获取检查页面控制
+			getTaskTypeConfig(){
+			  uni.showLoading({
+			    title: "加载中",
+			    mask: true,
+			  });
+			  post("/simple/data/fetchDataList/taskTypeConfig", {
+			      "idx": 0,
+			      "sum": 10,
+			      "taskTypeConfig": {
+			          "taskTypeDTO": {
+			              "hosId": {
+			                  "id": this.hosId
+			              },
+			              "associationType": {
+			                  "key": "association_types",
+			                  "value": "inspect"
+			              }
+			          }
+			      }
+			  }).then((result) => {
+			    uni.hideLoading();
+			    if (result.status == 200) {
+			      let configs = result.list || [];
+			      if(configs.length){
+			        this.addService = configs[0].addService
+			      }
+			    } else {
+			      uni.showToast({
+			        icon: "none",
+			        title: result.msg || "接口获取数据失败！",
+			      });
+			    }
+			  });
+			}
     },
     onLoad(options) {
       console.log(options);
@@ -928,6 +984,7 @@
       // 送回病房建单 end
       this.hosId = uni.getStorageSync("userData").user.currentHospital.id;
       // this.getWechatFocusSwitch();
+			this.getTaskTypeConfig()
       this.infoDATA = JSON.parse(options.infoDATA);
       console.log(this.infoDATA);
       this.workData = JSON.parse(options.workData);

tools/photograph.js

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