提交

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -423,15 +423,29 @@ func (this *CommonApiController) GetAllCheckList() {
 	//fmt.Println("org", orgid)
 	page, _ := this.GetInt64("page")
 	limit, _ := this.GetInt64("limit")
-	checkList, total, err := service.GetAllCheckList(orgid, page, limit)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	major, _ := service.GetInspectionMajor(orgid)
+	if len(major) == 0 {
+		checklist, total, err := service.GetAllChekcListTwo(orgid, page, limit)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"checklist": checklist,
+			"total":     total,
+		})
+	} else {
+		checkList, total, err := service.GetAllCheckList(orgid, page, limit)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"checklist": checkList,
+			"total":     total,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"checklist": checkList,
-		"total":     total,
-	})
+
 }
 
 func (this *CommonApiController) GetCheckdetail() {

service/common_service.go

@@ -153,6 +153,19 @@ func CreateCheckConfiguration(configuration *models.XtCheckConfiguration) error
 	return err
 }
 
+func GetAllChekcListTwo(orgid int64, page int64, limit int64) (check []*models.CheckConfiguration, total int64, err error) {
+	db := XTReadDB().Table("xt_check_configuration as x").Where("x.status =1")
+	table := XTReadDB().Table("xt_inspection_reference as r")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Order("x.sort asc,x.created_time desc").Select("x.id,x.inspection_major,x.inspection_frequency,x.sort,x.user_org_id,r.project_name").Count(&total).
+		Joins("left join xt_inspection_reference as r on r.project_id = x.inspection_major").Offset(offset).Limit(limit).Scan(&check).Error
+	return check, total, err
+}
+
 func GetAllCheckList(orgid int64, page int64, limit int64) (check []*models.CheckConfiguration, total int64, err error) {
 
 	db := XTReadDB().Table("xt_check_configuration as x").Where("x.status =1")
@@ -163,7 +176,7 @@ func GetAllCheckList(orgid int64, page int64, limit int64) (check []*models.Chec
 	}
 	offset := (page - 1) * limit
 	err = db.Group("x.id").Order("x.sort asc,x.created_time desc").Select("x.id,x.inspection_major,x.inspection_frequency,x.sort,x.user_org_id,r.project_name").Count(&total).
-		Joins("left join xt_inspection_reference as r on r.project_id = x.inspection_major").Offset(offset).Limit(limit).Scan(&check).Error
+		Joins("left join xt_inspection_reference as r on r.project_id = x.inspection_major").Where("r.org_id = ? and r.status = 1", orgid).Offset(offset).Limit(limit).Scan(&check).Error
 	return check, total, err
 }
 
@@ -2354,7 +2367,7 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 	fmt.Println(d)
 
 	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value <> ''", orgid)
 	}
 	if lapstor == 0 {
 		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
@@ -2372,11 +2385,43 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0 )").Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1", orgid).Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
 
 	return inspection, total, err
 }
 
+//func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64, page int64, limit int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
+//
+//	db := readDb.Table("xt_inspection as x").Where("x.status =1")
+//	table := readDb.Table("xt_patients as s")
+//	fmt.Println(table)
+//	d := readDb.Table(" xt_inspection_reference as r")
+//	fmt.Println(d)
+//
+//	if orgid > 0 {
+//		db = db.Where("x.org_id = ?", orgid)
+//	}
+//	if lapstor == 0 {
+//		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
+//	}
+//	if lapstor == 1 {
+//		db = db.Where("s.lapseto = 1")
+//	}
+//	if lapstor == 2 {
+//		db = db.Where("s.lapseto = 2")
+//	}
+//	if startime > 0 {
+//		db = db.Where("x.inspect_date >=?", startime)
+//	}
+//	if endtime > 0 {
+//		db = db.Where("x.inspect_date <=?", endtime)
+//	}
+//	offset := (page - 1) * limit
+//	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0 )").Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+//
+//	return inspection, total, err
+//}
+
 func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
 
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")