签到时住院患者不判断是否收费

Laravel/app/Http/Controllers/API/Admin/YeWu/PlanModelController.php

@@ -49,9 +49,13 @@ class PlanModelController extends Controller
 
         $count = $list;
         $count = $count->count();
+        //按诊室排序
+        $list = $list->orderBy('s_source_roster.resources_id');
+        //按星期排序
         $list=$list->orderByRaw(DB::raw(
             "FIELD(`weekname`, '星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日') ASC"
         ));
+
         $list = $list->orderBy('s_source_roster.begin_time')->get();
         $ids = [];
         foreach ($list as $key => $value) {
@@ -120,7 +124,7 @@ class PlanModelController extends Controller
                 'status' => $planInfo['status'],
                 'adduser' => $userid,
             ];
-            if($planInfo['end_reservation_time']>$planInfo['end_time']) return \Yz::echoError1('截止时间不能超过结束时间');
+            if($planInfo['end_reservation_time']>$planInfo['end_time']) return \Yz::echoError1('停止预约时间不能超过结束时间');
 
             //判断记录是否存在
             $is_ex = DB::table('s_source_roster')->where([

Laravel/app/Http/Controllers/API/Admin/YeWu/SignInController.php

@@ -23,7 +23,7 @@ class SignInController extends Controller
         foreach ($mainInfos as $key=>$mainInfo){
                 //判断状态
                 if($mainInfo->list_status<>1) return \Yz::echoError1($mainInfo->entrust.' 不是预约状态，不可签到');
-                if($mainInfo->is_pay<>1) return \Yz::echoError1($mainInfo->entrust.' 未支付，不可签到');
+                if($mainInfo->patient_type<>0 and $mainInfo->is_pay<>1) return \Yz::echoError1($mainInfo->entrust.' 未支付，不可签到');
                 if($mainInfo->is_nullify<>0) return \Yz::echoError1($mainInfo->entrust.' 已作废，不可签到');
                 //判断时间,当前判断只要是当天就可签到
                 $now=date('Y-m-d');
@@ -152,7 +152,6 @@ class SignInController extends Controller
         foreach ($mainInfos as $key=>$mainInfo) {
             //判断状态
             if ($mainInfo->list_status <> 2) return \Yz::echoError1($mainInfo->entrust . ' 不是 已签到 状态，不可取消签到');
-            if ($mainInfo->is_pay <> 1) return \Yz::echoError1($mainInfo->entrust . ' 未支付，不可取消签到');
             if ($mainInfo->is_nullify <> 0) return \Yz::echoError1($mainInfo->entrust . ' 已作废，不可取消签到');
         }
         //如果以上都通过，调用盈谷接口进行取消签到

YiJi-admin/src/views/AppointmentMngr/PlanModel.vue

@@ -43,7 +43,7 @@
 				<el-button type="success" @click="CreatedPlanClick()" style="margin-left: 20px;">生成选中的计划</el-button>
 			</el-row>
 		</div>
-		<el-table :data="tableData" style="width: 100%;" row-key="id" v-loading="loading"
+		<el-table :data="tableData" :span-method="arraySpanMethod" border style="width: 100%;" row-key="id" v-loading="loading"
 			@selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" />
 			<el-table-column prop="id" label="Id" width="70" />
@@ -670,7 +670,47 @@
 			PlanInfo.value.xingqi=[]
 		}
 	}
+	//合并显示
+			  let bb_countRowspan=1;
+    const arraySpanMethod=({
+		 row,
+		  column,
+		  rowIndex,
+		  columnIndex,
+	})=>{
  
+		  const  fields =['weekname']
+		  const cellValue =row[column.property]
+		  let countRowspan=1
+
+		  if(cellValue && fields.includes(column.property)){
+			  const prevRow = tableData.value[rowIndex-1]
+			  let nextRow=tableData.value[rowIndex+1]
+			  if(prevRow&& prevRow[column.property]=== cellValue && prevRow.declareRegion == row.declareRegion){
+			bb_countRowspan=countRowspan
+						return {rowspan:0,colspan:0}				  
+				
+				 
+			  }else{
+				  while(nextRow && nextRow[column.property]===cellValue && nextRow.declareRegion==row.declareRegion){
+					   nextRow=tableData.value[++countRowspan+rowIndex]
+				  }
+				  if(countRowspan>1){
+					bb_countRowspan=countRowspan
+					return {rowspan:countRowspan,colspan:1}
+
+				  }
+			  }
+			  
+		  }
+		  if (columnIndex === 3) {
+			  if(bb_countRowspan>1){
+				  return {rowspan:bb_countRowspan,colspan:1}
+			  }else{
+				  return {rowspan:0,colspan:0}	
+			  }
+		  }
+	}
 	onMounted(() => {
 		GetList()
 		GetDepartmentEnableList()