提交代码

controllers/his_project_api_controller.go

@@ -1326,6 +1326,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 		temp_p_type = 2
 	}
 
+	sch, _ := service.GetScheduleByDate(adminUserInfo.CurrentOrgId, recordDateTime, patient_id)
 	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId, temp_p_type)
 	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId, "")
 	his, _ := service.GetLastHisPatient(patient_id, adminUserInfo.CurrentOrgId)
@@ -1361,6 +1362,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 		"eles":              eles,
 		"psn_info":          psn_info,
 		"roles":             roles,
+		"sch":               sch,
 	})
 }
 

service/smart_sch.go

@@ -146,7 +146,7 @@ func GetScheduleByZoneAndBed(org_id int64, partitionId int64, bed_id int64, sche
 }
 
 func GetScheduleByDate(org_id int64, schedule_date int64, patient_id int64) (sch models.SmartSchedule, err error) {
-	err = readDb.Model(&models.SmartSchedule{}).Where(" user_org_id = ? AND schedule_date = ? AND status = 1 AND patient_id = ?", org_id, schedule_date, patient_id).First(&sch).Error
+	err = readDb.Model(&models.SmartSchedule{}).Where(" user_org_id = ? AND schedule_date = ? AND status = 1 AND patient_id = ?", org_id, schedule_date, patient_id).Preload("DeviceNumber", "status = 1").First(&sch).Error
 	return
 }
 func SaveSmartSch(sch models.SmartSchedule) {