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

service/his_service.go

@@ -740,7 +740,7 @@ func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAd
 }
 
 func GetHisOrderTwo(user_org_id int64, number string, patient_id int64) (order models.HisOrder, err error) {
-	err = readDb.Model(&HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND number=?", user_org_id, patient_id, number).
+	err = readDb.Model(&HisOrder{}).Where("user_org_id = ? AND patient_id = ? AND number=?", user_org_id, patient_id, number).
 		First(&order).Error
 	return
 }