患者信息修改

components/smallScreen/smallScreen.vue

@@ -157,7 +157,6 @@
         if (this.currentCode) {
           let gdStateValue = data.gdState.value; //工单状态value
           let associationTypeValue = data.taskType.associationType.value; //关联类型value
-          
           // 患者陪检，并且工单状态是待到达
           if (
             gdStateValue == "4" &&
@@ -222,10 +221,12 @@
             console.log(this.selectRadio)
             list.inspectMode = this.selectRadio.length > 0 ? this.selectRadio[0] : undefined;
           }
+					console.log('type=====>',type)
           post("/workerOrder/" + type, list).then((res) => {
             uni.hideLoading();
             if (res) {
               if (res.status == 200) {
+								
                 if (gdStateValue == "4" && associationTypeValue == "other") {
                   uni.navigateTo({
                     url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,

manifest.json

@@ -73,9 +73,9 @@
         "router" : {
             // 正常打包目录
             "base" : "/app/"
-            // 宜昌打包目录
-            // "base" : "/dstechbh/app/"
         },
+        // 宜昌打包目录
+        // "base" : "/dstechbh/app/"
         "optimization" : {
             "treeShaking" : {
                 "enable" : true

pages/receipt_infopage/receipt_infopage.vue

@@ -137,6 +137,19 @@
             infoDATA.taskType.associationType.value == 'inspect' ||
             infoDATA.taskType.associationType.value == 'patientTransport'
           ">
+          <text class="text1" v-if="infoDATA.patient.residenceNo">床号</text>
+          <text class="text2" v-if="infoDATA.patient.residenceNo">{{
+            infoDATA.patient ? infoDATA.patient.bedNum : "-"
+          }}</text>
+					<text class="text1" v-if="!infoDATA.patient.residenceNo">身份证号</text>
+					<text class="text2" v-if="!infoDATA.patient.residenceNo">{{
+					  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'
+          ">
           <text class="text1">携带设备</text>
           <text class="text2">{{ infoDATA.goods || "暂无" }}</text>
         </view>
@@ -155,8 +168,8 @@
           <text class="text2">{{ infoDATA.patient.patientName }}
 						<text v-if="infoDATA.patient.residenceNo">
 							({{
-									infoDATA.patient.residenceNo
-								}})
+							    infoDATA.patient.residenceNo
+							  }})
 						</text>
 						<text v-if="!infoDATA.patient.residenceNo">
 							({{
@@ -165,26 +178,6 @@
 						</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/scanning_Result/scanning_Result.vue

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

pages/scanning_code/scanning_code.vue

@@ -177,37 +177,10 @@
             infoDATA.taskType.associationType.value == 'patientTransport'
           ">
           <text class="text1">患者姓名</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>
+          <text class="text2">{{ infoDATA.patient.patientName }}({{
+              infoDATA.patient.residenceNo
+            }})</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

@@ -29,7 +29,7 @@
           </view>
           <view v-if="infoDATA.residenceNo">住院号 : {{ infoDATA.residenceNo || "-" }}</view>
 					<view v-if="!infoDATA.residenceNo">身份证号 : {{ infoDATA.identityCardNo || "-" }}</view>
-          <view>住院科室 :
+          <view v-if="infoDATA.residenceNo">住院科室 :
             {{ infoDATA.department ? infoDATA.department.dept : "-" }}
           </view>
         </view>
@@ -209,11 +209,11 @@
 
       <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" :class="(!infoDATA.residenceNo && addService==0)?'btn5':''" @click="getInspectAndPatientTransform(typeData)">一键操作</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 class="btn1" v-if="infoDATA.residenceNo" @click="scanDept()">送回病房</view>
+				<view class="btn1" v-if="!infoDATA.residenceNo && addService==1" @click="additional()">追加服务</view>
+        <view class="btn2" :class="(!infoDATA.residenceNo && addService==0)?'btn5':''" @click="showAlert">知道了</view>
       </view>
       <!-- <view class="foot_btn2" v-if="
           workData && workData.length === 0 && isShow && wechatFocusSwitch == 1
@@ -226,12 +226,12 @@
         }}</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 class="btn3" :class="(!infoDATA.residenceNo && addService==0)?'btn4':''" @click="showAlert">知道了</view>
       </view>
       <view class="foot_btn2" v-if="!isShow">
 				<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 class="btn3" :class="(!infoDATA.residenceNo && addService==0)?'btn4':''" @click="showAlert">知道了</view>
       </view>
     </view>
     <!-- 弹窗 -->
@@ -1463,6 +1463,12 @@
           margin-top: 16rpx;
           text-align: center;
         }
+				.btn4{
+					width: 100% !important;
+				}
+				.btn5{
+					width: 48% !important;
+				}
       }
     }
   }