历史排班

controllers/pharmacy_controller.go

@@ -169,13 +169,14 @@ func (this *PharmacyController) IssuedDrug() {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+
 		var ids []int64
 		for _, item := range schedule {
 			ids = append(ids, item.PatientId)
 		}
 
 		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
-		fmt.Println("list23323232323232", list)
+
 		var flist []models.TmpPatientOne
 		if len(list) > 0 {
 			for _, item := range list {

service/pharmacy_service.go

@@ -134,6 +134,10 @@ func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine i
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
 	}
+
+	if len(ids) == 0 {
+		db = db.Where("patient_id not in(?)", ids)
+	}
 	if len(ids) > 0 {
 		db = db.Where("patient_id in(?)", ids)
 	}