Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

service/his_project_service.go

@@ -596,11 +596,31 @@ func GetPrscriptionInfo(patientid int64, recorddata int64) (info []*models.HisPr
 
 }
 
-func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64) (prescritpion []*models.HisPrescription, err error) {
-	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? AND record_date =? AND p_type = ? AND status = 1", patient_id, startime, p_type).Find(&prescritpion).Error
-	return prescritpion, err
+func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 ").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 ").Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).
+		Where("patient_id = ? AND record_date =? AND p_type = ? AND status = 1", patient_id, startime, p_type).
+		Find(&prescription).Error
+	return
 }
 
+
+
+// func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64) (prescritpion []*models.HisPrescription, err error) {
+// // 	err = XTReadDB().Model(&prescritpion).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+// // 		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")
+// // }).Where("patient_id = ? AND record_date =? AND p_type = ? AND status = 1", patient_id, startime, p_type).Find(&prescritpion).Error
+// // 	return prescritpion, err
+// }
+
 func GetTodayHisPatient(recod_date int64, patientid int64, user_org_id int64) (*models.XtHisPatient, error) {
 
 	patient := models.XtHisPatient{}