antbuilder/industry/hospitalV2/components/booking-detail/index.js

@@ -69,7 +69,7 @@ Component({
     handleBack() {
       const len = getCurrentPages().length;
       my.navigateBack({
-        delta: len + 1
+        delta: len - 2
       });
     },
 

antbuilder/industry/hospitalV2/components/hospital-project/index.acss

@@ -200,3 +200,11 @@
 .project-container .project-button .project-button-out .a-button-primary.a-button-disabled {
   opacity: 0.4;
 }
+
+.result .am-page-result {
+  height: 50vh !important;
+}
+
+.result .am-page-result .am-page-result-pic{
+  margin: calc(30vh - 200px) auto 0 !important;
+}

antbuilder/industry/hospitalV2/components/hospital-project/index.axml

@@ -50,6 +50,16 @@
       <!-- 选择检查时间 -->
       <select-time setDayTime="{{setDayTime}}" onChange="onCloseTime" timeList="{{timeList}}" />
     </view>
+    <view a:elif="{{ projects.length <= 0 }}" class="result">
+      <page-result 
+        type="empty" 
+        title="暂无医生排班信息" 
+        brief="" 
+        footer="{{footer}}" 
+        onTapLeft="onTapLeft" 
+        onTapRight="onTapRight"
+        class="result" />
+    </view>
     <!-- 流调表 & 预约按钮 -->
     <form onSubmit="onSubmit" onReset="onReset">
       <!-- 流调表 -->
@@ -60,7 +70,7 @@
           <block a:for="{{formList}}">
             <view class="form-section">
               <view class="form-section-title">{{index+1}}. {{item.question}}</view>
-              <radio-group class="form-section-radio" data-index="{{index}}" data-name="{{`${index+1}&${item.correctAnswerId}`}}"
+              <radio-group class="form-section-radio" data-index="{{index}}" data-name="{{`${index+1}&${item.correctAnswerId}`}}" 
                 onChange="onRadioChange" name="{{`${index+1}&${item.correctAnswerId}`}}">
                 <label class="content-item" a:for="{{item.answerList}}" a:for-item="inner">
                   <radio color="#1677ff" value="{{inner.optionItemId}}" />
@@ -85,4 +95,4 @@
   </view>
   <!-- 选择就诊人 -->
   <select-person personIndex="{{personIndex}}" show="{{showPerson}}" onClose="onClosePerson" onChange="onPersonChange" defaultList="{{personList}}" />
-</view>
+</view>

antbuilder/industry/hospitalV2/components/hospital-project/index.js

@@ -108,6 +108,7 @@ Component(
 					hospitalDistrictId,
 				});
 				console.log("query", query);
+        my.showLoading()
 				const projects = await getItemList({
 					hospitalDistrictId,
 					deptCode: deptCodeMap[query.hospitalName],
@@ -118,6 +119,7 @@ Component(
 					formList,
 					questionList: formList,
 				});
+        my.hideLoading()
 			},
 
 			// 选择就诊人部分

antbuilder/industry/hospitalV2/components/hospital-project/index.json

@@ -5,6 +5,7 @@
   "usingComponents": {
     "am-icon": "mini-ali-ui/es/am-icon/index",
     "select-time": "./select-time/index",
-    "select-person": "../hospital-home/select-person/index"
+    "select-person": "../hospital-home/select-person/index",
+    "page-result": "mini-ali-ui/es/page-result/index"
   }
 }

antbuilder/industry/hospitalV2/components/personal-center-head/personalCenterHead.js

@@ -79,6 +79,7 @@ Component(createSubscribe({
      * 切换就诊人
      */
     changeBtn() {
+      console.log('1111111');
       this.setData({
         showPatient: true
       });
@@ -96,13 +97,15 @@ Component(createSubscribe({
       } = this.data;
       const {
         id: patientId,
-        bindCardNum: cardNum
+        bindCardNum: cardNum,
+        hisPatientId
       } = item;
       this.setData({
         showPatient: false,
         cardInfo: { ...cardInfo,
           cardNum,
-          patientId
+          patientId,
+          hisPatientId
         }
       });
       my.showToast({

antbuilder/industry/hospitalV2/components/subscribe-record/record-item/index.acss

@@ -17,6 +17,7 @@
 .hospital-new-component .subscribe-record-item .item-content .header-left {
   display: flex;
   align-items: center;
+  width: 80%;
 }
 .hospital-new-component .subscribe-record-item .item-content .num-type {
   color: #666;
@@ -28,8 +29,12 @@
 .hospital-new-component .subscribe-record-item .item-content .record-name {
   color: #333;
   font-weight: bold;
-  font-size: 34rpx;
+  font-size: 32rpx;
   margin-right: 16rpx;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .hospital-new-component .subscribe-record-item .item-content .status {
   font-size: 28rpx;