his

controllers/his_charge_api_controller.go

@@ -299,7 +299,7 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 	is_print, _ := c.GetInt64("is_print")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
-	//tube_color, _ := c.GetInt64("tube_color")
+	tube_color, _ := c.GetInt64("tube_color")
 
 	adminUser := c.GetAdminUserInfo()
 
@@ -310,7 +310,21 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 
 	}
 	record_time := startTime.Unix()
-	labels, total, err := service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, 0)
+	var labels []*models.HisLabelPrintInfo
+	var labels_two []*models.HisLabelPrintInfo
+
+	var total int64
+	var total_two int64
+	//var err error
+	if tube_color == 0 {
+		labels, total, err = service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+	} else {
+		labels, total, err = service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+		labels_two, total_two, err = service.GetLabelPrintListTwo(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+		total = total + total_two
+		labels = append(labels, labels_two...)
+	}
+
 	if err == nil {
 
 		c.ServeSuccessJSON(map[string]interface{}{

service/his_charge_service.go

@@ -251,7 +251,31 @@ func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time i
 		db = db.Where("patient_name Like ?", keywors)
 
 	}
-	err = db.Where("user_org_id = ? AND record_date = ? AND status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	if tube_color > 0 {
+		db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?", tube_color)
+		//db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?",tube_color)
+	}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	return
+}
+func GetLabelPrintListTwo(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisLabelPrintInfo{})
+	if is_print > 0 {
+		db = db.Where("is_print = ?", is_print)
+	}
+	if len(keywors) > 0 {
+		keywors = "%" + keywors + "%"
+		db = db.Where("patient_name Like ?", keywors)
+
+	}
+	if tube_color > 0 {
+		//db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?",tube_color)
+		db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?", tube_color)
+	}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
 	return
 }