소스 검색

提交代码

陈少旭 9 달 전
부모
커밋
32493c2c7b
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      service/his_charge_service.go

+ 2 - 2
service/his_charge_service.go 파일 보기

@@ -1088,7 +1088,7 @@ func GetHisPrescriptionDrugDetails(org_id int64, start_time_str string, end_time
1088 1088
 	}
1089 1089
 	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
1090 1090
 
1091
-	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Scan(&patients).Error
1091
+	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Group("oi.id").Scan(&patients).Error
1092 1092
 
1093 1093
 	return
1094 1094
 }
@@ -1115,6 +1115,6 @@ func GetHisPrescriptionProjectDetails(org_id int64, start_time_str string, end_t
1115 1115
 	}
1116 1116
 	db = db.Joins("left JOIN `his_order` oo on oo.`number` = o.`batch_number` and oo.user_org_id = ?", org_id)
1117 1117
 
1118
-	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Scan(&patients).Error
1118
+	err = db.Where(" oi.user_org_id = ?  AND o.record_date >= ? AND o.record_date <= ? AND oi.status = 1", org_id, start_time, end_time).Group("oi.id").Scan(&patients).Error
1119 1119
 	return
1120 1120
 }