|
@@ -23,7 +23,7 @@ func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id
|
23
|
23
|
Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
|
24
|
24
|
return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
|
25
|
25
|
Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
|
26
|
|
- return db.Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
|
|
26
|
+ return db.Joins("Join xt_his_project p On p.id = his_prescription_project.project_id AND p.cost_classify != 3").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
|
27
|
27
|
})
|
28
|
28
|
}).
|
29
|
29
|
Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
|