体积小

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -398,14 +398,14 @@ func (this *XcxApiController) GetMobileSchedule() {
 		return
 	}
 
-	receiverTreatmentAccess, getRTARErr := service.MobileGetReceiverTreatmentAccessRecordOne(info.UserOrgId, patientID)
+	receiverTreatmentAccess, getRTARErr := service.MobileGetReceiverTreatmentAccessRecordOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getRTARErr != nil {
 		this.ErrorLog("获取接诊评估失败:%v", getRTARErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	predialysisEvaluation, getPEErr := service.MobileGetPredialysisEvaluationOne(info.UserOrgId, patientID)
+	predialysisEvaluation, getPEErr := service.MobileGetPredialysisEvaluationOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getPEErr != nil {
 		this.ErrorLog("获取透前评估失败:%v", getPEErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -426,21 +426,21 @@ func (this *XcxApiController) GetMobileSchedule() {
 		return
 	}
 
-	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecordOne(info.UserOrgId, patientID)
+	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecordOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getDialysisOrderErr != nil {
 		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	doubleCheck, getDoubleCheckErr := service.MobileGetDoubleCheckOne(info.UserOrgId, patientID)
+	doubleCheck, getDoubleCheckErr := service.MobileGetDoubleCheckOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getDoubleCheckErr != nil {
 		this.ErrorLog("获取双人核对记录失败:%v", getDoubleCheckErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	monitorRecords, getMonitorRecordsErr := service.MobileGetMonitorRecordsOne(info.UserOrgId, patientID)
+	monitorRecords, getMonitorRecordsErr := service.MobileGetMonitorRecordsOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getMonitorRecordsErr != nil {
 		this.ErrorLog("获取透析监测记录失败:%v", getMonitorRecordsErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -455,28 +455,28 @@ func (this *XcxApiController) GetMobileSchedule() {
 		return
 	}
 
-	assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysisOne(info.UserOrgId, patientID)
+	assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysisOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getAADErr != nil {
 		this.ErrorLog("获取透后评估失败:%v", getAADErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	lastAssessmentAfterDislysis, getLAADErr := service.MobileGetAssessmentAfterDislysisOne(info.UserOrgId, patientID)
+	lastAssessmentAfterDislysis, getLAADErr := service.MobileGetAssessmentAfterDislysisOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getLAADErr != nil {
 		this.ErrorLog("获取上一次透后评估失败:%v", getLAADErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	treatmentSummary, getTreatmentSummaryErr := service.MobileGetTreatmentSummaryOne(info.UserOrgId, patientID)
+	treatmentSummary, getTreatmentSummaryErr := service.MobileGetTreatmentSummaryOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getTreatmentSummaryErr != nil {
 		this.ErrorLog("获取治疗小结失败:%v", getTreatmentSummaryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeIdSix(info.UserOrgId, patientID, schedual.ModeId)
+	dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeIdSix(info.UserOrgId, patientID, schedual.ModeId, timeNowUnix.Unix())
 
 	dialysisSolution, _ := service.MobileGetDialysisSolutionByModeId(info.UserOrgId, patientID, schedual.ModeId)
 

service/xcx_mobile_api_service.go

@@ -328,9 +328,9 @@ func MobileGetSchedualDetailOne(orgID int64, patientID int64) (*MDialysisSchedul
 }
 
 // 接诊评估
-func MobileGetReceiverTreatmentAccessRecordOne(orgID int64, patientID int64) (*models.ReceiveTreatmentAsses, error) {
+func MobileGetReceiverTreatmentAccessRecordOne(orgID int64, patientID int64, record_date int64) (*models.ReceiveTreatmentAsses, error) {
 	var record models.ReceiveTreatmentAsses
-	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, record_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -342,9 +342,9 @@ func MobileGetReceiverTreatmentAccessRecordOne(orgID int64, patientID int64) (*m
 }
 
 // 透前评估
-func MobileGetPredialysisEvaluationOne(orgID int64, patientID int64) (*models.PredialysisEvaluation, error) {
+func MobileGetPredialysisEvaluationOne(orgID int64, patientID int64, assessment_date int64) (*models.PredialysisEvaluation, error) {
 	var record models.PredialysisEvaluation
-	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, assessment_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -385,9 +385,9 @@ func MobileGetDoctorAdvicesByGroupsOne(orgID int64, patientID int64, advicedate
 }
 
 // 透析记录
-func MobileGetSchedualDialysisRecordOne(orgID int64, patientID int64) (*models.DialysisOrder, error) {
+func MobileGetSchedualDialysisRecordOne(orgID int64, patientID int64, dialysis_date int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
-	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ?", orgID, patientID).Last(&record).Error
+	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1 and dialysis_date = ?", orgID, dialysis_date).Where("user_org_id = ? AND patient_id = ?", orgID, patientID).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -399,9 +399,9 @@ func MobileGetSchedualDialysisRecordOne(orgID int64, patientID int64) (*models.D
 }
 
 // 双人核对
-func MobileGetDoubleCheckOne(orgID int64, patientID int64) (*models.DoubleCheck, error) {
+func MobileGetDoubleCheckOne(orgID int64, patientID int64, check_date int64) (*models.DoubleCheck, error) {
 	var record models.DoubleCheck
-	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id = ? and status = 1 and check_date = ?", patientID, orgID, check_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -413,9 +413,9 @@ func MobileGetDoubleCheckOne(orgID int64, patientID int64) (*models.DoubleCheck,
 }
 
 // 透析监测记录
-func MobileGetMonitorRecordsOne(orgID int64, patientID int64) ([]*models.MonitoringRecord, error) {
+func MobileGetMonitorRecordsOne(orgID int64, patientID int64, monitoring_date int64) ([]*models.MonitoringRecord, error) {
 	var records []*models.MonitoringRecord
-	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Order("operate_time asc").Last(&records).Error
+	err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, monitoring_date).Order("operate_time asc").Find(&records).Error
 	if err != nil {
 		return nil, err
 	}
@@ -436,9 +436,9 @@ func MobileGetLastMonitorRecordOne(orgID int64, patientID int64) (*models.Monito
 }
 
 // 透后评估
-func MobileGetAssessmentAfterDislysisOne(orgID int64, patientID int64) (*models.AssessmentAfterDislysis, error) {
+func MobileGetAssessmentAfterDislysisOne(orgID int64, patientID int64, assessment_date int64) (*models.AssessmentAfterDislysis, error) {
 	var record models.AssessmentAfterDislysis
-	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date =? ", patientID, orgID, assessment_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -450,9 +450,9 @@ func MobileGetAssessmentAfterDislysisOne(orgID int64, patientID int64) (*models.
 }
 
 // 治疗小结
-func MobileGetTreatmentSummaryOne(orgID int64, patientID int64) (*models.TreatmentSummary, error) {
+func MobileGetTreatmentSummaryOne(orgID int64, patientID int64, assessment_date int64) (*models.TreatmentSummary, error) {
 	var record models.TreatmentSummary
-	err := readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+	err := readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date= ?", patientID, orgID, assessment_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -464,9 +464,9 @@ func MobileGetTreatmentSummaryOne(orgID int64, patientID int64) (*models.Treatme
 }
 
 // 透析处方
-func MobileGetDialysisPrescribeByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
+func MobileGetDialysisPrescribeByModeIdSix(orgID int64, patientID int64, mode_id int64, record_date int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
-	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and record_date = ?", patientID, orgID, mode_id, record_date).Find(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil