提交代码

service/his_service.go

@@ -2137,16 +2137,16 @@ func (NewTempPatients) TableName() string {
 
 func GetNewAllUnChargeHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*NewTempPatients, err error) {
 	db := readDb.Model(&NewTempPatients{})
-	//if sch_type > 0 {
-	//	db = db.Joins("join xt_schedule as sch on sch.patient_id = xt_patients.id and sch.schedule_date = ? and sch.schedule_type = ?", record_date, sch_type)
-	//}
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule as sch on sch.patient_id = xt_patients.id and sch.schedule_date = ? and sch.schedule_type = ? and sch.status = 1", record_date, sch_type)
+	}
 	db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("Schedule", "status = 1")
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
 	})
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <> 2 AND order_status <> 3", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND prescription_status <> 3", org_id, record_date).Find(&patients).Error
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND prescription_status <> 3", org_id, record_date).Find(&patients).Group("xt_patients.id").Error
 
 	for _, item := range patients {
 		for _, sumItem := range item.HisPatient {
@@ -2163,9 +2163,11 @@ func GetNewAllUnChargeHisPatientList(org_id int64, keywords string, record_date
 func GetNewAllChargeHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*NewTempPatients, err error) {
 	db := readDb.Model(&NewTempPatients{})
 
-	//if sch_type > 0 {
-	//	db = db.Joins("join xt_schedule as sch on sch.patient_id = xt_patients.id and sch.schedule_date = ? and sch.schedule_type = ?", record_date, sch_type)
-	//}
+	fmt.Println("sch_type")
+	fmt.Println(sch_type)
+	if sch_type > 0 {
+		db = db.Joins("join xt_schedule as sch on sch.patient_id = xt_patients.id and sch.schedule_date = ? and sch.schedule_type = ?  and sch.status = 1", record_date, sch_type)
+	}
 	db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("Schedule", "status = 1")
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {