Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/dialysis_api_controller.go

 
 	//透析单
 	dialysisOrder, _ := service.MobileGetSchedualDialysisRecordTen(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	fmt.Println("dialysisOrder----------------", dialysisOrder)
 	if dialysisOrder != nil {
 		if dialysisOrder.FinishNurse > 0 {
 			operatorIDs = append(operatorIDs, dialysisOrder.FinishNurse)

controllers/schedule_api_controller.go

 	ids := strings.Split(patitionIdStr, ",")
 	fmt.Println("patitonStr", ids)
 	schedule_type, _ := c.GetInt64("schedule_type")
+	is_before, _ := c.GetInt64("is_before")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
 	adminInfo := c.GetAdminUserInfo()
 
 	thisTime := time.Now()
+
 	today := thisTime.Format("2006-01-02")
 	if week < 1 || week > 4 {
 		week = 2
 	loc, _ := time.LoadLocation("Local")
 	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
 	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+
 	weekStartPoint := theStarTime.Unix()
 	weekEndPoint := theEndTime.Unix()
-
+	if is_before > 0 {
+		timeLayout := "2006-01-02 15:04:05"
+		loc, _ := time.LoadLocation("Local")
+		theStarTime, _ := time.ParseInLocation(timeLayout, start_time, loc)
+		theEndTime, _ := time.ParseInLocation(timeLayout, end_time, loc)
+		weekStartPoint = theStarTime.Unix()
+		weekEndPoint = theEndTime.Unix()
+	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{

service/patient_service.go

 		return db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("DeviceZone", "org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
-	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1", orgID, no).First(&patient).Error
+	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1 ", orgID, no).First(&patient).Error
 	return
 }