提交

service/patientmanage_service.go

@@ -455,28 +455,32 @@ func GetLastNewSlowPatient(phone string, orgid int64) (*models.XtPatientsNew, er
 	return &patientnew, nil
 }
 
-func GetNewDoctorAdvice(patientid int64, doctype int64, startime int64, endtime int64, limit int64, page int64, orgId int64) (doctoradvice []*models.DoctorAdvices, total int64, err error) {
-	db := XTReadDB().Table("xt_doctor_advice as x").Where("x.status = 1")
-	if orgId > 0 {
-		db = db.Where("x.user_org_id = ?", orgId)
+func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int64, limit int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvices, total int64, err error) {
+	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
 	}
-
-	if patientid > 0 {
-		db = db.Where("x.patient_id = ?", patientid)
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
 	}
-	if startime != 0 {
-		db = db.Where("x.record_date>= ?", startime)
+	if advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	} else if advice_type == 0 {
+		db = db.Where("x.advice_type in (?)", []int{1, 3})
 	}
-	if endtime != 0 {
-		db = db.Where("x.record_date<=?", endtime)
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
 	}
-
-	if doctype > 0 {
-		db = db.Where("x.advice_type = ?", doctype)
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
 	}
 	offset := (page - 1) * limit
-	err = db.Count(&total).Order("x.record_date desc").Offset(offset).Limit(limit).Group("x.id").Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&doctoradvice).Error
+	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Offset(offset).Limit(limit).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
+	fmt.Print("err", err)
 	return
+
 }
 
 func GetDryWeight(patientid int64, startime int64, endtime int64, limit int64, page int64, orgId int64) (dryWeight []*models.XtPatientDryweight, total int64, err error) {