医嘱需求

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/patient_api_controller.go

@@ -1991,7 +1991,10 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	startTime := c.GetString("start_time", "")
 	endTime := c.GetString("end_time", "")
 	keywords := c.GetString("keywords", "")
-
+	page, _ := c.GetInt64("page")
+	fmt.Println("page", page)
+	limit, _ := c.GetInt64("limit")
+	fmt.Println("limit", limit)
 	adminUserInfo := c.GetAdminUserInfo()
 
 	operatorIDs := make([]int64, 0)
@@ -2020,7 +2023,9 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		theEndtTIme = theTime.Unix()
 	}
 
-	advices, total, _ := service.GetDoctorAdviceList(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords)
+	advices, _, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords)
+	advicestwo, total, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
 	if len(advices) > 0 {
 		for _, item := range advices {
 			if item.AdviceDoctor > 0 {
@@ -2045,6 +2050,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		"advices":   advices,
 		"operators": operators,
 		"total":     total,
+		"advicetwo": advicestwo,
 	})
 	return
 

service/patient_service.go

@@ -683,7 +683,6 @@ func FindDoctorAdviceByGroupNo(orgID, groupNo int64) (advice models.DoctorAdvice
 }
 func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64, keywords string) (advices []*models.DoctorAdvices, total int64, err error) {
 
-	fmt.Println("advicetype-----", advice_type)
 	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)
@@ -693,11 +692,44 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	if patientID > 0 {
 		db = db.Where("x.patient_id = ?", patientID)
 	}
-	//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 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 stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	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").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	fmt.Print("err", err)
+	return
+}
+
+func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string) (advices []*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 advice_type == 1 && advice_type > 0 {
 		db = db.Where("x.advice_type = ?", advice_type)
 	}
@@ -724,6 +756,48 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	fmt.Print("err", err)
 	return
 }
+
+func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64) (advices []*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.Println(table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 {
+		db = db.Where("x.advice_type <> 1")
+	}
+
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).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").Scan(&advices).Error
+	fmt.Print("错误是什么", err)
+	return
+
+}
+
 func GetDoctorAdvicePageList(orgID, patientID, advice_type, stop, start, end int64, keywords string, page, limit int64) (advices []*models.DoctorAdvice, total int64, err error) {
 
 	offset := (page - 1) * limit

service/patientmanage_service.go

@@ -524,7 +524,6 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 }
 
 func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end int64, limit int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvice, total int64, err error) {
-	fmt.Println("advicetype------------------------------", advice_type)
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)