11月8日库存管理

controllers/stock_in_api_controller.go

@@ -7711,9 +7711,9 @@ func (this *StockManagerApiController) GetDrugDetailSummary() {
 	page, _ := this.GetInt64("page")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetDrugDetailSummary(startTime, endTime, keyword, limit, page, orgId)
-
+	fmt.Println("list23323232233232233223232323", list)
 	druglist, _, _ := service.GetDrugDetailSummaryOne(startTime, endTime, keyword, limit, page, orgId)
-
+	fmt.Println("druglist2332322332223322323", druglist)
 	patients, _ := service.GetAllpatient(orgId)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
@@ -7753,7 +7753,7 @@ func (this *StockManagerApiController) GetGoodDetailSummary() {
 			return
 		}
 		startTime = theTime.Unix()
-		fmt.Println("开始时间", startTime)
+
 	}
 	var endTime int64
 	if len(end_time) > 0 {

service/stock_service.go

@@ -6345,7 +6345,7 @@ func GetDrugDetailSummary(startime int64, endtime int64, keyword string, limit i
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
+		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date,x.prescribing_number_unit,x.drug_id").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
 	}
 
 	offset := (page - 1) * limit
@@ -6372,11 +6372,10 @@ func GetDrugDetailSummaryOne(startime int64, endtime int64, keyword string, limi
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
+		db = db.Select("x.patient_id,x.user_org_id,x.id,x.advice_date,x.advice_date,x.prescribing_number_unit,x.drug_id").Joins("left join sgj_xt.xt_base_drug as d on d.id = x.drug_id").Where("d.drug_name like ?", likeKey)
 	}
 
-	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.created_time desc").Scan(&adviceinfo).Error
+	err = db.Order("x.created_time desc").Scan(&adviceinfo).Error
 	return adviceinfo, total, err
 }
 
@@ -6404,7 +6403,7 @@ func GetGoodDetailSummary(startime int64, endtime int64, keyword string, limit i
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ?", likeKey)
+		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ?", likeKey).Group("d.id")
 	}
 
 	offset := (page - 1) * limit
@@ -6430,11 +6429,10 @@ func GetGoodDetailSummaryOne(startime int64, endtime int64, keyword string, limi
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ? ", likeKey)
+		db = db.Select("x.id,x.project_id,x.user_org_id,x.patient_id,x.record_date").Joins("left join xt_good_information as d on d.id = x.project_id").Where("d.good_name like ? ", likeKey).Group("d.id")
 	}
 
-	offset := (page - 1) * limit
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Group("x.id").Scan(&project).Error
+	err = db.Order("x.ctime desc").Group("x.id").Scan(&project).Error
 	return project, total, err
 }