2024/6/17

controllers/inspection_api_controller.go

@@ -1151,14 +1151,14 @@ func (c *InspectionApiController) GetInpsectionByPatientGroup() {
 
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 
-	patient, _ := service.GetPatientDetailTwo(patient_id)
-	inspection, _ := service.GetInspectionGroup(patient.BloodId, org_id)
+	//patient, _ := service.GetPatientDetailTwo(patient_id)
+	inspection, _ := service.GetInspectionGroup(patient_id, org_id)
 
 	if len(inspection) > 0 {
 		for _, item := range inspection {
-			lastInspection, _ := service.GetLastInspectionProject(item.PatientId, org_id, item.ProjectId)
+			lastInspection, _ := service.GetLastInspectionProject(patient_id, org_id, item.ProjectId)
 			item.InspectDate = lastInspection.InspectDate
-			inspecList, _ := service.GetInspectionByProjectId(item.PatientId, org_id, item.ProjectId)
+			inspecList, _ := service.GetInspectionByProjectId(patient_id, org_id, item.ProjectId)
 			item.Count = int64(len(inspecList))
 		}
 	}
@@ -1176,22 +1176,22 @@ func (c *InspectionApiController) GetInspectionChildList() {
 
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 
-	patient, _ := service.GetPatientDetailTwo(patient_id)
+	//patient, _ := service.GetPatientDetailTwo(patient_id)
 
 	referenceList, _ := service.GetInSpctionRerefce(project_id, org_id)
 
-	inspection, _ := service.GetInspectionGroupByRecordDate(patient.BloodId, project_id, org_id)
+	inspection, _ := service.GetInspectionGroupByRecordDate(patient_id, project_id, org_id)
 
 	if len(inspection) > 0 {
 		for _, item := range inspection {
-			inspeclist, _ := service.GetInspectionByProject(patient.BloodId, project_id, org_id, item.InspectDate)
+			inspeclist, _ := service.GetInspectionByProject(patient_id, project_id, org_id, item.InspectDate)
 			for _, it := range inspeclist {
 				item.Child = append(item.Child, it)
 			}
 		}
 	}
 
-	patients, _ := service.GetPatientByIDOne(org_id, patient.BloodId)
+	patients, _ := service.GetPatientByIDOne(org_id, patient_id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"inspection":    inspection,