2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10653 //机构id
+		subscibe.OrgId = 10702 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10653 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10653 //机构id小英9675或4
+		subscibe.OrgId = 10702 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10653 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4317,7 +4317,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
 				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
+				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 			}
 		}
 	}

controllers/patient_api_controller.go

@@ -8636,6 +8636,10 @@ func (this *PatientApiController) GetAutoPatientContent() {
 
 	minMonitorDiastolicBloodPressure, _ := service.GetMinMonitorDiastolicBloodPressure(patient_id, startTime, endTime, orgId)
 
+	patientVascularAccess, _ := service.GetPatientVascularAccessList(patient_id, orgId)
+
+	lastBefor, _ := service.GetPatientLastBefor(patient_id, startTime, endTime, orgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"prescription":                         prescription,
 		"berfor":                               berfor,
@@ -8661,6 +8665,8 @@ func (this *PatientApiController) GetAutoPatientContent() {
 		"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
 		"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
 		"lastDryWeight":                        lastDryWeight,
+		"patientVascularAccess":                patientVascularAccess,
+		"lastBefor":                            lastBefor,
 	})
 
 }

service/patient_service.go

@@ -4842,3 +4842,21 @@ func GetMinMonitorDiastolicBloodPressure(patient_id int64, start_time int64, end
 	err := XTReadDB().Raw("select Min(diastolic_blood_pressure) as diastolic_blood_pressure from xt_monitoring_record where patient_id = ? and monitoring_date>=? and monitoring_date<=? and user_org_id = ?", patient_id, start_time, end_time, org_id).Scan(&monitor).Error
 	return monitor, err
 }
+
+func GetPatientVascularAccessList(patient_id int64, org_id int64) (models.XtPatientVascularAccess, error) {
+
+	vascularAccess := models.XtPatientVascularAccess{}
+
+	err := XTReadDB().Where("patient_id = ? and user_org_id = ? and status=1", patient_id, org_id).Last(&vascularAccess).Error
+
+	return vascularAccess, err
+}
+
+func GetPatientLastBefor(patient_id int64, start_time int64, end_time int64, org_id int64) (models.XtAssessmentBeforeDislysis, error) {
+
+	beforeDislysis := models.XtAssessmentBeforeDislysis{}
+
+	err := XTReadDB().Where("patient_id =? and user_org_id = ? and assessment_date>=? and assessment_date<=? and status=1 and complication!=''", patient_id, org_id, start_time, end_time).Order("id asc").Last(&beforeDislysis).Error
+
+	return beforeDislysis, err
+}