Merge branch 'master' of http://git.shengws.com/csx/gdyb

service/his_service.go

@@ -1364,6 +1364,6 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> ''", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> '' AND id >= 1755", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }